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

Side by Side Diff: gpu/gpu.gyp

Issue 1319453005: Revert of Add command_buffer_gles2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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/gles2_conform_support/egl/egl.cc ('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 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 'include_dirs': [ 408 'include_dirs': [
409 '..', 409 '..',
410 ], 410 ],
411 'sources': [ 411 'sources': [
412 'command_buffer/client/gles2_interface_stub.cc', 412 'command_buffer/client/gles2_interface_stub.cc',
413 'command_buffer/client/gles2_interface_stub.h', 413 'command_buffer/client/gles2_interface_stub.h',
414 'command_buffer/service/error_state_mock.cc', 414 'command_buffer/service/error_state_mock.cc',
415 'command_buffer/service/gles2_cmd_decoder_mock.cc', 415 'command_buffer/service/gles2_cmd_decoder_mock.cc',
416 ], 416 ],
417 }, 417 },
418 {
419 # GN version: //gpu:command_buffer_gles2
420 'target_name': 'command_buffer_gles2',
421 'type': 'shared_library',
422 'dependencies': [
423 '../base/base.gyp:base',
424 '../gpu/gpu.gyp:command_buffer_service',
425 '../ui/gfx/gfx.gyp:gfx_geometry',
426 '../ui/gl/gl.gyp:gl',
427 'gles2_c_lib',
428 'gles2_implementation',
429 ],
430 'sources': [
431 # Note: sources list duplicated in GN build.
432 # TODO(hendrikw): Move egl out of gles2_conform_support.
433 'gles2_conform_support/egl/config.cc',
434 'gles2_conform_support/egl/config.h',
435 'gles2_conform_support/egl/display.cc',
436 'gles2_conform_support/egl/display.h',
437 'gles2_conform_support/egl/egl.cc',
438 'gles2_conform_support/egl/surface.cc',
439 'gles2_conform_support/egl/surface.h',
440 ],
441 'conditions': [
442 ['OS=="win"', {
443 'defines': [
444 'EGLAPIENTRY=',
445 'EGLAPI=__declspec(dllexport)',
446 ],
447 }, { # OS!="win"
448 'defines': [
449 'EGLAPIENTRY=',
450 'EGLAPI=__attribute__((visibility(\"default\")))'
451 ],
452 }, ],
453 ],
454 }
455 ], 418 ],
456 'conditions': [ 419 'conditions': [
457 ['component=="static_library"', { 420 ['component=="static_library"', {
458 'targets': [ 421 'targets': [
459 { 422 {
460 # GN version: //gpu/command_buffer/service:disk_cache_proto 423 # GN version: //gpu/command_buffer/service:disk_cache_proto
461 'target_name': 'disk_cache_proto', 424 'target_name': 'disk_cache_proto',
462 'type': 'static_library', 425 'type': 'static_library',
463 'sources': [ 'command_buffer/service/disk_cache_proto.proto' ], 426 'sources': [ 'command_buffer/service/disk_cache_proto.proto' ],
464 'variables': { 427 'variables': {
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 '../third_party/angle/build/common_defines.gypi', 804 '../third_party/angle/build/common_defines.gypi',
842 ], 805 ],
843 'sources': [ 806 'sources': [
844 'angle_deqp_tests_main.cc', 807 'angle_deqp_tests_main.cc',
845 ], 808 ],
846 }, 809 },
847 ], 810 ],
848 }] 811 }]
849 ], 812 ],
850 } 813 }
OLDNEW
« no previous file with comments | « gpu/gles2_conform_support/egl/egl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698