diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-01 15:36:02 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-01 15:36:02 +0000 |
| commit | ecd84842b3f65918eb040c53391172b6413fd7ad (patch) | |
| tree | b6fb8cad101462c65157bad473b161ed40f0bb23 /src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp | |
| parent | b82c3993c2f753e5caaff2df9648ebdafc68595f (diff) | |
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
Diffstat (limited to 'src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp')
| -rw-r--r-- | src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp b/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp index bc1e0ee6c3..059713d8e4 100644 --- a/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp +++ b/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp @@ -44,6 +44,8 @@ const GrGLInterface* GrGLCreateANGLEInterface() { GR_GET_PROC(GrGLBindAttribLocationProc, BindAttribLocation); GR_GET_PROC(GrGLBindBufferProc, BindBuffer); GR_GET_PROC(GrGLBindTextureProc, BindTexture); + interface->fBindVertexArray = + (GrGLBindVertexArrayProc) eglGetProcAddress("glBindVertexArrayOES"); GR_GET_PROC(GrGLBlendColorProc, BlendColor); GR_GET_PROC(GrGLBlendFuncProc, BlendFunc); GR_GET_PROC(GrGLBufferDataProc, BufferData); @@ -61,6 +63,8 @@ const GrGLInterface* GrGLCreateANGLEInterface() { GR_GET_PROC(GrGLDeleteProgramProc, DeleteProgram); GR_GET_PROC(GrGLDeleteShaderProc, DeleteShader); GR_GET_PROC(GrGLDeleteTexturesProc, DeleteTextures); + interface->fDeleteVertexArrays = + (GrGLDeleteVertexArraysProc) eglGetProcAddress("glDeleteVertexArraysOES"); GR_GET_PROC(GrGLDepthMaskProc, DepthMask); GR_GET_PROC(GrGLDisableProc, Disable); GR_GET_PROC(GrGLDisableVertexAttribArrayProc, DisableVertexAttribArray); @@ -73,6 +77,8 @@ const GrGLInterface* GrGLCreateANGLEInterface() { GR_GET_PROC(GrGLFrontFaceProc, FrontFace); GR_GET_PROC(GrGLGenBuffersProc, GenBuffers); GR_GET_PROC(GrGLGenTexturesProc, GenTextures); + interface->fGenVertexArrays = + (GrGLGenVertexArraysProc) eglGetProcAddress("glGenVertexArraysOES"); GR_GET_PROC(GrGLGetBufferParameterivProc, GetBufferParameteriv); GR_GET_PROC(GrGLGetErrorProc, GetError); GR_GET_PROC(GrGLGetIntegervProc, GetIntegerv); @@ -101,9 +107,7 @@ const GrGLInterface* GrGLCreateANGLEInterface() { #if GL_ARB_texture_storage GR_GET_PROC(GrGLTexStorage2DProc, TexStorage2D); #elif GL_EXT_texture_storage - interface->fTexStorage2D = (GrGLTexStorage2DProc) - GetProcAddress(ghANGLELib, - "glTexStorage2DEXT"); + interface->fTexStorage2D = (GrGLTexStorage2DProc) eglGetProcAddress("glTexStorage2DEXT"); #endif GR_GET_PROC(GrGLUniform1fProc, Uniform1f); GR_GET_PROC(GrGLUniform1iProc, Uniform1i); @@ -147,8 +151,8 @@ const GrGLInterface* GrGLCreateANGLEInterface() { GetRenderbufferParameteriv); GR_GET_PROC(GrGLRenderbufferStorageProc, RenderbufferStorage); - interface->fMapBuffer = (PFNGLMAPBUFFEROESPROC) eglGetProcAddress("glMapBufferOES"); - interface->fUnmapBuffer = (PFNGLUNMAPBUFFEROESPROC) eglGetProcAddress("glUnmapBufferOES"); + interface->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBufferOES"); + interface->fUnmapBuffer = (GrGLUnmapBufferProc) eglGetProcAddress("glUnmapBufferOES"); } glInterface.get()->ref(); return glInterface.get(); |