Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(306)

Unified Diff: gpu/gpu.gyp

Issue 6282008: Fix to allow the gles2 conformance tests to run... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/client/gles2_c_lib.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/gpu.gyp
===================================================================
--- gpu/gpu.gyp (revision 71466)
+++ gpu/gpu.gyp (working copy)
@@ -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,12 +101,25 @@
'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)',
+ ],
+ },
+ {
'target_name': 'command_buffer_client',
'type': 'static_library',
'dependencies': [
« no previous file with comments | « gpu/command_buffer/client/gles2_c_lib.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698