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 | |
| 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
| -rw-r--r-- | gpu/command_buffer/client/gles2_c_lib.cc | 2 | ||||
| -rw-r--r-- | gpu/gpu.gyp | 27 |
2 files changed, 25 insertions, 4 deletions
diff --git a/gpu/command_buffer/client/gles2_c_lib.cc b/gpu/command_buffer/client/gles2_c_lib.cc index f53067e..cf0a0b5 100644 --- a/gpu/command_buffer/client/gles2_c_lib.cc +++ b/gpu/command_buffer/client/gles2_c_lib.cc @@ -20,7 +20,7 @@ // // If it was up to us we'd just always write to the destination but the OpenGL // spec defines the behavior of OpenGL function, not us. :-( -#if defined(__native_client__) +#if defined(__native_client__) || defined(GLES2_CONFORMANCE_TESTS) #define GL_CLIENT_VALIDATE_DESTINATION_INITALIZATION_ASSERT(v) #elif defined(GPU_DCHECK) #define GL_CLIENT_VALIDATE_DESTINATION_INITALIZATION_ASSERT(v) GPU_DCHECK(v) 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)', ], }, { |