Changeset 904


Ignore:
Timestamp:
Sep 4, 2011, 11:02:36 PM (8 years ago)
Author:
sam
Message:

debug: fix PS3 and Android compilation.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/debug/quad.cpp

    r903 r904  
    508508     */
    509509#if !defined ANDROID_NDK && !defined __APPLE__
    510     glColor3f(0.0f, 1.0f, 0.0f);
     510    glColor4f(0.0f, 1.0f, 0.0f, 1.0f);
    511511    glPointSize(1.0f);
    512512    glEnableClientState(GL_VERTEX_ARRAY);
     
    791791     * Renders an antialiased green sine wave made of 1-pixel points.
    792792     */
    793 #if !defined ANDROID_NDK && !defined __APPLE__
     793#if !defined ANDROID_NDK && !defined __APPLE__ && !defined __CELLOS_LV2__
    794794    if (!shader[0])
    795 #if !defined __CELLOS_LV2__
    796795        shader[0] = Shader::Create(
    797796            "#version 120\n"
     
    811810            "    gl_FragColor = vec4(pass_Color.xyz, k);"
    812811            "}");
    813 #else
    814         shader[0] = Shader::Create(
    815             "void main(float4 in_Position : POSITION,"
    816             "          float2 in_TexCoord : TEXCOORD0,"
    817             "          float4 in_Color : COLOR,"
    818             "          out float4 out_Color : COLOR,"
    819             "          out float4 out_Position : POSITION,"
    820             "          out float2 out_TexCoord : TEXCOORD0)"
    821             "{"
    822             "    out_TexCoord = in_TexCoord;"
    823             "    out_Color = in_Color;"
    824             "    out_Position = in_Position;"
    825             "}",
    826 
    827             "void main(float2 in_TexCoord : TEXCOORD0,"
    828             "          float4 in_Color : COLOR,"
    829             "          uniform sampler2D tex,"
    830             "          out float4 out_FragColor : COLOR)"
    831             "{"
    832             "    float4 tmp = tex2D(tex, in_TexCoord * 0.25);"
    833             "    out_FragColor = float4(abs(tmp.xyz - in_Color.xyz), 1);"
    834             "}");
    835 #endif
    836812
    837813    shader[0]->Bind();
     
    11011077    glClientActiveTexture(GL_TEXTURE0);
    11021078#endif
     1079#if !defined __CELLOS_LV2__ && !defined ANDROID_NDK
    11031080    glTexEnvi(GL_POINT_SPRITE, GL_COORD_REPLACE, GL_FALSE);
     1081#endif
    11041082    glDisable(GL_TEXTURE_2D);
    11051083
    11061084    glDisable(GL_BLEND);
     1085#if !defined __CELLOS_LV2__ && !defined ANDROID_NDK
    11071086    glDisable(GL_POINT_SPRITE);
     1087#endif
    11081088
    11091089    glBindBuffer(GL_ARRAY_BUFFER, 0);
     
    11151095#endif
    11161096
     1097#if !defined __CELLOS_LV2__ && !defined ANDROID_NDK
    11171098    glDisable(GL_VERTEX_PROGRAM_POINT_SIZE);
     1099#endif
    11181100}
    11191101
Note: See TracChangeset for help on using the changeset viewer.