Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(316)

Unified Diff: src/gpu/gl/android/SkNativeGLContext_android.cpp

Issue 133413003: Rename GrGLBinding->GrGLStandard, no longer a bitfield (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: actually fix enum names? Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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();

Powered by Google App Engine
This is Rietveld 408576698