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

Unified Diff: gpu/gpu.gyp

Issue 693943003: Update from https://crrev.com/302630 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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/gles2_conform_support/gles2_conform_support.gyp ('k') | gpu/gpu_config.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/gpu.gyp
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 5968dab11fc6b9a0e9356ac1784553c9a5bdfd9c..0878a1d316d0422e101875106d09123897f66293 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -61,35 +61,10 @@
},
{
# Library emulates GLES2 using command_buffers.
- # GN version: //gpu/command_buffer/client:gles2_implementation_client_side_arrays
- 'target_name': 'gles2_implementation_client_side_arrays',
+ 'target_name': 'gles2_implementation_no_check',
'type': '<(component)',
'defines': [
'GLES2_IMPL_IMPLEMENTATION',
- 'GLES2_SUPPORT_CLIENT_SIDE_ARRAYS=1',
- ],
- 'dependencies': [
- '../base/base.gyp:base',
- '../third_party/khronos/khronos.gyp:khronos_headers',
- '../ui/gl/gl.gyp:gl',
- '../ui/gfx/gfx.gyp:gfx_geometry',
- '../ui/gfx/gfx.gyp:gfx',
- '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': [
@@ -141,7 +116,7 @@
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'command_buffer/command_buffer.gyp:gles2_utils',
'command_buffer_client',
- 'gles2_implementation_client_side_arrays_no_check',
+ 'gles2_implementation_no_check',
],
'sources': [
'<@(gles2_c_lib_source_files)',
@@ -197,7 +172,7 @@
'command_buffer_service',
'gpu',
'gpu_unittest_utils',
- 'gles2_implementation_client_side_arrays',
+ 'gles2_implementation',
'gles2_cmd_helper',
'gles2_c_lib',
],
@@ -329,7 +304,7 @@
'command_buffer_service',
'gpu',
'gpu_unittest_utils',
- 'gles2_implementation_client_side_arrays',
+ 'gles2_implementation',
'gles2_cmd_helper',
'gles2_c_lib',
#'gl_unittests',
« no previous file with comments | « gpu/gles2_conform_support/gles2_conform_support.gyp ('k') | gpu/gpu_config.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698