diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 22:01:54 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 22:01:54 +0000 |
| commit | 9842933beaf6b8e052cfa7042f3ec3ae8b924aa5 (patch) | |
| tree | 2cb39f5735ab12a3f3cf47e17c7adb1c83a05e14 /gpu/gpu.gyp | |
| parent | cc9383dc17bf6501cebc917962e22750adfc06e7 (diff) | |
| download | chromium_src-9842933beaf6b8e052cfa7042f3ec3ae8b924aa5.zip chromium_src-9842933beaf6b8e052cfa7042f3ec3ae8b924aa5.tar.gz chromium_src-9842933beaf6b8e052cfa7042f3ec3ae8b924aa5.tar.bz2 | |
Fix to allow the gles2 conformance tests to run
TEST=ran the conformance tests
BUG=none
Review URL: http://codereview.chromium.org/6282008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71849 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
| -rw-r--r-- | gpu/gpu.gyp | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index bd9fbb0..f9f58af 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -5,6 +5,14 @@ { 'variables': { 'chromium_code': 1, + # These are defined here because we need to build this library twice. Once + # with extra parameter checking. Once with no parameter checking to be 100% + # OpenGL ES 2.0 compliant for the conformance tests. + 'gles2_c_lib_source_files': [ + 'command_buffer/client/gles2_c_lib.h', + 'command_buffer/client/gles2_c_lib.cc', + 'command_buffer/client/gles2_c_lib_autogen.h', + ], }, 'targets': [ { @@ -93,9 +101,22 @@ 'gles2_lib', ], 'sources': [ - 'command_buffer/client/gles2_c_lib.h', - 'command_buffer/client/gles2_c_lib.cc', - 'command_buffer/client/gles2_c_lib_autogen.h', + '<@(gles2_c_lib_source_files)', + ], + }, + { + # Same as gles2_c_lib except with no parameter checking. Required for + # OpenGL ES 2.0 conformance tests. + 'target_name': 'gles2_c_lib_nocheck', + 'type': 'static_library', + 'defines': [ + 'GLES2_CONFORMANCE_TESTS=1', + ], + 'dependencies': [ + 'gles2_lib', + ], + 'sources': [ + '<@(gles2_c_lib_source_files)', ], }, { |