diff options
| author | Oliver Wolff <oliver.wolff@theqtcompany.com> | 2016-03-24 12:38:18 +0100 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2016-04-25 05:57:38 +0000 |
| commit | e12ba07322cd61c5cf50c25ed8d1f08f6b1ff879 (patch) | |
| tree | d31a44c9f123ed764a00eff7b4fff656a07d54ab /src/3rdparty/angle/include/EGL/eglplatform.h | |
| parent | d3dcc6f610b97be7cbfbb0a65988e5940568c825 (diff) | |
Update ANGLE to chromium/2651
Change-Id: I1cd32b780b1a0b913fab870e155ae1f4f9ac40d7
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'src/3rdparty/angle/include/EGL/eglplatform.h')
| -rw-r--r-- | src/3rdparty/angle/include/EGL/eglplatform.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/3rdparty/angle/include/EGL/eglplatform.h b/src/3rdparty/angle/include/EGL/eglplatform.h index 519df3e750..6d550da9cd 100644 --- a/src/3rdparty/angle/include/EGL/eglplatform.h +++ b/src/3rdparty/angle/include/EGL/eglplatform.h @@ -25,7 +25,7 @@ */ /* Platform-specific types and definitions for egl.h - * $Revision: 23432 $ on $Date: 2013-10-09 00:57:24 -0700 (Wed, 09 Oct 2013) $ + * $Revision: 30994 $ on $Date: 2015-04-30 13:36:48 -0700 (Thu, 30 Apr 2015) $ * * Adopters may modify khrplatform.h and this file to suit their platform. * You are encouraged to submit all modifications to the Khronos group so that @@ -99,6 +99,12 @@ typedef struct ANativeWindow* EGLNativeWindowType; typedef struct egl_native_pixmap_t* EGLNativePixmapType; typedef void* EGLNativeDisplayType; +#elif defined(USE_OZONE) + +typedef intptr_t EGLNativeDisplayType; +typedef intptr_t EGLNativeWindowType; +typedef intptr_t EGLNativePixmapType; + #elif defined(__unix__) /* X11 (tentative) */ @@ -111,11 +117,15 @@ typedef Window EGLNativeWindowType; #elif defined(__GNUC__) && ( defined(__APPLE_CPP__) || defined(__APPLE_CC__) || defined(__MACOS_CLASSIC__) ) -// TODO(jmadill): native implementation for OSX +#if defined(__OBJC__) +@class CALayer; +#else +class CALayer; +#endif typedef void *EGLNativeDisplayType; typedef void *EGLNativePixmapType; -typedef void *EGLNativeWindowType; +typedef CALayer *EGLNativeWindowType; #else #error "Platform not recognized" |