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

Side by Side Diff: gpu/gpu.gyp

Issue 1809183002: gpu_messages.h => gpu/ipc/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make win_clang_x64_dbg happy by making command_buffer_traits an alias to gpu component on compnet b… Created 4 years, 9 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_traits.gypi ('k') | gpu/gpu_ipc_common.gypi » ('j') | 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 'build_angle_deqp_tests%': 0, 8 'build_angle_deqp_tests%': 0,
9 }, 9 },
10 'includes': [ 10 'includes': [
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 ], 587 ],
588 'dependencies': [ 588 'dependencies': [
589 'command_buffer_common', 589 'command_buffer_common',
590 'disk_cache_proto', 590 'disk_cache_proto',
591 'gpu_config', 591 'gpu_config',
592 ], 592 ],
593 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 593 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
594 'msvs_disabled_warnings': [4267, ], 594 'msvs_disabled_warnings': [4267, ],
595 }, 595 },
596 { 596 {
597 # GN version: //gpu/ipc/common:command_buffer_traits
598 'target_name': 'command_buffer_traits',
599 'type': 'static_library',
600 'includes': [
601 'command_buffer_traits.gypi',
602 ],
603 },
604 {
597 # GN version: //gpu/ipc/common 605 # GN version: //gpu/ipc/common
598 'target_name': 'gpu_ipc_common', 606 'target_name': 'gpu_ipc_common',
599 'type': 'static_library', 607 'type': 'static_library',
600 'includes': [ 608 'includes': [
601 'gpu_ipc_common.gypi', 609 'gpu_ipc_common.gypi',
602 ], 610 ],
611 'dependencies': [
612 'command_buffer_traits',
613 ],
603 }, 614 },
604 { 615 {
605 'target_name': 'gpu_config', 616 'target_name': 'gpu_config',
606 'type': 'static_library', 617 'type': 'static_library',
607 'includes': [ 618 'includes': [
608 'gpu_config.gypi', 619 'gpu_config.gypi',
609 ], 620 ],
610 }, 621 },
611 ], 622 ],
612 }, 623 },
(...skipping 11 matching lines...) Expand all
624 'includes': [ '../build/protoc.gypi' ], 635 'includes': [ '../build/protoc.gypi' ],
625 }, 636 },
626 { 637 {
627 # GN version: //gpu 638 # GN version: //gpu
628 'target_name': 'gpu', 639 'target_name': 'gpu',
629 'type': 'shared_library', 640 'type': 'shared_library',
630 'includes': [ 641 'includes': [
631 'command_buffer_client.gypi', 642 'command_buffer_client.gypi',
632 'command_buffer_common.gypi', 643 'command_buffer_common.gypi',
633 'command_buffer_service.gypi', 644 'command_buffer_service.gypi',
645 'command_buffer_traits.gypi',
634 'gles2_cmd_helper.gypi', 646 'gles2_cmd_helper.gypi',
635 'gpu_config.gypi', 647 'gpu_config.gypi',
636 'gpu_ipc_common.gypi', 648 'gpu_ipc_common.gypi',
637 '../build/android/increase_size_for_speed.gypi', 649 '../build/android/increase_size_for_speed.gypi',
638 ], 650 ],
639 'defines': [ 651 'defines': [
640 'GPU_IMPLEMENTATION', 652 'GPU_IMPLEMENTATION',
641 ], 653 ],
642 'sources': [ 654 'sources': [
643 'gpu_export.h', 655 'gpu_export.h',
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 }, 691 },
680 { 692 {
681 # GN version: //gpu/command_buffer/service 693 # GN version: //gpu/command_buffer/service
682 'target_name': 'command_buffer_service', 694 'target_name': 'command_buffer_service',
683 'type': 'none', 695 'type': 'none',
684 'dependencies': [ 696 'dependencies': [
685 'gpu', 697 'gpu',
686 ], 698 ],
687 }, 699 },
688 { 700 {
701 # GN version: //gpu/ipc/common:command_buffer_traits
702 'target_name': 'command_buffer_traits',
703 'type': 'none',
704 'dependencies': [
705 'gpu',
706 ],
707 },
708 {
689 # GN version: //gpu/ipc/common 709 # GN version: //gpu/ipc/common
690 'target_name': 'gpu_ipc_common', 710 'target_name': 'gpu_ipc_common',
691 'type': 'none', 711 'type': 'none',
692 'dependencies': [ 712 'dependencies': [
693 'gpu', 713 'gpu',
694 ], 714 ],
695 }, 715 },
696 ], 716 ],
697 }], 717 }],
698 ['disable_nacl!=1 and OS=="win" and target_arch=="ia32"', { 718 ['disable_nacl!=1 and OS=="win" and target_arch=="ia32"', {
(...skipping 14 matching lines...) Expand all
713 '<@(nacl_win64_defines)', 733 '<@(nacl_win64_defines)',
714 'GPU_IMPLEMENTATION', 734 'GPU_IMPLEMENTATION',
715 ], 735 ],
716 'configurations': { 736 'configurations': {
717 'Common_Base': { 737 'Common_Base': {
718 'msvs_target_platform': 'x64', 738 'msvs_target_platform': 'x64',
719 }, 739 },
720 }, 740 },
721 }, 741 },
722 { 742 {
743 'target_name': 'command_buffer_traits_win64',
744 'type': 'static_library',
745 'variables': {
746 'nacl_win64_target': 1,
747 },
748 'includes': [
749 'command_buffer_traits.gypi',
750 ],
751 'dependencies': [
752 '../base/base.gyp:base_win64',
753 '../ipc/ipc.gyp:ipc_win64',
754 'command_buffer_common_win64',
755 ],
756 'defines': [
757 '<@(nacl_win64_defines)',
758 'GPU_IMPLEMENTATION',
759 ],
760 'configurations': {
761 'Common_Base': {
762 'msvs_target_platform': 'x64',
763 },
764 },
765 },
766 {
723 'target_name': 'gpu_ipc_common_win64', 767 'target_name': 'gpu_ipc_common_win64',
724 'type': 'static_library', 768 'type': 'static_library',
725 'variables': { 769 'variables': {
726 'nacl_win64_target': 1, 770 'nacl_win64_target': 1,
727 }, 771 },
728 'includes': [ 772 'includes': [
773 'command_buffer_traits.gypi',
729 'gpu_ipc_common.gypi', 774 'gpu_ipc_common.gypi',
730 ], 775 ],
731 'dependencies': [ 776 'dependencies': [
732 '../base/base.gyp:base_win64', 777 '../base/base.gyp:base_win64',
733 '../ipc/ipc.gyp:ipc_win64', 778 '../ipc/ipc.gyp:ipc_win64',
734 'command_buffer_common_win64', 779 'command_buffer_common_win64',
735 ], 780 ],
736 'defines': [ 781 'defines': [
737 '<@(nacl_win64_defines)', 782 '<@(nacl_win64_defines)',
738 'GPU_IMPLEMENTATION', 783 'GPU_IMPLEMENTATION',
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
971 ], 1016 ],
972 'sources': [ 1017 'sources': [
973 'gpu_unittests_apk.isolate', 1018 'gpu_unittests_apk.isolate',
974 ], 1019 ],
975 }, 1020 },
976 ], 1021 ],
977 }, 1022 },
978 ], 1023 ],
979 ], 1024 ],
980 } 1025 }
OLDNEW
« no previous file with comments | « gpu/command_buffer_traits.gypi ('k') | gpu/gpu_ipc_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698