Chromium Code Reviews| Index: include/gpu/gl/SkNativeGLContext.h |
| diff --git a/include/gpu/gl/SkNativeGLContext.h b/include/gpu/gl/SkNativeGLContext.h |
| index 3bb6530c270f0ad717dd53da5f3360f4a6151e3b..6c2f8f951db3b1aca158ac70628571a528a67f67 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_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_NACL) |
| +#elif SK_EGL == 1 |
|
bsalomon
2014/10/01 16:00:17
This can just be:
#if SK_EGL
|
| #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_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_NACL) |
| + #elif SK_EGL == 1 |
| EGLContext fOldEGLContext; |
| EGLDisplay fOldDisplay; |
| EGLSurface fOldSurface; |
| @@ -88,7 +88,7 @@ protected: |
| private: |
| #if defined(SK_BUILD_FOR_MAC) |
| CGLContextObj fContext; |
| -#elif defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_NACL) |
| +#elif SK_EGL == 1 |
| EGLContext fContext; |
| EGLDisplay fDisplay; |
| EGLSurface fSurface; |