Changeset 1733Tweet

Timestamp:

Aug 13, 2012, 2:22:53 PM (11 years ago)

Author:

sam

Message:

gpu: activate FBO support on Android.

File:

• trunk/src/gpu/framebuffer.cpp (modified) (5 diffs)

trunk/src/gpu/framebuffer.cpp

@@ -46 +46 @@
 #if defined USE_D3D9
 #elif defined _XBOX
-#elif !defined __CELLOS_LV2__ && !defined __ANDROID__
+#else
     GLuint m_fbo, m_texture, m_depth;
 #endif
@@ -111 +111 @@
 {
 #if defined USE_D3D9 || defined _XBOX
-#elif GL_VERSION_1_1
+#else
     glDeleteFramebuffers(1, &m_data->m_fbo);
     glDeleteTextures(1, &m_data->m_texture);
+#   if GL_VERSION_1_1
     if (m_data->m_depth != GL_INVALID_ENUM)
         glDeleteRenderbuffers(1, &m_data->m_depth);
-#else
+#   endif
 #endif
     delete m_data;
@@ -125 +126 @@
 #if defined USE_D3D9 || defined _XBOX
     return 0;
-#elif GL_VERSION_1_1
+#else
     return m_data->m_texture;
-#else
-    return 0;
 #endif
 }
@@ -135 +134 @@
 {
 #if defined USE_D3D9 || defined _XBOX
-#elif GL_VERSION_1_1
+#else
     glBindFramebuffer(GL_FRAMEBUFFER, m_data->m_fbo);
-#else
 #endif
 }
@@ -144 +142 @@
 {
 #if defined USE_D3D9 || defined _XBOX
-#elif GL_VERSION_1_1
+#else
     glBindFramebuffer(GL_FRAMEBUFFER, NULL);
-#else
 #endif
 }