diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-01 15:32:49 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-01 15:32:49 +0000 |
| commit | b82c3993c2f753e5caaff2df9648ebdafc68595f (patch) | |
| tree | 12161404431453387c07e3abf86ccee73c0515cc /src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp | |
| parent | c61c3c310185f6ffaefce194a079159423945191 (diff) | |
Revert 7919 and 7920 (committed wrong version of r7919.)
git-svn-id: http://skia.googlecode.com/svn/trunk@7923 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp')
| -rw-r--r-- | src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp b/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp index 5492e19714..2b4dc64df4 100644 --- a/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp +++ b/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp @@ -79,11 +79,11 @@ const GrGLInterface* GrGLCreateNativeInterface() { // 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,21 +124,16 @@ const GrGLInterface* GrGLCreateNativeInterface() { 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 - -#if GL_OES_vertex_array_object - interface->fBindVertexArray = glBindVertexArrayOES; - interface->fDeleteVertexArrays = glDeleteVertexArraysOES; - interface->fGenVertexArrays = glGenVertexArraysOES; -#endif + #endif + interface->fBindFragDataLocationIndexed = NULL; interface->fBindingsExported = kES2_GrGLBinding; } |