Skip to content

GitLab

T
tangled
Commit d5ba08c4 authored by jamesr@chromium.org's avatar jamesr@chromium.org
Browse files
Options

GN: Fix up various gpu targets 

This makes the gl_tests and gpu_unittests targets link and run and fixes
up a few other misc issues:

*) outdated nss filelists and defines
*) outdated cc file lists

R=brettw@chromium.org, piman@chromium.org
TBR=ben@chromium.org for ui/events/ change

Review URL: https://codereview.chromium.org/338633004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277958 0039d316-1c4b-4281-b951-d872f2087c98
parent daad5ed9
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 14 deletions
cc/BUILD.gn
View file @ d5ba08c4
...@@ -37,6 +37,8 @@ component("cc") { ...@@ -37,6 +37,8 @@ component("cc") {
"animation/transform_operations.cc", "animation/transform_operations.cc",
"animation/transform_operations.h", "animation/transform_operations.h",
"base/completion_event.h", "base/completion_event.h",
"base/delayed_unique_notifier.cc",
"base/delayed_unique_notifier.h",
"base/invalidation_region.cc", "base/invalidation_region.cc",
"base/invalidation_region.h", "base/invalidation_region.h",
"base/latency_info_swap_promise.cc", "base/latency_info_swap_promise.cc",
...@@ -60,6 +62,8 @@ component("cc") { ...@@ -60,6 +62,8 @@ component("cc") {
"base/switches.h", "base/switches.h",
"base/tiling_data.cc", "base/tiling_data.cc",
"base/tiling_data.h", "base/tiling_data.h",
"base/unique_notifier.cc",
"base/unique_notifier.h",
"base/util.h", "base/util.h",
"debug/benchmark_instrumentation.cc", "debug/benchmark_instrumentation.cc",
"debug/benchmark_instrumentation.h", "debug/benchmark_instrumentation.h",
...@@ -71,6 +75,8 @@ component("cc") { ...@@ -71,6 +75,8 @@ component("cc") {
"debug/frame_rate_counter.cc", "debug/frame_rate_counter.cc",
"debug/frame_rate_counter.h", "debug/frame_rate_counter.h",
"debug/frame_viewer_instrumentation.h", "debug/frame_viewer_instrumentation.h",
"debug/invalidation_benchmark.cc",
"debug/invalidation_benchmark.h",
"debug/lap_timer.cc", "debug/lap_timer.cc",
"debug/lap_timer.h", "debug/lap_timer.h",
"debug/layer_tree_debug_state.cc", "debug/layer_tree_debug_state.cc",
...@@ -564,6 +570,8 @@ source_set("test_support") { ...@@ -564,6 +570,8 @@ source_set("test_support") {
"test/mock_occlusion_tracker.h", "test/mock_occlusion_tracker.h",
"test/mock_quad_culler.cc", "test/mock_quad_culler.cc",
"test/mock_quad_culler.h", "test/mock_quad_culler.h",
"test/ordered_simple_task_runner.cc",
"test/ordered_simple_task_runner.h",
"test/ordered_texture_map.cc", "test/ordered_texture_map.cc",
"test/ordered_texture_map.h", "test/ordered_texture_map.h",
"test/paths.cc", "test/paths.cc",
......
gpu/BUILD.gn
View file @ d5ba08c4
...@@ -63,8 +63,6 @@ source_set("gpu_unittest_utils") { ...@@ -63,8 +63,6 @@ source_set("gpu_unittest_utils") {
] ]
} }
# TODO(GYP) This doesn't link yet.
if (false) {
test("gl_tests") { test("gl_tests") {
sources = [ sources = [
"command_buffer/tests/compressed_texture_test.cc", "command_buffer/tests/compressed_texture_test.cc",
...@@ -94,7 +92,6 @@ test("gl_tests") { ...@@ -94,7 +92,6 @@ test("gl_tests") {
] ]
defines = [ defines = [
"GLES2_C_LIB_IMPLEMENTATION",
"GL_GLEXT_PROTOTYPES", "GL_GLEXT_PROTOTYPES",
] ]
...@@ -105,8 +102,7 @@ test("gl_tests") { ...@@ -105,8 +102,7 @@ test("gl_tests") {
"//base/third_party/dynamic_annotations", "//base/third_party/dynamic_annotations",
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
# TODO(GYP) "//third_party/angle:translator",
#"<(angle_path)/src/build_angle.gyp:translator",
"//ui/gfx", "//ui/gfx",
"//ui/gfx/geometry", "//ui/gfx/geometry",
"//ui/gl", "//ui/gl",
...@@ -131,8 +127,110 @@ test("gl_tests") { ...@@ -131,8 +127,110 @@ test("gl_tests") {
# ], # ],
# }], # }],
} }
} # if (false)
# TODO(GYP) test("gpu_unittests") {
# gl_tests_apk sources = [
# gpu_unittests_apk "command_buffer/client/buffer_tracker_unittest.cc",
"command_buffer/client/client_test_helper.cc",
"command_buffer/client/client_test_helper.h",
"command_buffer/client/cmd_buffer_helper_test.cc",
"command_buffer/client/fenced_allocator_test.cc",
"command_buffer/client/gles2_implementation_unittest.cc",
"command_buffer/client/mapped_memory_unittest.cc",
"command_buffer/client/query_tracker_unittest.cc",
"command_buffer/client/program_info_manager_unittest.cc",
"command_buffer/client/ring_buffer_test.cc",
"command_buffer/client/transfer_buffer_unittest.cc",
"command_buffer/client/vertex_array_object_manager_unittest.cc",
"command_buffer/common/bitfield_helpers_test.cc",
"command_buffer/common/command_buffer_mock.cc",
"command_buffer/common/command_buffer_mock.h",
"command_buffer/common/command_buffer_shared_test.cc",
"command_buffer/common/debug_marker_manager_unittest.cc",
"command_buffer/common/gles2_cmd_format_test.cc",
"command_buffer/common/gles2_cmd_format_test_autogen.h",
"command_buffer/common/gles2_cmd_utils_unittest.cc",
"command_buffer/common/id_allocator_test.cc",
"command_buffer/common/trace_event.h",
"command_buffer/common/unittest_main.cc",
"command_buffer/service/async_pixel_transfer_delegate_mock.h",
"command_buffer/service/async_pixel_transfer_delegate_mock.cc",
"command_buffer/service/async_pixel_transfer_manager_mock.h",
"command_buffer/service/async_pixel_transfer_manager_mock.cc",
"command_buffer/service/buffer_manager_unittest.cc",
"command_buffer/service/cmd_parser_test.cc",
"command_buffer/service/command_buffer_service_unittest.cc",
"command_buffer/service/common_decoder_unittest.cc",
"command_buffer/service/context_group_unittest.cc",
"command_buffer/service/feature_info_unittest.cc",
"command_buffer/service/framebuffer_manager_unittest.cc",
"command_buffer/service/gles2_cmd_decoder_unittest.cc",
"command_buffer/service/gles2_cmd_decoder_unittest.h",
"command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h",
"command_buffer/service/gles2_cmd_decoder_unittest_1.cc",
"command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h",
"command_buffer/service/gles2_cmd_decoder_unittest_2.cc",
"command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h",
"command_buffer/service/gles2_cmd_decoder_unittest_3.cc",
"command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h",
"command_buffer/service/gles2_cmd_decoder_unittest_async_pixel.cc",
"command_buffer/service/gles2_cmd_decoder_unittest_base.cc",
"command_buffer/service/gles2_cmd_decoder_unittest_base.h",
"command_buffer/service/gles2_cmd_decoder_unittest_context_state.cc",
"command_buffer/service/gles2_cmd_decoder_unittest_drawing.cc",
"command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc",
"command_buffer/service/gles2_cmd_decoder_unittest_programs.cc",
"command_buffer/service/gles2_cmd_decoder_unittest_textures.cc",
"command_buffer/service/gles2_cmd_decoder_unittest_attribs.cc",
"command_buffer/service/gl_surface_mock.cc",
"command_buffer/service/gl_surface_mock.h",
"command_buffer/service/gpu_scheduler_unittest.cc",
"command_buffer/service/id_manager_unittest.cc",
"command_buffer/service/mailbox_manager_unittest.cc",
"command_buffer/service/memory_program_cache_unittest.cc",
"command_buffer/service/mocks.cc",
"command_buffer/service/mocks.h",
"command_buffer/service/program_manager_unittest.cc",
"command_buffer/service/query_manager_unittest.cc",
"command_buffer/service/renderbuffer_manager_unittest.cc",
"command_buffer/service/program_cache_unittest.cc",
"command_buffer/service/shader_manager_unittest.cc",
"command_buffer/service/shader_translator_unittest.cc",
"command_buffer/service/test_helper.cc",
"command_buffer/service/test_helper.h",
"command_buffer/service/texture_manager_unittest.cc",
"command_buffer/service/transfer_buffer_manager_unittest.cc",
"command_buffer/service/vertex_attrib_manager_unittest.cc",
"command_buffer/service/vertex_array_manager_unittest.cc",
"command_buffer/service/gpu_tracer_unittest.cc",
"config/gpu_blacklist_unittest.cc",
"config/gpu_control_list_entry_unittest.cc",
"config/gpu_control_list_number_info_unittest.cc",
"config/gpu_control_list_os_info_unittest.cc",
"config/gpu_control_list_string_info_unittest.cc",
"config/gpu_control_list_unittest.cc",
"config/gpu_control_list_version_info_unittest.cc",
"config/gpu_driver_bug_list_unittest.cc",
"config/gpu_info_collector_unittest.cc",
"config/gpu_info_unittest.cc",
"config/gpu_test_config_unittest.cc",
"config/gpu_test_expectations_parser_unittest.cc",
"config/gpu_util_unittest.cc",
]
deps = [
":gpu",
":gpu_unittest_utils",
"//base",
"//base/test:test_support",
"//base/third_party/dynamic_annotations",
"//testing/gmock",
"//testing/gtest",
"//third_party/angle:translator",
"//ui/gfx",
"//ui/gfx/geometry",
"//ui/gl",
"//gpu/command_buffer/client:gles2_c_lib",
"//gpu/command_buffer/client:gles2_implementation_client_side_arrays",
]
}
gpu/command_buffer/client/BUILD.gn
View file @ d5ba08c4
...@@ -157,7 +157,6 @@ component("gles2_c_lib") { ...@@ -157,7 +157,6 @@ component("gles2_c_lib") {
deps = [ deps = [
":client", ":client",
":gles2_implementation",
"//base", "//base",
"//base/third_party/dynamic_annotations", "//base/third_party/dynamic_annotations",
"//gpu/command_buffer/common", "//gpu/command_buffer/common",
......
gpu/command_buffer/service/BUILD.gn
View file @ d5ba08c4
...@@ -123,14 +123,13 @@ source_set("service") { ...@@ -123,14 +123,13 @@ source_set("service") {
"//base/third_party/dynamic_annotations", "//base/third_party/dynamic_annotations",
"//crypto", "//crypto",
"//gpu/command_buffer/common", "//gpu/command_buffer/common",
"//third_party/angle:translator",
"//third_party/protobuf:protobuf_lite", "//third_party/protobuf:protobuf_lite",
"//third_party/re2", "//third_party/re2",
"//third_party/smhasher:cityhash", "//third_party/smhasher:cityhash",
"//ui/gfx", "//ui/gfx",
"//ui/gfx/geometry", "//ui/gfx/geometry",
"//ui/gl", "//ui/gl",
#TODO(GYP)
#'<(angle_path)/src/build_angle.gyp:translator',
] ]
if (ui_compositor_image_transport) { if (ui_compositor_image_transport) {
......
gpu/config/BUILD.gn
View file @ d5ba08c4
...@@ -67,5 +67,8 @@ source_set("config") { ...@@ -67,5 +67,8 @@ source_set("config") {
} else { } else {
sources -= [ "gpu_info_collector_x11.cc" ] sources -= [ "gpu_info_collector_x11.cc" ]
} }
if (!use_ozone) {
sources -= [ "gpu_info_collector_ozone.cc" ]
}
} }
tools/gn/secondary/third_party/libjpeg_turbo/BUILD.gn
View file @ d5ba08c4
...@@ -103,7 +103,6 @@ yasm_assemble("simd_asm") { ...@@ -103,7 +103,6 @@ yasm_assemble("simd_asm") {
] ]
include_dirs = [ "linux" ] include_dirs = [ "linux" ]
} }
} }
} }
......
tools/gn/secondary/third_party/nss/BUILD.gn
View file @ d5ba08c4
...@@ -1110,6 +1110,8 @@ if (is_linux) { ...@@ -1110,6 +1110,8 @@ if (is_linux) {
"MP_ASSEMBLY_DIV_2DX1D", "MP_ASSEMBLY_DIV_2DX1D",
"MP_USE_UINT_DIGIT", "MP_USE_UINT_DIGIT",
"MP_NO_MP_WORD", "MP_NO_MP_WORD",
"USE_HW_AES",
"INTEL_GCM",
] ]
} else if (cpu_arch == "x64") { } else if (cpu_arch == "x64") {
sources -= [ "nss/lib/freebl/mpi/mpi_x86_asm.c" ] sources -= [ "nss/lib/freebl/mpi/mpi_x86_asm.c" ]
......
ui/events/BUILD.gn
View file @ d5ba08c4
...@@ -268,7 +268,7 @@ source_set("events_test_support") { ...@@ -268,7 +268,7 @@ source_set("events_test_support") {
test("events_unittests") { test("events_unittests") {
sources = [ sources = [
"cocoa/cocoa_event_utils_unittest.mm", "cocoa/events_mac_unittest.mm",
"event_dispatcher_unittest.cc", "event_dispatcher_unittest.cc",
"event_processor_unittest.cc", "event_processor_unittest.cc",
"event_rewriter_unittest.cc", "event_rewriter_unittest.cc",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment