Changeset 1082 for trunk/src/debug/quad.cppTweet

Timestamp:

Nov 21, 2011, 1:49:47 AM (11 years ago)

Author:

sam

Message:

core: port all code to NativeClient. Nothing runs for now, but it builds.

File:

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

trunk/src/debug/quad.cpp

@@ -154 +154 @@
     if (!data->initialised && !IsDestroying())
     {
-#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
+#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
         glGenVertexArrays(NUM_ARRAYS, data->array);
 #endif
@@ -184 +184 @@
     else if (data->initialised && IsDestroying())
     {
-#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
+#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
         glDeleteVertexArrays(NUM_ARRAYS, data->array);
 #endif
@@ -495 +495 @@
      * Renders an orange square.
      */
-#if !defined __ANDROID__ && !defined __APPLE__
+#if !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
     glColor4f(orange.x, orange.y, orange.z, orange.w);
     glEnableClientState(GL_VERTEX_ARRAY);
@@ -513 +513 @@
      * Renders a green sine wave made of 1-pixel points.
      */
-#if !defined __ANDROID__ && !defined __APPLE__
+#if !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
     glColor4f(0.0f, 1.0f, 0.0f, 1.0f);
     glPointSize(1.0f);
@@ -532 +532 @@
      * Renders a multicoloured square with varying colors.
      */
-#if !defined __ANDROID__ && !defined __APPLE__
+#if !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
     glEnableClientState(GL_VERTEX_ARRAY);
     glEnableClientState(GL_COLOR_ARRAY);
@@ -553 +553 @@
      * animated distorted checkerboard.
      */
-#if !defined __ANDROID__ && !defined __APPLE__
+#if !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
     glEnable(GL_TEXTURE_2D);
     glBindTexture(GL_TEXTURE_2D, data->texture[0]);
@@ -581 +581 @@
      * Renders an orange square.
      */
-#if !defined __ANDROID__ && !defined __APPLE__
+#if !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
     if (!shader[0])
 #if !defined __CELLOS_LV2__
@@ -627 +627 @@
      * Renders an orange square.
      */
-#if !defined __ANDROID__ && !defined __APPLE__
+#if !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
     if (!shader[0])
     {
@@ -680 +680 @@
      * Renders a static, coloured and tiled pattern.
      */
-#if !defined __ANDROID__ && !defined __APPLE__
+#if !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
     if (!shader[0])
 #if !defined __CELLOS_LV2__
@@ -733 +733 @@
      * Renders a multicoloured square with varying colors.
      */
-#if !defined __ANDROID__ && !defined __APPLE__
+#if !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
     if (!shader[0])
     {
@@ -797 +797 @@
      * Renders an antialiased green sine wave made of 1-pixel points.
      */
-#if !defined __ANDROID__ && !defined __APPLE__ && !defined __CELLOS_LV2__
+#if !defined __ANDROID__ && !defined __APPLE__ && !defined __CELLOS_LV2__ && !defined __native_client__
     if (!shader[0])
         shader[0] = Shader::Create(
@@ -843 +843 @@
      * animated distorted checkerboard.
      */
-#if !defined __ANDROID__ && !defined __APPLE__
+#if !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
     if (!shader[0])
 #if !defined __CELLOS_LV2__
@@ -916 +916 @@
      * animated distorted checkerboard.
      */
-#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
+#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
     if (!shader[0])
     {
@@ -986 +986 @@
      * animated distorted checkerboard.
      */
-#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
+#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
     if (!shader[0])
     {
@@ -1074 +1074 @@
 #endif
 
-#if !defined __ANDROID__ && !defined __APPLE__
+#if !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
     glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
 #endif
@@ -1083 +1083 @@
     glClientActiveTexture(GL_TEXTURE0);
 #endif
-#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
+#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
     glTexEnvi(GL_POINT_SPRITE, GL_COORD_REPLACE, GL_FALSE);
 #endif
@@ -1089 +1089 @@
 
     glDisable(GL_BLEND);
-#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
+#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
     glDisable(GL_POINT_SPRITE);
 #endif
@@ -1101 +1101 @@
 #endif
 
-#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
+#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ && !defined __native_client__
     glDisable(GL_VERTEX_PROGRAM_POINT_SIZE);
 #endif