From 1a57d235109ec50ff4e8af5beffe849b02b0945a Mon Sep 17 00:00:00 2001 From: "sievers@chromium.org" Date: Thu, 12 Sep 2013 21:09:33 +0000 Subject: 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 --- ui/gl/generate_bindings.py | 4 ++++ ui/gl/gl.gyp | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) 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)', -- cgit v1.1