Changeset 819Tweet

Timestamp:

Aug 12, 2011, 1:27:58 AM (12 years ago)

Author:

sam

Message:

debug: make the GL test compile on Android.

File:

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

trunk/src/debug/quad.cpp

@@ -82 +82 @@
     if (!data->initialised && !IsDestroying())
     {
-#if !defined __CELLOS_LV2__
+#if !defined __CELLOS_LV2__ && !defined ANDROID_NDK
         glGenVertexArrays(NUM_ARRAYS, data->array);
 #endif
@@ -112 +112 @@
     else if (data->initialised && IsDestroying())
     {
-#if !defined __CELLOS_LV2__
+#if !defined __CELLOS_LV2__ && !defined ANDROID_NDK
         glDeleteVertexArrays(NUM_ARRAYS, data->array);
 #endif
@@ -354 +354 @@
 #endif
 
+#if !defined ANDROID_NDK
     /*
      * Test #7: vertex buffer + per-vertex coloring
@@ -378 +379 @@
     Advance();
     ResetState();
+#endif
 
     /*
@@ -385 +387 @@
      * animated distorted checkerboard.
      */
+#if !defined ANDROID_NDK
     GLfloat const vertices2[] = { data->aa.x, data->bb.y, 0.0f,
                                   data->bb.x, data->bb.y, 0.0f,
@@ -410 +413 @@
     Advance();
     ResetState();
+#endif
 
     /*
@@ -417 +421 @@
      * animated distorted checkerboard.
      */
-#if !defined __CELLOS_LV2__
+#if !defined __CELLOS_LV2__ && !defined ANDROID_NDK
     if (!data->shader[3])
         data->shader[3] = Shader::Create(
@@ -472 +476 @@
      * animated distorted checkerboard.
      */
-#if !defined __CELLOS_LV2__
+#if !defined __CELLOS_LV2__ && !defined ANDROID_NDK
     if (!data->shader[4])
     {
@@ -548 +552 @@
      * animated distorted checkerboard.
      */
-#if !defined __CELLOS_LV2__
+#if !defined __CELLOS_LV2__ && !defined ANDROID_NDK
     if (!data->shader[5])
     {
@@ -622 +626 @@
 {
     /* Reset GL states to something reasonably safe */
+#if defined HAVE_GLBEGIN || defined USE_GLEW
     glMatrixMode(GL_PROJECTION);
     glLoadIdentity();
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();
+#endif
 
     glEnable(GL_TEXTURE_2D);
     glBindTexture(GL_TEXTURE_2D, 0);
+#if defined HAVE_GLBEGIN || defined USE_GLEW
     glClientActiveTexture(GL_TEXTURE0);
+#endif
     glDisable(GL_TEXTURE_2D);