GPU client side changes for GpuMemoryBuffers

gpu/gpu.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'nacl_win64_target': 0,
   },
   'includes': [
     'gpu_common.gypi',
   ],
   'targets': [
     {
       # Library emulates GLES2 using command_buffers.
       'target_name': 'gles2_implementation',
       'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
+        '../testing/gmock.gyp:gmock',

[greggman, 2013/05/10 00:12:22]

Mock should not be here. Mock is only used in unit tests, not in shipping code. 

[kaanb, 2013/05/13 23:00:36]

Done.

         '../third_party/khronos/khronos.gyp:khronos_headers',
         '../ui/gl/gl.gyp:gl',
         'command_buffer/command_buffer.gyp:gles2_utils',
         'gles2_cmd_helper',
       ],
       'defines': [
         'GLES2_IMPL_IMPLEMENTATION',
       ],
       'sources': [
         '<@(gles2_implementation_source_files)',
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [4267, ],
     },
     {
       # Library emulates GLES2 using command_buffers.
       'target_name': 'gles2_implementation_client_side_arrays',
       'type': '<(component)',
       'defines': [
         'GLES2_IMPL_IMPLEMENTATION',
         'GLES2_SUPPORT_CLIENT_SIDE_ARRAYS=1',
       ],
       'dependencies': [
         '../base/base.gyp:base',
+        '../testing/gmock.gyp:gmock',

[greggman, 2013/05/10 00:12:22]

Mock should not be here. Mock is only used in unit tests, not in shipping code

[kaanb, 2013/05/13 23:00:36]

Done.

         '../third_party/khronos/khronos.gyp:khronos_headers',
         '../ui/gl/gl.gyp:gl',
         'command_buffer/command_buffer.gyp:gles2_utils',
         'gles2_cmd_helper',
       ],
       'sources': [
         '<@(gles2_implementation_source_files)',
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
     },
     {
       # Library emulates GLES2 using command_buffers.
       'target_name': 'gles2_implementation_client_side_arrays_no_check',
       'type': '<(component)',
       'defines': [
         'GLES2_IMPL_IMPLEMENTATION',
         'GLES2_SUPPORT_CLIENT_SIDE_ARRAYS=1',
         'GLES2_CONFORMANCE_TESTS=1',
       ],
       'dependencies': [
         '../base/base.gyp:base',
+        '../testing/gmock.gyp:gmock',

[greggman, 2013/05/10 00:12:22]

Mock should not be here. Mock is only used in unit tests, not in shipping code

[kaanb, 2013/05/13 23:00:36]

Done.

         '../third_party/khronos/khronos.gyp:khronos_headers',
         'command_buffer/command_buffer.gyp:gles2_utils',
         'gles2_cmd_helper',
       ],
       'sources': [
         '<@(gles2_implementation_source_files)',
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
     },
@@ skipping 165 matching lines @@
       'defines': [
         'GLES2_C_LIB_IMPLEMENTATION',
         'GL_GLEXT_PROTOTYPES',
       ],
       'sources': [
         '<@(gles2_c_lib_source_files)',
         'command_buffer/tests/gl_bind_uniform_location_unittest.cc',
         'command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc',
         'command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc',
         'command_buffer/tests/gl_depth_texture_unittest.cc',
+        'command_buffer/tests/gl_gpu_memory_buffer_unittests.cc',
         'command_buffer/tests/gl_lose_context_chromium_unittests.cc',
         'command_buffer/tests/gl_manager.cc',
         'command_buffer/tests/gl_manager.h',
         'command_buffer/tests/gl_pointcoord_unittest.cc',
         'command_buffer/tests/gl_program_unittests.cc',
         'command_buffer/tests/gl_query_unittests.cc',
         'command_buffer/tests/gl_readback_unittests.cc',
         'command_buffer/tests/gl_shared_resources_unittests.cc',
         'command_buffer/tests/gl_stream_draw_unittests.cc',
         'command_buffer/tests/gl_test_utils.cc',
@@ skipping 243 matching lines @@
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [
             '../build/apk_test.gypi',
           ],
         },
       ],
     }],
   ],
 }