Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(295)

Unified Diff: src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp

Issue 12379025: Add support to GrGLInterface for vertex array objects (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/gl/debug/GrVertexArrayObj.h ('k') | src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « src/gpu/gl/debug/GrVertexArrayObj.h ('k') | src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698