From 6036726eb981b6c4b42047513b9d3f4ac865daac Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 24 Oct 2018 11:30:15 +0200 Subject: BASELINE: Update Chromium to 70.0.3538.78 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie634710bf039e26c1957f4ae45e101bd4c434ae7 Reviewed-by: Michael Brüning --- chromium/gpu/BUILD.gn | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) (limited to 'chromium/gpu/BUILD.gn') diff --git a/chromium/gpu/BUILD.gn b/chromium/gpu/BUILD.gn index 0e9fa8241a1..51ab0be7b82 100644 --- a/chromium/gpu/BUILD.gn +++ b/chromium/gpu/BUILD.gn @@ -23,6 +23,10 @@ config("raster_implementation") { defines = [ "RASTER_IMPLEMENTATION" ] } +config("webgpu_implementation") { + defines = [ "WEBGPU_IMPLEMENTATION" ] +} + component("gpu") { public_deps = [ "//gpu/command_buffer/client:client_sources", @@ -49,6 +53,12 @@ component("raster") { ] } +component("webgpu") { + public_deps = [ + "//gpu/command_buffer/client:webgpu_sources", + ] +} + if (!use_static_angle) { shared_library("command_buffer_gles2") { sources = [ @@ -148,11 +158,14 @@ static_library("test_support") { "ipc/raster_in_process_context.cc", "ipc/raster_in_process_context.h", "ipc/service/gpu_memory_buffer_factory_test_template.h", + "ipc/webgpu_in_process_context.cc", + "ipc/webgpu_in_process_context.h", ] public_deps = [ ":gles2", ":gpu", + ":webgpu", "//gpu/command_buffer/client:gles2_interface", ] deps = [ @@ -173,6 +186,7 @@ static_library("test_support") { test("gl_tests") { sources = [ + "command_buffer/service/shared_image_factory_unittest.cc", "command_buffer/tests/compressed_texture_test.cc", "command_buffer/tests/es3_misc_functions_unittest.cc", "command_buffer/tests/gl_apply_screen_space_antialiasing_CHROMIUM_unittest.cc", @@ -228,6 +242,7 @@ test("gl_tests") { "ipc/client/gpu_context_tests.h", "ipc/client/gpu_in_process_context_tests.cc", "ipc/client/raster_in_process_context_tests.cc", + "ipc/client/webgpu_in_process_context_tests.cc", "ipc/service/direct_composition_surface_win_unittest.cc", ] @@ -247,6 +262,7 @@ test("gl_tests") { "//gpu/command_buffer/client:gles2_c_lib", "//gpu/command_buffer/client:gles2_implementation", "//gpu/command_buffer/client:raster", + "//gpu/command_buffer/client:webgpu", "//gpu/command_buffer/common:gles2_utils", "//gpu/ipc:gl_in_process_context", "//gpu/ipc/host", @@ -285,6 +301,7 @@ test("gpu_unittests") { "command_buffer/client/command_buffer_direct_locked.h", "command_buffer/client/fenced_allocator_test.cc", "command_buffer/client/gles2_implementation_unittest.cc", + "command_buffer/client/gles2_implementation_unittest_autogen.h", "command_buffer/client/mapped_memory_unittest.cc", "command_buffer/client/mock_transfer_buffer.cc", "command_buffer/client/mock_transfer_buffer.h", @@ -292,9 +309,12 @@ test("gpu_unittests") { "command_buffer/client/query_tracker_unittest.cc", "command_buffer/client/raster_implementation_gles_unittest.cc", "command_buffer/client/raster_implementation_unittest.cc", + "command_buffer/client/raster_implementation_unittest_autogen.h", "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/client/webgpu_implementation_unittest.cc", + "command_buffer/client/webgpu_implementation_unittest_autogen.h", "command_buffer/common/activity_flags_unittest.cc", "command_buffer/common/bitfield_helpers_test.cc", "command_buffer/common/buffer_unittest.cc", @@ -309,6 +329,8 @@ test("gpu_unittests") { "command_buffer/common/raster_cmd_format_test.cc", "command_buffer/common/raster_cmd_format_test_autogen.h", "command_buffer/common/unittest_main.cc", + "command_buffer/common/webgpu_cmd_format_test.cc", + "command_buffer/common/webgpu_cmd_format_test_autogen.h", "command_buffer/service/buffer_manager_unittest.cc", "command_buffer/service/client_service_map_unittest.cc", "command_buffer/service/command_buffer_service_unittest.cc", @@ -350,6 +372,7 @@ test("gpu_unittests") { "command_buffer/service/gpu_service_test.h", "command_buffer/service/gpu_tracer_unittest.cc", "command_buffer/service/gr_cache_controller_unittest.cc", + "command_buffer/service/gr_shader_cache_unittest.cc", "command_buffer/service/id_manager_unittest.cc", "command_buffer/service/indexed_buffer_binding_host_unittest.cc", "command_buffer/service/mailbox_manager_unittest.cc", @@ -380,6 +403,7 @@ test("gpu_unittests") { "command_buffer/service/transform_feedback_manager_unittest.cc", "command_buffer/service/vertex_array_manager_unittest.cc", "command_buffer/service/vertex_attrib_manager_unittest.cc", + "command_buffer/service/webgpu_decoder_unittest.cc", "config/gpu_blacklist_unittest.cc", "config/gpu_control_list_entry_unittest.cc", "config/gpu_control_list_testing_arrays_and_structs_autogen.h", @@ -463,6 +487,7 @@ test("gpu_unittests") { "//gpu/command_buffer/client:gles2_c_lib", "//gpu/command_buffer/client:gles2_implementation", "//gpu/command_buffer/client:raster", + "//gpu/command_buffer/client:webgpu", "//gpu/command_buffer/common", "//gpu/command_buffer/common:gles2_utils", "//gpu/command_buffer/service", @@ -480,8 +505,7 @@ test("gpu_unittests") { "//testing/gmock", "//testing/gtest", "//third_party/angle:translator", - "//third_party/mesa:mesa_headers", - "//third_party/mesa:osmesa", + "//third_party/mesa_headers", "//ui/gfx", "//ui/gfx:test_support", "//ui/gfx/geometry", @@ -527,7 +551,7 @@ test("gpu_perftests") { data_deps = [ # Needed for isolate script to execute. "//testing:run_perf_test", - "//third_party/mesa:osmesa", + "//third_party/mesa_headers", ] # This target should not require the Chrome executable to run. -- cgit v1.2.1