diff options
| author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-21 19:46:21 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-21 19:46:21 +0000 |
| commit | 623cc52543dbbf949e4c0cece77fb662fee7d345 (patch) | |
| tree | ec2cf18d6e5ac4838bb2d00198f0695f9cd9d59a | |
| parent | 78248866a4cc3fc47cfa6304bb5d54741e2b9af6 (diff) | |
| download | src-623cc52543dbbf949e4c0cece77fb662fee7d345.tar.gz | |
Fix for ANGLE interface error
NOTREECHECKS=True
NOTRY=True
R=bsalomon@google.com
TBR=bsalomon@google.com
BUG=skia:
Author: egdaniel@google.com
Review URL: https://codereview.chromium.org/165673003
git-svn-id: http://skia.googlecode.com/svn/trunk/src@13541 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gpu/gl/angle/GrGLCreateANGLEInterface.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gpu/gl/angle/GrGLCreateANGLEInterface.cpp b/gpu/gl/angle/GrGLCreateANGLEInterface.cpp index 95229df3..2d914045 100644 --- a/gpu/gl/angle/GrGLCreateANGLEInterface.cpp +++ b/gpu/gl/angle/GrGLCreateANGLEInterface.cpp @@ -153,11 +153,11 @@ const GrGLInterface* GrGLCreateANGLEInterface() { functions->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBufferOES"); functions->fUnmapBuffer = (GrGLUnmapBufferProc) eglGetProcAddress("glUnmapBufferOES"); - if (extensions.has("GL_EXT_debug_marker")) { - functions->fInsertEventMarker = (GrGLInsertEventMarkerProc) eglGetProcAddress("glInsertEventMarkerEXT"); - functions->fPushGroupMarker = (GrGLInsertEventMarkerProc) eglGetProcAddress("glPushGroupMarkerEXT"); - functions->fPopGroupMarker = (GrGLPopGroupMarkerProc) eglGetProcAddress("glPopGropuMarkerEXT"); - } +#if GL_EXT_debug_marker + functions->fInsertEventMarker = (GrGLInsertEventMarkerProc) eglGetProcAddress("glInsertEventMarkerEXT"); + functions->fPushGroupMarker = (GrGLInsertEventMarkerProc) eglGetProcAddress("glPushGroupMarkerEXT"); + functions->fPopGroupMarker = (GrGLPopGroupMarkerProc) eglGetProcAddress("glPopGropuMarkerEXT"); +#endif interface->fExtensions.init(kGLES_GrGLStandard, interface->fFunctions.fGetString, |