diff options
| author | sheu@chromium.org <sheu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-19 04:27:00 +0000 |
|---|---|---|
| committer | sheu@chromium.org <sheu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-19 04:27:00 +0000 |
| commit | b040f9da1e83507fcff6588bacdcb7e298734940 (patch) | |
| tree | c4972128f5c62fd4d8f5207670a7905e5e3d4e1e /third_party | |
| parent | af87d31a117bb0a5a117f5565375738e4c490b52 (diff) | |
| download | chromium_src-b040f9da1e83507fcff6588bacdcb7e298734940.zip chromium_src-b040f9da1e83507fcff6588bacdcb7e298734940.tar.gz chromium_src-b040f9da1e83507fcff6588bacdcb7e298734940.tar.bz2 | |
Use EGL headers to pick up EGL definitions.
* Remove forward-definitions of EGL types from ui/gl/gl_bindings.h, and use
the actual EGL headers instead.
* Clean up users of gl_bindings.h to not use system headers.
BUG=chromium:169433
TEST=local build, run on snow; trybots
Change-Id: Ibdf8f92574ff1a31389531fa462f05319b20a66f
Review URL: https://chromiumcodereview.appspot.com/11961032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177834 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/khronos/EGL/eglplatform.h | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/third_party/khronos/EGL/eglplatform.h b/third_party/khronos/EGL/eglplatform.h index 8e9ed43..34c6e61 100644 --- a/third_party/khronos/EGL/eglplatform.h +++ b/third_party/khronos/EGL/eglplatform.h @@ -83,6 +83,17 @@ typedef int EGLNativeDisplayType; typedef void *EGLNativeWindowType; typedef void *EGLNativePixmapType; +// From Android NDK. +#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) */ @@ -94,16 +105,17 @@ typedef Pixmap EGLNativePixmapType; typedef Window EGLNativeWindowType; #elif defined(__APPLE__) -#ifdef __OBJC__ -@class NSView; -#else -struct NSView; -#endif // __OBJC__ // TODO(gman): these are place holders. typedef void *EGLNativeDisplayType; typedef int EGLNativePixmapType; +#ifdef __OBJC__ +@class NSView; +typedef NSView *EGLNativeWindowType; +#else +struct NSView; typedef struct NSView *EGLNativeWindowType; +#endif // __OBJC__ #else #error "Platform not recognized" |