Changeset 904Tweet

Timestamp:

Sep 4, 2011, 11:02:36 PM (12 years ago)

Author:

sam

Message:

debug: fix PS3 and Android compilation.

File:

• trunk/src/debug/quad.cpp (modified) (5 diffs)

trunk/src/debug/quad.cpp

@@ -508 +508 @@
      */
 #if !defined ANDROID_NDK && !defined __APPLE__
-    glColor3f(0.0f, 1.0f, 0.0f);
+    glColor4f(0.0f, 1.0f, 0.0f, 1.0f);
     glPointSize(1.0f);
     glEnableClientState(GL_VERTEX_ARRAY);
@@ -791 +791 @@
      * Renders an antialiased green sine wave made of 1-pixel points.
      */
-#if !defined ANDROID_NDK && !defined __APPLE__
+#if !defined ANDROID_NDK && !defined __APPLE__ && !defined __CELLOS_LV2__
     if (!shader[0])
-#if !defined __CELLOS_LV2__
         shader[0] = Shader::Create(
             "#version 120\n"
@@ -811 +810 @@
             "    gl_FragColor = vec4(pass_Color.xyz, k);"
             "}");
-#else
-        shader[0] = Shader::Create(
-            "void main(float4 in_Position : POSITION,"
-            "          float2 in_TexCoord : TEXCOORD0,"
-            "          float4 in_Color : COLOR,"
-            "          out float4 out_Color : COLOR,"
-            "          out float4 out_Position : POSITION,"
-            "          out float2 out_TexCoord : TEXCOORD0)"
-            "{"
-            "    out_TexCoord = in_TexCoord;"
-            "    out_Color = in_Color;"
-            "    out_Position = in_Position;"
-            "}",
-
-            "void main(float2 in_TexCoord : TEXCOORD0,"
-            "          float4 in_Color : COLOR,"
-            "          uniform sampler2D tex,"
-            "          out float4 out_FragColor : COLOR)"
-            "{"
-            "    float4 tmp = tex2D(tex, in_TexCoord * 0.25);"
-            "    out_FragColor = float4(abs(tmp.xyz - in_Color.xyz), 1);"
-            "}");
-#endif
 
     shader[0]->Bind();
@@ -1101 +1077 @@
     glClientActiveTexture(GL_TEXTURE0);
 #endif
+#if !defined __CELLOS_LV2__ && !defined ANDROID_NDK
     glTexEnvi(GL_POINT_SPRITE, GL_COORD_REPLACE, GL_FALSE);
+#endif
     glDisable(GL_TEXTURE_2D);
 
     glDisable(GL_BLEND);
+#if !defined __CELLOS_LV2__ && !defined ANDROID_NDK
     glDisable(GL_POINT_SPRITE);
+#endif
 
     glBindBuffer(GL_ARRAY_BUFFER, 0);
@@ -1115 +1095 @@
 #endif
 
+#if !defined __CELLOS_LV2__ && !defined ANDROID_NDK
     glDisable(GL_VERTEX_PROGRAM_POINT_SIZE);
+#endif
 }