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

Side by Side Diff: gpu/gpu.gyp

Issue 14308014: Clean up of GLES2 Command Decoder by moving some of the error state into a separate class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge error. Created 7 years, 8 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 unified diff | Download patch
« no previous file with comments | « gpu/command_buffer_service.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'nacl_win64_target': 0, 7 'nacl_win64_target': 0,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'gpu_common.gypi', 10 'gpu_common.gypi',
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 '../testing/gmock.gyp:gmock', 282 '../testing/gmock.gyp:gmock',
283 '../testing/gtest.gyp:gtest', 283 '../testing/gtest.gyp:gtest',
284 '../third_party/khronos/khronos.gyp:khronos_headers', 284 '../third_party/khronos/khronos.gyp:khronos_headers',
285 '../ui/gl/gl.gyp:gl_unittest_utils', 285 '../ui/gl/gl.gyp:gl_unittest_utils',
286 ], 286 ],
287 'include_dirs': [ 287 'include_dirs': [
288 '..', 288 '..',
289 ], 289 ],
290 'sources': [ 290 'sources': [
291 'command_buffer/service/gles2_cmd_decoder_mock.cc', 291 'command_buffer/service/gles2_cmd_decoder_mock.cc',
292 'command_buffer/service/gles2_cmd_decoder_mock.cc', 292 'command_buffer/service/error_state_mock.cc',
293 ], 293 ],
294 }, 294 },
295 ], 295 ],
296 'conditions': [ 296 'conditions': [
297 ['component=="static_library"', { 297 ['component=="static_library"', {
298 'targets': [ 298 'targets': [
299 { 299 {
300 'target_name': 'disk_cache_proto', 300 'target_name': 'disk_cache_proto',
301 'type': 'static_library', 301 'type': 'static_library',
302 'sources': [ 'command_buffer/service/disk_cache_proto.proto' ], 302 'sources': [ 'command_buffer/service/disk_cache_proto.proto' ],
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests< (SHARED_LIB_SUFFIX)', 502 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests< (SHARED_LIB_SUFFIX)',
503 }, 503 },
504 'includes': [ 504 'includes': [
505 '../build/apk_test.gypi', 505 '../build/apk_test.gypi',
506 ], 506 ],
507 }, 507 },
508 ], 508 ],
509 }], 509 }],
510 ], 510 ],
511 } 511 }
OLDNEW
« no previous file with comments | « gpu/command_buffer_service.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698