Index: src/gpu/gl/android/SkNativeGLContext_android.cpp |
diff --git a/src/gpu/gl/android/SkNativeGLContext_android.cpp b/src/gpu/gl/android/SkNativeGLContext_android.cpp |
index dda7d9d3fa03e09891566c88ac20894fde17e21c..462109a6c4867688ac5cada88bf92701fbfd41a9 100644 |
--- a/src/gpu/gl/android/SkNativeGLContext_android.cpp |
+++ b/src/gpu/gl/android/SkNativeGLContext_android.cpp |
@@ -65,19 +65,19 @@ const GrGLInterface* SkNativeGLContext::createGLContext() { |
const EGLint* fContextAttribs; |
EGLenum fAPI; |
EGLint fRenderableTypeBit; |
- GrGLBinding fBinding; |
+ GrGLStandard fStandard; |
} kAPIs[] = { |
{ // OpenGL |
kEGLContextAttribsForOpenGL, |
EGL_OPENGL_API, |
EGL_OPENGL_BIT, |
- kDesktop_GrGLBinding |
+ kGL_GrGLStandard |
}, |
{ // OpenGL ES. This seems to work for both ES2 and 3 (when available). |
kEGLContextAttribsForOpenGLES, |
EGL_OPENGL_ES_API, |
EGL_OPENGL_ES2_BIT, |
- kES_GrGLBinding |
+ kGLES_GrGLStandard |
}, |
}; |
@@ -150,7 +150,7 @@ const GrGLInterface* SkNativeGLContext::createGLContext() { |
continue; |
} |
- if (!interface->validate(kAPIs[api].fBinding)) { |
+ if (!interface->validate()) { |
interface->unref(); |
interface = NULL; |
this->destroyGLContext(); |