diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-16 17:57:36 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-16 17:57:36 +0000 |
| commit | 86be5d085562b134a353faffe5c737470f0a1788 (patch) | |
| tree | 5f126b106b49c24711c56c97890e129a3c794e8d /ui/gl | |
| parent | 14055fca73ef88666127f1f9c3b1c62d2ea683f7 (diff) | |
| download | chromium_src-86be5d085562b134a353faffe5c737470f0a1788.zip chromium_src-86be5d085562b134a353faffe5c737470f0a1788.tar.gz chromium_src-86be5d085562b134a353faffe5c737470f0a1788.tar.bz2 | |
Move code around to fix build with system mesa.
BUG=161389
Review URL: https://codereview.chromium.org/11973003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177172 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gl')
| -rw-r--r-- | ui/gl/DEPS | 1 | ||||
| -rwxr-xr-x | ui/gl/generate_bindings.py | 10 | ||||
| -rw-r--r-- | ui/gl/gl_context_glx.cc | 1 |
3 files changed, 10 insertions, 2 deletions
@@ -1,4 +1,5 @@ include_rules = [ + "+gpu/GL", "+third_party/angle/include", "+third_party/mesa/MesaLib/include", ] diff --git a/ui/gl/generate_bindings.py b/ui/gl/generate_bindings.py index 0ac28f7..478f7b9 100755 --- a/ui/gl/generate_bindings.py +++ b/ui/gl/generate_bindings.py @@ -1152,11 +1152,16 @@ FUNCTION_SETS = [ 'GL/glext.h', 'GLES2/gl2ext.h', # Files below are Chromium-specific and shipped with Chromium sources. + 'GL/glextchromium.h', 'GLES2/gl2chromium.h', 'GLES2/gl2extchromium.h' ], []], [OSMESA_FUNCTIONS, 'osmesa', [], []], - [EGL_FUNCTIONS, 'egl', ['EGL/eglext.h'], + [EGL_FUNCTIONS, 'egl', [ + 'EGL/eglext.h', + # Files below are Chromium-specific and shipped with Chromium sources. + 'EGL/eglextchromium.h', + ], [ 'EGL_ANGLE_d3d_share_handle_client_buffer', 'EGL_ANGLE_surface_d3d_texture_2d_share_handle', @@ -1593,7 +1598,8 @@ def ParseExtensionFunctionsFromHeader(header_file): Returns: Map of extension name => functions. """ - extension_start = re.compile(r'#define ([A-Z]+_[A-Z]+_[a-zA-Z]\w+) 1') + extension_start = re.compile( + r'#ifndef ((?:GL|EGL|WGL|GLX)_[A-Z]+_[a-zA-Z]\w+)') extension_function = re.compile(r'.+\s+([a-z]+\w+)\s*\(') typedef = re.compile(r'typedef .*') macro_start = re.compile(r'^#(if|ifdef|ifndef).*') diff --git a/ui/gl/gl_context_glx.cc b/ui/gl/gl_context_glx.cc index fed5382..1f138e2 100644 --- a/ui/gl/gl_context_glx.cc +++ b/ui/gl/gl_context_glx.cc @@ -11,6 +11,7 @@ extern "C" { #include "base/debug/trace_event.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "gpu/GL/glextchromium.h" #include "third_party/mesa/MesaLib/include/GL/osmesa.h" #include "ui/gl/gl_bindings.h" #include "ui/gl/gl_implementation.h" |