Chromium Code Reviews| Index: src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp |
| diff --git a/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp b/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp |
| index 681eab468c9cf528e4a95acc500670fe6b6a1916..a316ff1c11913c6c8eb82822e9535577019f213b 100644 |
| --- a/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp |
| +++ b/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp |
| @@ -88,6 +88,7 @@ const GrGLInterface* GrGLCreateANGLEInterface() { |
| GET_PROC(GetShaderInfoLog); |
| GET_PROC(GetShaderiv); |
| GET_PROC(GetString); |
| + GET_PROC(GetStringi); |
|
egdaniel
2014/03/31 15:38:04
What is this for? Or just missing from before?
bsalomon
2014/04/01 13:01:30
Yup, just noticed it was missing. ES 3 added this
|
| GET_PROC(GetUniformLocation); |
| GET_PROC(LineWidth); |
| GET_PROC(LinkProgram); |
| @@ -153,15 +154,25 @@ const GrGLInterface* GrGLCreateANGLEInterface() { |
| functions->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBufferOES"); |
| functions->fUnmapBuffer = (GrGLUnmapBufferProc) eglGetProcAddress("glUnmapBufferOES"); |
| -#if GL_EXT_debug_marker |
| functions->fInsertEventMarker = (GrGLInsertEventMarkerProc) eglGetProcAddress("glInsertEventMarkerEXT"); |
| functions->fPushGroupMarker = (GrGLInsertEventMarkerProc) eglGetProcAddress("glPushGroupMarkerEXT"); |
| functions->fPopGroupMarker = (GrGLPopGroupMarkerProc) eglGetProcAddress("glPopGroupMarkerEXT"); |
| + |
| +#if GL_ES_VERSION_3_0 |
| + GET_PROC(InvalidateFramebuffer); |
| + GET_PROC(InvalidateSubFramebuffer); |
| +#else |
| + functions->fInvalidateFramebuffer = (GrGLInvalidateFramebufferProc) eglGetProcAddress("glInvalidateFramebuffer"); |
| + functions->fInvalidateSubFramebuffer = (GrGLInvalidateSubFramebufferProc) eglGetProcAddress("glInvalidateSubFramebuffer"); |
| #endif |
| + functions->fInvalidateBufferData = (GrGLInvalidateBufferDataProc) eglGetProcAddress("glInvalidateBufferData"); |
| + functions->fInvalidateBufferSubData = (GrGLInvalidateBufferSubDataProc) eglGetProcAddress("glInvalidateBufferSubData"); |
| + functions->fInvalidateTexImage = (GrGLInvalidateTexImageProc) eglGetProcAddress("glInvalidateTexImage"); |
| + functions->fInvalidateTexSubImage = (GrGLInvalidateTexSubImageProc) eglGetProcAddress("glInvalidateTexSubImage"); |
| interface->fExtensions.init(kGLES_GrGLStandard, |
| - interface->fFunctions.fGetString, |
| - interface->fFunctions.fGetStringi, |
| - interface->fFunctions.fGetIntegerv); |
| + functions->fGetString, |
| + functions->fGetStringi, |
| + functions->fGetIntegerv); |
| return interface; |
| } |