From 93276c683d383142dfad31a01c6fdb1c810b6c1f Mon Sep 17 00:00:00 2001 From: bsalomon Date: Mon, 23 Feb 2015 10:51:13 -0800 Subject: Remove EGL header from SkANGLELContext.h TBR=egdaniel@google.com Review URL: https://codereview.chromium.org/947263002 --- src/gpu/gl/angle/SkANGLEGLContext.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/gpu/gl/angle') 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 + #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(nativeDisplay)); } // Try for an ANGLE D3D11 context, fall back to D3D9. -- cgit v1.2.3