Browse Source

Merge pull request #1773 from rgngl/androidVAOEnable

Enable using VAOs on Android
Sean Taylor 10 years ago
parent
commit
6b7aeafce2
2 changed files with 1 additions and 1 deletions
  1. 1 0
      gameplay/src/Base.h
  2. 0 1
      gameplay/src/PlatformAndroid.cpp

+ 1 - 0
gameplay/src/Base.h

@@ -220,6 +220,7 @@ using std::va_list;
     #define GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_OES
     #define glClearDepth glClearDepthf
     #define OPENGL_ES
+    #define GP_USE_VAO
 #elif WIN32
         #define WIN32_LEAN_AND_MEAN
         #define GLEW_STATIC

+ 0 - 1
gameplay/src/PlatformAndroid.cpp

@@ -325,7 +325,6 @@ static bool initEGL()
     
     if (strstr(__glExtensions, "GL_OES_vertex_array_object") || strstr(__glExtensions, "GL_ARB_vertex_array_object"))
     {
-        // Disable VAO extension for now.
         glBindVertexArray = (PFNGLBINDVERTEXARRAYOESPROC)eglGetProcAddress("glBindVertexArrayOES");
         glDeleteVertexArrays = (PFNGLDELETEVERTEXARRAYSOESPROC)eglGetProcAddress("glDeleteVertexArraysOES");
         glGenVertexArrays = (PFNGLGENVERTEXARRAYSOESPROC)eglGetProcAddress("glGenVertexArraysOES");