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

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)

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)',
       ],
     },
     {