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

Unified Diff: include/gpu/gl/SkNativeGLContext.h

Issue 599493003: Revert "Add support for EGL on linux" (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « gyp/gpu.gypi ('k') | src/gpu/gl/android/SkNativeGLContext_android.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/gpu/gl/SkNativeGLContext.h
diff --git a/include/gpu/gl/SkNativeGLContext.h b/include/gpu/gl/SkNativeGLContext.h
index 14062db0ecccdf3b460130841fa902de112b2e49..3bb6530c270f0ad717dd53da5f3360f4a6151e3b 100644
--- a/include/gpu/gl/SkNativeGLContext.h
+++ b/include/gpu/gl/SkNativeGLContext.h
@@ -35,7 +35,7 @@ static const struct { int major, minor; } gl_versions[] = {
#if defined(SK_BUILD_FOR_MAC)
#include <OpenGL/OpenGL.h>
-#elif defined(SK_EGL)
+#elif defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_NACL)
#include <GLES2/gl2.h>
#include <EGL/egl.h>
#elif defined(SK_BUILD_FOR_UNIX)
@@ -64,7 +64,7 @@ public:
private:
#if defined(SK_BUILD_FOR_MAC)
CGLContextObj fOldCGLContext;
- #elif defined(SK_EGL)
+ #elif defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_NACL)
EGLContext fOldEGLContext;
EGLDisplay fOldDisplay;
EGLSurface fOldSurface;
@@ -88,7 +88,7 @@ protected:
private:
#if defined(SK_BUILD_FOR_MAC)
CGLContextObj fContext;
-#elif defined(SK_EGL)
+#elif defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_NACL)
EGLContext fContext;
EGLDisplay fDisplay;
EGLSurface fSurface;
« no previous file with comments | « gyp/gpu.gypi ('k') | src/gpu/gl/android/SkNativeGLContext_android.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698