diff options
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/BUILD.gn | 10 | ||||
| -rw-r--r-- | gpu/blink/BUILD.gn | 1 | ||||
| -rw-r--r-- | gpu/command_buffer/client/BUILD.gn | 54 | ||||
| -rw-r--r-- | gpu/command_buffer/common/BUILD.gn | 20 | ||||
| -rw-r--r-- | gpu/command_buffer/service/BUILD.gn | 22 | ||||
| -rw-r--r-- | gpu/config/BUILD.gn | 18 | ||||
| -rw-r--r-- | gpu/ipc/BUILD.gn | 18 |
7 files changed, 108 insertions, 35 deletions
diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn index d8ac30f..eba5e7a 100644 --- a/gpu/BUILD.gn +++ b/gpu/BUILD.gn @@ -40,12 +40,12 @@ config("gpu_implementation") { component("gpu") { public_deps = [ - "//gpu/command_buffer/client", + "//gpu/command_buffer/client:client_sources", "//gpu/command_buffer/client:gles2_cmd_helper_sources", - "//gpu/command_buffer/common", - "//gpu/command_buffer/service", - "//gpu/config", - "//gpu/ipc", + "//gpu/command_buffer/common:common_sources", + "//gpu/command_buffer/service:service_sources", + "//gpu/config:config_sources", + "//gpu/ipc:ipc_sources", ] } diff --git a/gpu/blink/BUILD.gn b/gpu/blink/BUILD.gn index 7d08ba11..d034c47 100644 --- a/gpu/blink/BUILD.gn +++ b/gpu/blink/BUILD.gn @@ -24,6 +24,7 @@ component("blink") { "//base/third_party/dynamic_annotations", "//cc", "//gpu/command_buffer/common", + "//gpu/command_buffer/common:gles2_utils", "//gpu/command_buffer/service", "//gpu/command_buffer/client:gles2_c_lib", "//gpu/command_buffer/client:gles2_implementation", diff --git a/gpu/command_buffer/client/BUILD.gn b/gpu/command_buffer/client/BUILD.gn index fabc82a..bbb7c0b 100644 --- a/gpu/command_buffer/client/BUILD.gn +++ b/gpu/command_buffer/client/BUILD.gn @@ -2,7 +2,38 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -source_set("client") { +# The files here go into the "gpu" component in a component build (with +# "command_buffer_client" and "gles2_cmd_helper" just forwarding) and goes into +# separate static libraries in non-component build. This needs to match the +# GYP build which was likely an attempt to make larger components to help with +# loading. +group("client") { + if (is_component_build) { + public_deps = [ + "//gpu", + ] + } else { + public_deps = [ + ":client_sources", + ] + } +} + +group("gles2_cmd_helper") { + if (is_component_build) { + public_deps = [ + "//gpu", + ] + } else { + public_deps = [ + ":gles2_cmd_helper_sources", + ] + } +} + +source_set("client_sources") { + visibility = [ "//gpu/*" ] + sources = [ "cmd_buffer_helper.cc", "cmd_buffer_helper.h", @@ -28,27 +59,12 @@ source_set("client") { all_dependent_configs = [ "//third_party/khronos:khronos_headers" ] deps = [ - "//gpu/command_buffer/common", + "//gpu/command_buffer/common:common_sources", ] } -group("gles2_cmd_helper") { - if (is_component_build) { - deps = [ - "//gpu", - ] - } else { - deps = [ - ":gles2_cmd_helper_sources", - ] - } -} - source_set("gles2_cmd_helper_sources") { - visibility = [ - ":gles2_cmd_helper", - "//gpu", - ] + visibility = [ "//gpu/*" ] sources = [ "gles2_cmd_helper.cc", "gles2_cmd_helper.h", @@ -62,7 +78,7 @@ source_set("gles2_cmd_helper_sources") { ] deps = [ - ":client", + ":client_sources", ] } diff --git a/gpu/command_buffer/common/BUILD.gn b/gpu/command_buffer/common/BUILD.gn index 57935ac..6f3ec0c 100644 --- a/gpu/command_buffer/common/BUILD.gn +++ b/gpu/command_buffer/common/BUILD.gn @@ -2,7 +2,25 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -source_set("common") { +# The files here go into the "gpu" component in a component build (with +# "command_buffer_common" just forwarding) and goes into a static library in +# non-component build. This needs to match the GYP build which was likely an +# attempt to make larger components to help with loading. +group("common") { + if (is_component_build) { + public_deps = [ + "//gpu", + ] + } else { + public_deps = [ + ":common_sources", + ] + } +} + +source_set("common_sources") { + visibility = [ "//gpu/*" ] + sources = [ "bitfield_helpers.h", "buffer.cc", diff --git a/gpu/command_buffer/service/BUILD.gn b/gpu/command_buffer/service/BUILD.gn index 44b0909..8045a03 100644 --- a/gpu/command_buffer/service/BUILD.gn +++ b/gpu/command_buffer/service/BUILD.gn @@ -5,7 +5,21 @@ import("//build/config/ui.gni") import("//third_party/protobuf/proto_library.gni") -source_set("service") { +group("service") { + if (is_component_build) { + public_deps = [ + "//gpu", + ] + } else { + public_deps = [ + ":service_sources", + ] + } +} + +source_set("service_sources") { + visibility = [ "//gpu/*" ] + sources = [ "async_pixel_transfer_delegate.cc", "async_pixel_transfer_delegate.h", @@ -128,7 +142,7 @@ source_set("service") { include_dirs = [ "//third_party/mesa/src/include" ] public_deps = [ - "//gpu/command_buffer/common", + "//gpu/command_buffer/common:common_sources", ] deps = [ ":disk_cache_proto", @@ -144,10 +158,6 @@ source_set("service") { "//ui/gl", ] - if (ui_compositor_image_transport) { - include_dirs += [ "//third_party/khronos" ] - } - if (is_win || is_android || (is_linux && use_x11)) { sources += [ "async_pixel_transfer_manager_egl.cc", diff --git a/gpu/config/BUILD.gn b/gpu/config/BUILD.gn index f949358..add90ec 100644 --- a/gpu/config/BUILD.gn +++ b/gpu/config/BUILD.gn @@ -9,7 +9,21 @@ declare_args() { use_libpci = true } -source_set("config") { +group("config") { + if (is_component_build) { + public_deps = [ + "//gpu", + ] + } else { + public_deps = [ + ":config_sources", + ] + } +} + +source_set("config_sources") { + visibility = [ "//gpu/*" ] + sources = [ "dx_diag_node.cc", "dx_diag_node.h", @@ -52,7 +66,7 @@ source_set("config") { deps = [ "//base", - "//gpu/command_buffer/service", + "//gpu/command_buffer/service:service_sources", "//third_party/re2", "//ui/gl", ] diff --git a/gpu/ipc/BUILD.gn b/gpu/ipc/BUILD.gn index d11d685..c78dea7 100644 --- a/gpu/ipc/BUILD.gn +++ b/gpu/ipc/BUILD.gn @@ -2,7 +2,21 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -source_set("ipc") { +group("ipc") { + if (is_component_build) { + public_deps = [ + "//gpu", + ] + } else { + public_deps = [ + ":ipc_sources", + ] + } +} + +source_set("ipc_sources") { + visibility = [ "//gpu/*" ] + sources = [ "gpu_command_buffer_traits.cc", "gpu_command_buffer_traits.h", @@ -14,7 +28,7 @@ source_set("ipc") { ] deps = [ - "//gpu/command_buffer/common", + "//gpu/command_buffer/common:common_sources", "//ipc", ] } |