From 7102690b3ba3e8ffe9a4c19de81f9c572b20d03c Mon Sep 17 00:00:00 2001 From: "skyostil@google.com" Date: Thu, 24 Nov 2011 13:29:37 +0000 Subject: Move GL headers from gpu to third_party/khronos This change moves the OpenGL ES and EGL header files from gpu/ to a new third_party/khronos/ directory. The headers are also rebased to the latest upstream versions. BUG=102824 TEST=none Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=111170 Review URL: http://codereview.chromium.org/8423038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111523 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/gfx/gl/generate_bindings.py | 4 ++-- ui/gfx/gl/gl.gyp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'ui') diff --git a/ui/gfx/gl/generate_bindings.py b/ui/gfx/gl/generate_bindings.py index 8074242..29a398d 100755 --- a/ui/gfx/gl/generate_bindings.py +++ b/ui/gfx/gl/generate_bindings.py @@ -472,9 +472,9 @@ GLX_FUNCTIONS = [ FUNCTION_SETS = [ [GL_FUNCTIONS, 'gl', ['../../../third_party/mesa/MesaLib/include/GL/glext.h', - '../../../gpu/GLES2/gl2ext.h']], + '../../../third_party/khronos/GLES2/gl2ext.h']], [OSMESA_FUNCTIONS, 'osmesa', []], - [EGL_FUNCTIONS, 'egl', ['../../../gpu/EGL/eglext.h']], + [EGL_FUNCTIONS, 'egl', ['../../../third_party/khronos/EGL/eglext.h']], [WGL_FUNCTIONS, 'wgl', [ '../../../third_party/mesa/MesaLib/include/GL/wglext.h']], [GLX_FUNCTIONS, 'glx', [ diff --git a/ui/gfx/gl/gl.gyp b/ui/gfx/gl/gl.gyp index ffb1d62..df64266 100644 --- a/ui/gfx/gl/gl.gyp +++ b/ui/gfx/gl/gl.gyp @@ -88,11 +88,11 @@ 'action_name': 'generate_gl_bindings', 'inputs': [ 'generate_bindings.py', - '../../../gpu/GLES2/gl2ext.h', - '../../../gpu/EGL/eglext.h', - '../../../third_party/mesa/MesaLib/include/GL/glext.h', - '../../../third_party/mesa/MesaLib/include/GL/glxext.h', - '../../../third_party/mesa/MesaLib/include/GL/wglext.h', + '<(DEPTH)/third_party/khronos/GLES2/gl2ext.h', + '<(DEPTH)/third_party/khronos/EGL/eglext.h', + '<(DEPTH)/third_party/mesa/MesaLib/include/GL/glext.h', + '<(DEPTH)/third_party/mesa/MesaLib/include/GL/glxext.h', + '<(DEPTH)/third_party/mesa/MesaLib/include/GL/wglext.h', ], 'outputs': [ '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc', -- cgit v1.1