diff options
| author |  borenet <borenet@google.com> | 2014-09-24 05:31:07 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-24 05:31:07 -0700 |
| commit | e33985a56d4aa41b72b0e266897aa4f0100d6d2e (patch) | |
| tree | 6b8700126c94f6d44de233aee8965441c925cd7d /include | |
| parent | 6915f7f8498ea2a0e7c06e29c892cd32149bf0e4 (diff) | |
Revert "Add support for EGL on linux"
This reverts commit 1cea736c3280b6f0553e3eaa598e41370b305b57.
Caused segfaults on all Android devices
R=bsalomon@google.com, djsollen@google.com
TBR=bsalomon, djsollen
NOTRY=true
BUG=skia:
Author: borenet@google.com
Review URL: https://codereview.chromium.org/599493003
Diffstat (limited to 'include')
| -rw-r--r-- | include/gpu/gl/SkNativeGLContext.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/gpu/gl/SkNativeGLContext.h b/include/gpu/gl/SkNativeGLContext.h index 14062db0ec..3bb6530c27 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; |