diff options
| author |  bsalomon <bsalomon@google.com> | 2015-02-23 10:51:13 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-23 10:51:13 -0800 |
| commit | 93276c683d383142dfad31a01c6fdb1c810b6c1f (patch) | |
| tree | e3b9fdc6e1a4e65d0153551380eb19a93321ccec /src/gpu/gl/angle | |
| parent | 44906c66285b81d641e692bde6ec5c8f010e30b6 (diff) | |
Remove EGL header from SkANGLELContext.h
TBR=egdaniel@google.com
Review URL: https://codereview.chromium.org/947263002
Diffstat (limited to 'src/gpu/gl/angle')
| -rw-r--r-- | src/gpu/gl/angle/SkANGLEGLContext.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gpu/gl/angle/SkANGLEGLContext.cpp b/src/gpu/gl/angle/SkANGLEGLContext.cpp index 9470bf0360..cea2adf989 100644 --- a/src/gpu/gl/angle/SkANGLEGLContext.cpp +++ b/src/gpu/gl/angle/SkANGLEGLContext.cpp @@ -8,12 +8,14 @@ #include "gl/angle/SkANGLEGLContext.h" +#include <EGL/egl.h> + #define EGL_PLATFORM_ANGLE_ANGLE 0x3201 #define EGL_PLATFORM_ANGLE_TYPE_ANGLE 0x3202 #define EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE 0x3206 #define EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE 0x3207 -EGLDisplay SkANGLEGLContext::GetD3DEGLDisplay(EGLNativeDisplayType nativeDisplay) { +void* SkANGLEGLContext::GetD3DEGLDisplay(void* nativeDisplay) { typedef EGLDisplay (*EGLGetPlatformDisplayEXT)(EGLenum platform, void *native_display, @@ -23,7 +25,7 @@ EGLDisplay SkANGLEGLContext::GetD3DEGLDisplay(EGLNativeDisplayType nativeDisplay (EGLGetPlatformDisplayEXT) eglGetProcAddress("eglGetPlatformDisplayEXT"); if (!eglGetPlatformDisplayEXT) { - return eglGetDisplay(nativeDisplay); + return eglGetDisplay(static_cast<EGLNativeDisplayType>(nativeDisplay)); } // Try for an ANGLE D3D11 context, fall back to D3D9. |