diff options
| author | Sven Gothel <[email protected]> | 2015-02-26 02:58:56 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-02-26 02:58:56 +0100 |
| commit | 6b05c6919f3df20ce0b55d5ac7dda7b14068568e (patch) | |
| tree | 245cd1438996d40e55858cafca6d21ddca0a5a23 /make/stub_includes/egl/EGL/eglplatform.h | |
| parent | 37ec129f36097f41ed0d45cbccd7a93e493e2bb9 (diff) | |
Bug 1135 - Support EGL 1.5 , ES 3.1 and GL 4.5 - Part 1: Update header to latest version
- khr/KHR/khrplatform.h: 2013-09-30 vanilla
- opengl/GLES3/khrplatform.h *removed* -> khr/KHR/khrplatform.h
- egl/EGL/egl.h: 2015-01-02 vanilla
- egl/EGL/eglext.h: 2015-01-02 vanilla
- egl/EGL/eglplatform.h: 2013-10-09 vanilla
- opengl/GLES2/gl2.h: 2015-01-22 vanilla
- opengl/GLES2/gl2ext.h 2015-01-26 vanilla
- opengl/GLES2/gl2platform.h 2013-10-02 vanilla
- opengl/GLES3/gl3.h *removed* -> opengl/GLES3/gl31.h
- opengl/GLES3/gl31.h 2015-01-22 vanilla
- opengl/GLES3/gl3platform.h 2013-10-02 vanilla
- opengl/GL/glcorearb.h 2015-02-02 vanilla
- opengl/GL/glext.h 2015-02-02 vanilla
- opengl/GL/glxext.h 2014-09-18 vanilla
- opengl/GL/wglext.h 2014-08-11 vanilla
Diffstat (limited to 'make/stub_includes/egl/EGL/eglplatform.h')
| -rw-r--r-- | make/stub_includes/egl/EGL/eglplatform.h | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/make/stub_includes/egl/EGL/eglplatform.h b/make/stub_includes/egl/EGL/eglplatform.h index b594e394d..3ab8844f0 100644 --- a/make/stub_includes/egl/EGL/eglplatform.h +++ b/make/stub_includes/egl/EGL/eglplatform.h @@ -2,7 +2,7 @@ #define __eglplatform_h_ /* -** Copyright (c) 2007-2009 The Khronos Group Inc. +** Copyright (c) 2007-2013 The Khronos Group Inc. ** ** Permission is hereby granted, free of charge, to any person obtaining a ** copy of this software and/or associated documentation files (the @@ -25,7 +25,7 @@ */ /* Platform-specific types and definitions for egl.h - * $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $ + * $Revision: 23432 $ on $Date: 2013-10-09 00:57:24 -0700 (Wed, 09 Oct 2013) $ * * 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 @@ -83,7 +83,17 @@ typedef int EGLNativeDisplayType; typedef void *EGLNativeWindowType; typedef void *EGLNativePixmapType; -#elif defined(__X11__) +#elif defined(__ANDROID__) || defined(ANDROID) + +#include <android/native_window.h> + +struct egl_native_pixmap_t; + +typedef struct ANativeWindow* EGLNativeWindowType; +typedef struct egl_native_pixmap_t* EGLNativePixmapType; +typedef void* EGLNativeDisplayType; + +#elif defined(__unix__) /* X11 (tentative) */ #include <X11/Xlib.h> @@ -94,13 +104,7 @@ typedef Pixmap EGLNativePixmapType; typedef Window EGLNativeWindowType; #else - -#warning "Info: Using generic void pointer for EGLNativeDisplayType, EGLNativeWindowType and EGLNativePixmapType" - -typedef struct __EGLNativeDisplayType* EGLNativeDisplayType; -typedef struct __EGLNativeWindowType* EGLNativeWindowType; -typedef struct __EGLNativePixmapType* EGLNativePixmapType; - +#error "Platform not recognized" #endif /* EGL 1.2 types, renamed for consistency in EGL 1.3 */ |