From ecd84842b3f65918eb040c53391172b6413fd7ad Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Fri, 1 Mar 2013 15:36:02 +0000 Subject: Add support to GrGLInterface for vertex array objects Committed: https://code.google.com/p/skia/source/detail?r=7919 Review URL: https://codereview.chromium.org/12379025 git-svn-id: http://skia.googlecode.com/svn/trunk@7924 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'src/gpu/gl/iOS') diff --git a/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp b/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp index 2b4dc64df4..5492e19714 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,16 +124,21 @@ 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 - interface->fBindFragDataLocationIndexed = NULL; +#endif + +#if GL_OES_vertex_array_object + interface->fBindVertexArray = glBindVertexArrayOES; + interface->fDeleteVertexArrays = glDeleteVertexArraysOES; + interface->fGenVertexArrays = glGenVertexArraysOES; +#endif interface->fBindingsExported = kES2_GrGLBinding; } -- cgit v1.2.3