summaryrefslogtreecommitdiffstats
path: root/ui/gl
diff options
context:
space:
mode:
authorsievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-12 21:09:33 +0000
committersievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-12 21:09:33 +0000
commit1a57d235109ec50ff4e8af5beffe849b02b0945a (patch)
treeaf66f1ed3607205e3422b07111373b4c01a656b4 /ui/gl
parent8950bff5d0440600cfb794d3f93c4dc332ce7970 (diff)
downloadchromium_src-1a57d235109ec50ff4e8af5beffe849b02b0945a.zip
chromium_src-1a57d235109ec50ff4e8af5beffe849b02b0945a.tar.gz
chromium_src-1a57d235109ec50ff4e8af5beffe849b02b0945a.tar.bz2
Add eglWaitSyncKHR() EGL binding
NOTRY=True Review URL: https://chromiumcodereview.appspot.com/23619031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222869 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gl')
-rwxr-xr-xui/gl/generate_bindings.py4
-rw-r--r--ui/gl/gl.gyp3
2 files changed, 6 insertions, 1 deletions
diff --git a/ui/gl/generate_bindings.py b/ui/gl/generate_bindings.py
index d1ad779..a3f64ae 100755
--- a/ui/gl/generate_bindings.py
+++ b/ui/gl/generate_bindings.py
@@ -952,6 +952,10 @@ EGL_FUNCTIONS = [
'EGLDisplay dpy, EGLSurface surface, '
'EGLuint64CHROMIUM* ust, EGLuint64CHROMIUM* msc, '
'EGLuint64CHROMIUM* sbc', },
+{ 'return_type': 'EGLint',
+ 'names': ['eglWaitSyncKHR'],
+ 'arguments': 'EGLDisplay dpy, EGLSyncKHR sync, EGLint flags',
+ 'other_extensions': ['EGL_KHR_wait_sync'] },
]
WGL_FUNCTIONS = [
diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp
index bee5874..274065b 100644
--- a/ui/gl/gl.gyp
+++ b/ui/gl/gl.gyp
@@ -133,7 +133,8 @@
'action_name': 'generate_gl_bindings',
'variables': {
'generator_path': 'generate_bindings.py',
- 'header_paths': '../../third_party/mesa/src/include:../../third_party/khronos',
+ # Prefer khronos EGL/GLES headers by listing that path first.
+ 'header_paths': '../../third_party/khronos:../../third_party/mesa/src/include',
},
'inputs': [
'<(generator_path)',