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/angle/GrGLCreateANGLEInterface.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/angle/GrGLCreateANGLEInterface.cpp')
| -rw-r--r-- | src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp b/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp index 5d9b653841..bc1e0ee6c3 100644 --- a/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp +++ b/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp @@ -44,7 +44,6 @@ 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); @@ -62,7 +61,6 @@ 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); @@ -75,7 +73,6 @@ 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); @@ -104,7 +101,9 @@ const GrGLInterface* GrGLCreateANGLEInterface() { #if GL_ARB_texture_storage GR_GET_PROC(GrGLTexStorage2DProc, TexStorage2D); #elif GL_EXT_texture_storage - interface->fTexStorage2D = (PFNGLTEXSTORAGE2DEXTPROC) eglGetProcAddress("glTexStorage2DEXT"); + interface->fTexStorage2D = (GrGLTexStorage2DProc) + GetProcAddress(ghANGLELib, + "glTexStorage2DEXT"); #endif GR_GET_PROC(GrGLUniform1fProc, Uniform1f); GR_GET_PROC(GrGLUniform1iProc, Uniform1i); |