summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrjkroege@chromium.org <rjkroege@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-23 10:34:12 +0000
committerrjkroege@chromium.org <rjkroege@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-23 10:34:12 +0000
commita369f129ab2b845c229550cc7375e3c9955319c1 (patch)
treefc762e26875cdb698d0a7d2a1efca92b47f4678e
parenta4c5eb7e3f3787e50d1c7588e6f6a24ba475a0e4 (diff)
downloadchromium_src-a369f129ab2b845c229550cc7375e3c9955319c1.zip
chromium_src-a369f129ab2b845c229550cc7375e3c9955319c1.tar.gz
chromium_src-a369f129ab2b845c229550cc7375e3c9955319c1.tar.bz2
Added EGLNativeWindow etc. typedefs for ozone.
BUG=178543 Review URL: https://chromiumcodereview.appspot.com/14757005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201734 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--third_party/khronos/EGL/eglplatform.h6
-rw-r--r--third_party/khronos/README.chromium1
2 files changed, 7 insertions, 0 deletions
diff --git a/third_party/khronos/EGL/eglplatform.h b/third_party/khronos/EGL/eglplatform.h
index 34c6e61..c7d3d7b 100644
--- a/third_party/khronos/EGL/eglplatform.h
+++ b/third_party/khronos/EGL/eglplatform.h
@@ -94,6 +94,12 @@ typedef struct ANativeWindow* EGLNativeWindowType;
typedef struct egl_native_pixmap_t* EGLNativePixmapType;
typedef void* EGLNativeDisplayType;
+#elif defined(USE_OZONE)
+
+typedef int EGLNativeDisplayType;
+typedef intptr_t EGLNativeWindowType;
+typedef intptr_t EGLNativePixmapType;
+
#elif defined(__unix__)
/* X11 (tentative) */
diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium
index da2e6c5..52d3387 100644
--- a/third_party/khronos/README.chromium
+++ b/third_party/khronos/README.chromium
@@ -26,5 +26,6 @@ GLES2/gl2ext.h
- Added include of gl2chromium.h
EGL/eglplatform.h
- Added EGLNative*Type for Mac.
+ - Added EGLNative*Type for native linux framebuffers.
DEPS
- Added DEPS file to prevent inclusion of external dependencies.