Changeset 1077Tweet

Timestamp:

Nov 19, 2011, 2:00:16 PM (11 years ago)

Author:

sam

Message:

tutorial: get the Mandelbrot viewer to run on OS X.

File:

• trunk/test/tutorial/tut03.cpp (modified) (7 diffs)

trunk/test/tutorial/tut03.cpp

@@ -406 +406 @@
             m_ready = true;
 
-#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
+#if !defined __CELLOS_LV2__ && !defined __ANDROID__
             /* Method 1: store vertex buffer on the GPU memory */
             glGenBuffers(1, &m_vbo);
@@ -416 +416 @@
             glBufferData(GL_ARRAY_BUFFER, sizeof(texcoords), texcoords,
                          GL_STATIC_DRAW);
-#elif !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
+#elif !defined __CELLOS_LV2__ && !defined __ANDROID__
             /* Method 2: upload vertex information at each frame */
 #else
@@ -445 +445 @@
         }
 
-/* If other frames are dirty, upload fake data for now */
-if (0) for (int i = 0; i < 4; i++)
-{
-    if (m_dirty[i])
-    {
-            glTexSubImage2D(GL_TEXTURE_2D, 0, 0, i * m_size.y / 2,
-                            m_size.x / 2, m_size.y / 2,
-                            TEXTURE_FORMAT, TEXTURE_TYPE,
-                            m_pixels + m_size.x * m_size.y / 4 * m_frame);
-    }
-}
-
         m_shader->Bind();
         m_shader->SetUniform(m_pixeluni, m_pixel_delta);
-#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
+#if !defined __CELLOS_LV2__ && !defined __ANDROID__
         glBindBuffer(GL_ARRAY_BUFFER, m_vbo);
         glEnableVertexAttribArray(m_vertexattrib);
@@ -467 +455 @@
         glEnableVertexAttribArray(m_texattrib);
         glVertexAttribPointer(m_texattrib, 2, GL_FLOAT, GL_FALSE, 0, 0);
-#elif !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
+#elif !defined __CELLOS_LV2__ && !defined __ANDROID__
         /* Never used for now */
         //glEnableVertexAttribArray(m_vertexattrib);
@@ -480 +468 @@
         glDrawArrays(GL_TRIANGLES, 0, 6);
 
-#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
+#if !defined __CELLOS_LV2__ && !defined __ANDROID__
         glDisableVertexAttribArray(m_vertexattrib);
         glDisableVertexAttribArray(m_texattrib);
         glBindBuffer(GL_ARRAY_BUFFER, 0);
-#elif !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
+#elif !defined __CELLOS_LV2__ && !defined __ANDROID__
         /* Never used for now */
         //glDisableVertexAttribArray(m_vertexattrib);
@@ -502 +490 @@
     Shader *m_shader;
     GLuint m_texid;
-#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__
+#if !defined __CELLOS_LV2__ && !defined __ANDROID__
     GLuint m_vbo, m_tbo;
     GLuint m_tco;
@@ -520 +508 @@
 };
 
-int main()
+int main(int argc, char **argv)
 {
 #if defined _WIN32