| OLD | NEW |
| 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 'build_angle_deqp_tests%': 0, | 8 'build_angle_deqp_tests%': 0, |
| 9 }, | 9 }, |
| 10 'includes': [ | 10 'includes': [ |
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 ['OS == "android"', { | 278 ['OS == "android"', { |
| 279 'dependencies': [ | 279 'dependencies': [ |
| 280 '../testing/android/native_test.gyp:native_test_native_code', | 280 '../testing/android/native_test.gyp:native_test_native_code', |
| 281 ], | 281 ], |
| 282 }], | 282 }], |
| 283 ], | 283 ], |
| 284 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 284 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 285 'msvs_disabled_warnings': [ 4267, ], | 285 'msvs_disabled_warnings': [ 4267, ], |
| 286 }, | 286 }, |
| 287 { | 287 { |
| 288 # GN version: //gpu/ipc/service:gpu_ipc_service_unittests |
| 289 'target_name': 'gpu_ipc_service_unittests', |
| 290 'type': '<(gtest_target_type)', |
| 291 'dependencies': [ |
| 292 '../url/url.gyp:url_lib', |
| 293 '../base/base.gyp:base', |
| 294 '../base/base.gyp:run_all_unittests', |
| 295 '../base/base.gyp:test_support_base', |
| 296 '../ipc/ipc.gyp:test_support_ipc', |
| 297 '../testing/gtest.gyp:gtest', |
| 298 'gpu_ipc_service', |
| 299 ], |
| 300 'sources': [ |
| 301 'ipc/service/gpu_channel_manager_unittest.cc', |
| 302 'ipc/service/gpu_channel_test_common.cc', |
| 303 'ipc/service/gpu_channel_test_common.h', |
| 304 'ipc/service/gpu_channel_unittest.cc', |
| 305 ], |
| 306 'conditions': [ |
| 307 ['OS == "android"', { |
| 308 'sources': [ |
| 309 'ipc/service/gpu_memory_buffer_factory_surface_texture_unittest.cc', |
| 310 ], |
| 311 }], |
| 312 ['OS == "mac"', { |
| 313 'sources': [ |
| 314 'ipc/service/ca_layer_tree_unittest_mac.mm', |
| 315 'ipc/service/gpu_memory_buffer_factory_io_surface_unittest.cc', |
| 316 ], |
| 317 }], |
| 318 ['use_ozone == 1', { |
| 319 'sources': [ |
| 320 'ipc/service/gpu_memory_buffer_factory_ozone_native_pixmap_unittest.
cc', |
| 321 ], |
| 322 }], |
| 323 ], |
| 324 }, |
| 325 { |
| 288 # GN version: //gpu/gpu_perftests | 326 # GN version: //gpu/gpu_perftests |
| 289 'target_name': 'gpu_perftests', | 327 'target_name': 'gpu_perftests', |
| 290 'type': '<(gtest_target_type)', | 328 'type': '<(gtest_target_type)', |
| 291 'dependencies': [ | 329 'dependencies': [ |
| 292 '../base/base.gyp:base', | 330 '../base/base.gyp:base', |
| 293 '../base/base.gyp:test_support_base', | 331 '../base/base.gyp:test_support_base', |
| 294 '../testing/gmock.gyp:gmock', | 332 '../testing/gmock.gyp:gmock', |
| 295 '../testing/gtest.gyp:gtest', | 333 '../testing/gtest.gyp:gtest', |
| 296 '../testing/perf/perf_test.gyp:perf_test', | 334 '../testing/perf/perf_test.gyp:perf_test', |
| 297 '../ui/gfx/gfx.gyp:gfx_geometry', | 335 '../ui/gfx/gfx.gyp:gfx_geometry', |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 414 '..', | 452 '..', |
| 415 ], | 453 ], |
| 416 'sources': [ | 454 'sources': [ |
| 417 'command_buffer/client/gles2_interface_stub.cc', | 455 'command_buffer/client/gles2_interface_stub.cc', |
| 418 'command_buffer/client/gles2_interface_stub.h', | 456 'command_buffer/client/gles2_interface_stub.h', |
| 419 'command_buffer/service/error_state_mock.cc', | 457 'command_buffer/service/error_state_mock.cc', |
| 420 'command_buffer/service/gles2_cmd_decoder_mock.cc', | 458 'command_buffer/service/gles2_cmd_decoder_mock.cc', |
| 421 ], | 459 ], |
| 422 }, | 460 }, |
| 423 { | 461 { |
| 462 # GN version: //gpu/ipc/service:test_support |
| 463 'target_name': 'gpu_ipc_service_test_support', |
| 464 'type': 'static_library', |
| 465 'dependencies': [ |
| 466 ], |
| 467 'include_dirs': [ |
| 468 '..', |
| 469 ], |
| 470 'sources': [ |
| 471 'gpu/ipc/service/gpu_memory_buffer_factory_test_template.h', |
| 472 ], |
| 473 }, |
| 474 { |
| 424 # GN version: //gpu:command_buffer_gles2 | 475 # GN version: //gpu:command_buffer_gles2 |
| 425 'target_name': 'command_buffer_gles2', | 476 'target_name': 'command_buffer_gles2', |
| 426 'type': 'shared_library', | 477 'type': 'shared_library', |
| 427 'dependencies': [ | 478 'dependencies': [ |
| 428 '../base/base.gyp:base', | 479 '../base/base.gyp:base', |
| 429 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', | 480 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', |
| 430 '../gpu/gpu.gyp:command_buffer_service', | 481 '../gpu/gpu.gyp:command_buffer_service', |
| 431 '../ui/gfx/gfx.gyp:gfx_geometry', | 482 '../ui/gfx/gfx.gyp:gfx_geometry', |
| 432 '../ui/gl/gl.gyp:gl', | 483 '../ui/gl/gl.gyp:gl', |
| 433 'gles2_c_lib', | 484 'gles2_c_lib', |
| 434 'gles2_implementation', | 485 'gles2_implementation', |
| 435 ], | 486 ], |
| 436 'sources': [ | 487 'sources': [ |
| 437 # Note: sources list duplicated in GN build. | 488 # Note: sources list duplicated in GN build. |
| 438 # TODO(hendrikw): Move egl out of gles2_conform_support. | 489 # TODO(hendrikw): Move egl out of gles2_conform_support. |
| 439 'gles2_conform_support/egl/config.cc', | 490 'gles2_conform_support/egl/config.cc', |
| 440 'gles2_conform_support/egl/config.h', | 491 'gles2_conform_support/egl/config.h', |
| 441 'gles2_conform_support/egl/display.cc', | 492 'gles2_conform_support/egl/display.cc', |
| 442 'gles2_conform_support/egl/display.h', | 493 'gles2_conform_support/egl/display.h', |
| 443 'gles2_conform_support/egl/egl.cc', | 494 'gles2_conform_support/egl/egl.cc', |
| 444 'gles2_conform_support/egl/surface.cc', | 495 'gles2_conform_support/egl/surface.cc', |
| 445 'gles2_conform_support/egl/surface.h', | 496 'gles2_conform_support/egl/surface.h', |
| 446 'gles2_conform_support/egl/test_support.cc', | 497 'gles2_conform_support/egl/test_support.cc', |
| 447 'gles2_conform_support/egl/test_support.h', | 498 'gles2_conform_support/egl/test_support.h', |
| 448 ], | 499 ], |
| 449 » 'defines': [ | 500 'defines': [ |
| 450 'COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY', | 501 'COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY', |
| 451 'EGLAPIENTRY=', | 502 'EGLAPIENTRY=', |
| 452 » ], | 503 ], |
| 453 'conditions': [ | 504 'conditions': [ |
| 454 ['OS=="win"', { | 505 ['OS=="win"', { |
| 455 'defines': [ | 506 'defines': [ |
| 456 'EGLAPI=__declspec(dllexport)', | 507 'EGLAPI=__declspec(dllexport)', |
| 457 ], | 508 ], |
| 458 }, { # OS!="win" | 509 }, { # OS!="win" |
| 459 » » 'defines': [ | 510 'defines': [ |
| 460 'EGLAPI=__attribute__((visibility(\"default\")))' | 511 'EGLAPI=__attribute__((visibility(\"default\")))' |
| 461 ], | 512 ], |
| 462 }], | 513 }], |
| 463 ], | 514 ], |
| 464 }, | 515 }, |
| 465 { | 516 { |
| 466 # GN version: //gpu:command_buffer_gles2_tests | 517 # GN version: //gpu:command_buffer_gles2_tests |
| 467 'target_name': 'command_buffer_gles2_tests', | 518 'target_name': 'command_buffer_gles2_tests', |
| 468 'type': '<(gtest_target_type)', | 519 'type': '<(gtest_target_type)', |
| 469 'dependencies': [ | 520 'dependencies': [ |
| 470 '../base/base.gyp:base', | 521 '../base/base.gyp:base', |
| 471 '../base/base.gyp:test_support_base', | 522 '../base/base.gyp:test_support_base', |
| 472 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
_annotations', | 523 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
_annotations', |
| 473 '../testing/gmock.gyp:gmock', | 524 '../testing/gmock.gyp:gmock', |
| 474 '../testing/gtest.gyp:gtest', | 525 '../testing/gtest.gyp:gtest', |
| 475 'command_buffer_gles2', | 526 'command_buffer_gles2', |
| 476 ], | 527 ], |
| 477 'sources': [ | 528 'sources': [ |
| 478 # Note: sources list duplicated in GN build. | 529 # Note: sources list duplicated in GN build. |
| 479 'command_buffer/tests/command_buffer_gles2_tests_main.cc', | 530 'command_buffer/tests/command_buffer_gles2_tests_main.cc', |
| 480 'command_buffer/tests/egl_test.cc', | 531 'command_buffer/tests/egl_test.cc', |
| 481 ], | 532 ], |
| 482 » 'defines': [ | 533 'defines': [ |
| 483 'COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY', | 534 'COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY', |
| 484 'EGLAPIENTRY=', | 535 'EGLAPIENTRY=', |
| 485 ], | 536 ], |
| 486 'conditions': [ | 537 'conditions': [ |
| 487 ['OS=="win"', { | 538 ['OS=="win"', { |
| 488 'defines': [ | 539 'defines': [ |
| 489 'EGLAPI=__declspec(dllimport)', | 540 'EGLAPI=__declspec(dllimport)', |
| 490 ], | 541 ], |
| 491 }, { # OS!="win" | 542 }, { # OS!="win" |
| 492 » » 'defines': [ | 543 'defines': [ |
| 493 'EGLAPI=', | 544 'EGLAPI=', |
| 494 ], | 545 ], |
| 495 » » }], | 546 }], |
| 496 ['OS == "android"', { | 547 ['OS == "android"', { |
| 497 'dependencies': [ | 548 'dependencies': [ |
| 498 '../testing/android/native_test.gyp:native_test_native_code', | 549 '../testing/android/native_test.gyp:native_test_native_code', |
| 499 ], | 550 ], |
| 500 }], | 551 }], |
| 501 ], | 552 ], |
| 502 }, | 553 }, |
| 503 ], | 554 ], |
| 504 'conditions': [ | 555 'conditions': [ |
| 505 ['component=="static_library"', { | 556 ['component=="static_library"', { |
| (...skipping 13 matching lines...) Expand all Loading... |
| 519 # GN version: //gpu | 570 # GN version: //gpu |
| 520 'target_name': 'gpu', | 571 'target_name': 'gpu', |
| 521 'type': 'none', | 572 'type': 'none', |
| 522 'dependencies': [ | 573 'dependencies': [ |
| 523 'command_buffer_client', | 574 'command_buffer_client', |
| 524 'command_buffer_common', | 575 'command_buffer_common', |
| 525 'command_buffer_service', | 576 'command_buffer_service', |
| 526 'gles2_cmd_helper', | 577 'gles2_cmd_helper', |
| 527 'gpu_config', | 578 'gpu_config', |
| 528 'gpu_ipc_common', | 579 'gpu_ipc_common', |
| 580 'gpu_ipc_service', |
| 529 ], | 581 ], |
| 530 'sources': [ | 582 'sources': [ |
| 531 'gpu_export.h', | 583 'gpu_export.h', |
| 532 ], | 584 ], |
| 533 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 585 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 534 'msvs_disabled_warnings': [4267, ], | 586 'msvs_disabled_warnings': [4267, ], |
| 535 }, | 587 }, |
| 536 { | 588 { |
| 537 # GN version: //gpu/command_buffer/common | 589 # GN version: //gpu/command_buffer/common |
| 538 'target_name': 'command_buffer_common', | 590 'target_name': 'command_buffer_common', |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 607 'target_name': 'gpu_ipc_common', | 659 'target_name': 'gpu_ipc_common', |
| 608 'type': 'static_library', | 660 'type': 'static_library', |
| 609 'includes': [ | 661 'includes': [ |
| 610 'gpu_ipc_common.gypi', | 662 'gpu_ipc_common.gypi', |
| 611 ], | 663 ], |
| 612 'dependencies': [ | 664 'dependencies': [ |
| 613 'command_buffer_traits', | 665 'command_buffer_traits', |
| 614 ], | 666 ], |
| 615 }, | 667 }, |
| 616 { | 668 { |
| 669 # GN version: //gpu/ipc/service |
| 670 'target_name': 'gpu_ipc_service', |
| 671 'type': 'static_library', |
| 672 'includes': [ |
| 673 'gpu_ipc_service.gypi', |
| 674 ], |
| 675 'dependencies': [ |
| 676 'command_buffer_traits', |
| 677 ], |
| 678 }, |
| 679 { |
| 617 'target_name': 'gpu_config', | 680 'target_name': 'gpu_config', |
| 618 'type': 'static_library', | 681 'type': 'static_library', |
| 619 'includes': [ | 682 'includes': [ |
| 620 'gpu_config.gypi', | 683 'gpu_config.gypi', |
| 621 ], | 684 ], |
| 622 }, | 685 }, |
| 623 ], | 686 ], |
| 624 }, | 687 }, |
| 625 { # component != static_library | 688 { # component != static_library |
| 626 'targets': [ | 689 'targets': [ |
| (...skipping 13 matching lines...) Expand all Loading... |
| 640 'target_name': 'gpu', | 703 'target_name': 'gpu', |
| 641 'type': 'shared_library', | 704 'type': 'shared_library', |
| 642 'includes': [ | 705 'includes': [ |
| 643 'command_buffer_client.gypi', | 706 'command_buffer_client.gypi', |
| 644 'command_buffer_common.gypi', | 707 'command_buffer_common.gypi', |
| 645 'command_buffer_service.gypi', | 708 'command_buffer_service.gypi', |
| 646 'command_buffer_traits.gypi', | 709 'command_buffer_traits.gypi', |
| 647 'gles2_cmd_helper.gypi', | 710 'gles2_cmd_helper.gypi', |
| 648 'gpu_config.gypi', | 711 'gpu_config.gypi', |
| 649 'gpu_ipc_common.gypi', | 712 'gpu_ipc_common.gypi', |
| 713 'gpu_ipc_service.gypi', |
| 650 '../build/android/increase_size_for_speed.gypi', | 714 '../build/android/increase_size_for_speed.gypi', |
| 651 ], | 715 ], |
| 652 'defines': [ | 716 'defines': [ |
| 653 'GPU_IMPLEMENTATION', | 717 'GPU_IMPLEMENTATION', |
| 654 ], | 718 ], |
| 655 'sources': [ | 719 'sources': [ |
| 656 'gpu_export.h', | 720 'gpu_export.h', |
| 657 ], | 721 ], |
| 658 'dependencies': [ | 722 'dependencies': [ |
| 659 '../base/base.gyp:base', | 723 '../base/base.gyp:base', |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 707 ], | 771 ], |
| 708 }, | 772 }, |
| 709 { | 773 { |
| 710 # GN version: //gpu/ipc/common | 774 # GN version: //gpu/ipc/common |
| 711 'target_name': 'gpu_ipc_common', | 775 'target_name': 'gpu_ipc_common', |
| 712 'type': 'none', | 776 'type': 'none', |
| 713 'dependencies': [ | 777 'dependencies': [ |
| 714 'gpu', | 778 'gpu', |
| 715 ], | 779 ], |
| 716 }, | 780 }, |
| 781 { |
| 782 # GN version: //gpu/ipc/service |
| 783 'target_name': 'gpu_ipc_service', |
| 784 'type': 'none', |
| 785 'dependencies': [ |
| 786 'gpu', |
| 787 ], |
| 788 }, |
| 717 ], | 789 ], |
| 718 }], | 790 }], |
| 719 ['disable_nacl!=1 and OS=="win" and target_arch=="ia32"', { | 791 ['disable_nacl!=1 and OS=="win" and target_arch=="ia32"', { |
| 720 'targets': [ | 792 'targets': [ |
| 721 { | 793 { |
| 722 'target_name': 'command_buffer_common_win64', | 794 'target_name': 'command_buffer_common_win64', |
| 723 'type': 'static_library', | 795 'type': 'static_library', |
| 724 'variables': { | 796 'variables': { |
| 725 'nacl_win64_target': 1, | 797 'nacl_win64_target': 1, |
| 726 }, | 798 }, |
| (...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1017 ], | 1089 ], |
| 1018 'sources': [ | 1090 'sources': [ |
| 1019 'gpu_unittests_apk.isolate', | 1091 'gpu_unittests_apk.isolate', |
| 1020 ], | 1092 ], |
| 1021 }, | 1093 }, |
| 1022 ], | 1094 ], |
| 1023 }, | 1095 }, |
| 1024 ], | 1096 ], |
| 1025 ], | 1097 ], |
| 1026 } | 1098 } |
| OLD | NEW |