| Index: src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp
|
| ===================================================================
|
| --- src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp (revision 7907)
|
| +++ src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp (working copy)
|
| @@ -79,11 +79,11 @@
|
| // mac uses GLenum for internalFormat param (non-standard)
|
| // amounts to int vs. uint.
|
| interface->fTexImage2D = (GrGLTexImage2DProc)glTexImage2D;
|
| - #if GL_ARB_texture_storage
|
| +#if GL_ARB_texture_storage
|
| interface->fTexStorage2D = glTexStorage2D;
|
| - #elif GL_EXT_texture_storage
|
| +#elif GL_EXT_texture_storage
|
| interface->fTexStorage2D = glTexStorage2DEXT;
|
| - #endif
|
| +#endif
|
| interface->fTexParameteri = glTexParameteri;
|
| interface->fTexParameteriv = glTexParameteriv;
|
| interface->fTexSubImage2D = glTexSubImage2D;
|
| @@ -124,17 +124,22 @@
|
| interface->fFramebufferRenderbuffer = glFramebufferRenderbuffer;
|
| interface->fBindRenderbuffer = glBindRenderbuffer;
|
|
|
| - #if GL_OES_mapbuffer
|
| +#if GL_OES_mapbuffer
|
| interface->fMapBuffer = glMapBufferOES;
|
| interface->fUnmapBuffer = glUnmapBufferOES;
|
| - #endif
|
| +#endif
|
|
|
| - #if GL_APPLE_framebuffer_multisample
|
| +#if GL_APPLE_framebuffer_multisample
|
| interface->fRenderbufferStorageMultisample = glRenderbufferStorageMultisampleAPPLE;
|
| interface->fResolveMultisampleFramebuffer = glResolveMultisampleFramebufferAPPLE;
|
| - #endif
|
| - interface->fBindFragDataLocationIndexed = NULL;
|
| +#endif
|
|
|
| +#if GL_OES_vertex_array_object
|
| + interface->fBindVertexArray = glBindVertexArrayOES;
|
| + interface->fDeleteVertexArrays = glDeleteVertexArraysOES;
|
| + interface->fGenVertexArrays = glGenVertexArraysOES;
|
| +#endif
|
| +
|
| interface->fBindingsExported = kES2_GrGLBinding;
|
| }
|
| glInterface.get()->ref();
|
|
|