Commit 3fedff45 authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

Clean up deprecated sources assignment filter in //gpu

Remove deprecated_default_sources_assignment_filter and replace
it with explicit is_win, is_mac, etc. sections.

Bug: 1018739
Change-Id: I966303321f4d8f90504d11d9f42b0eab3cfce0bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2440846Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813146}
parent 29f717a4
...@@ -8,13 +8,6 @@ import("//testing/test.gni") ...@@ -8,13 +8,6 @@ import("//testing/test.gni")
import("//third_party/protobuf/proto_library.gni") import("//third_party/protobuf/proto_library.gni")
import("//ui/gl/features.gni") import("//ui/gl/features.gni")
# This file depends on the legacy global sources assignment filter. It should
# be converted to check target platform before assigning source files to the
# sources variable. Remove this import and set_sources_assignment_filter call
# when the file has been converted. See https://crbug.com/1018739 for details.
import("//build/config/deprecated_default_sources_assignment_filter.gni")
set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
config("gpu_implementation") { config("gpu_implementation") {
defines = [ "GPU_IMPLEMENTATION" ] defines = [ "GPU_IMPLEMENTATION" ]
configs = [ configs = [
...@@ -350,7 +343,6 @@ test("gl_tests") { ...@@ -350,7 +343,6 @@ test("gl_tests") {
"command_buffer/tests/gl_texture_storage_unittest.cc", "command_buffer/tests/gl_texture_storage_unittest.cc",
"command_buffer/tests/gl_unallocated_texture_unittest.cc", "command_buffer/tests/gl_unallocated_texture_unittest.cc",
"command_buffer/tests/gl_unittest.cc", "command_buffer/tests/gl_unittest.cc",
"command_buffer/tests/gl_unittests_android.cc",
"command_buffer/tests/gl_virtual_contexts_ext_window_rectangles_unittest.cc", "command_buffer/tests/gl_virtual_contexts_ext_window_rectangles_unittest.cc",
"command_buffer/tests/gl_virtual_contexts_unittest.cc", "command_buffer/tests/gl_virtual_contexts_unittest.cc",
"command_buffer/tests/gl_webgl_multi_draw_test.cc", "command_buffer/tests/gl_webgl_multi_draw_test.cc",
...@@ -362,6 +354,10 @@ test("gl_tests") { ...@@ -362,6 +354,10 @@ test("gl_tests") {
"ipc/client/raster_in_process_context_tests.cc", "ipc/client/raster_in_process_context_tests.cc",
] ]
if (is_android) {
sources += [ "command_buffer/tests/gl_unittests_android.cc" ]
}
if (use_dawn) { if (use_dawn) {
sources += [ sources += [
"command_buffer/service/webgpu_decoder_unittest.cc", "command_buffer/service/webgpu_decoder_unittest.cc",
......
...@@ -11,13 +11,6 @@ if (is_android) { ...@@ -11,13 +11,6 @@ if (is_android) {
import("//build/config/android/rules.gni") import("//build/config/android/rules.gni")
} }
# This file depends on the legacy global sources assignment filter. It should
# be converted to check target platform before assigning source files to the
# sources variable. Remove this import and set_sources_assignment_filter call
# when the file has been converted. See https://crbug.com/1018739 for details.
import("//build/config/deprecated_default_sources_assignment_filter.gni")
set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
group("config") { group("config") {
if (is_component_build) { if (is_component_build) {
public_deps = [ "//gpu" ] public_deps = [ "//gpu" ]
...@@ -139,7 +132,6 @@ source_set("config_sources") { ...@@ -139,7 +132,6 @@ source_set("config_sources") {
"gpu_driver_bug_workaround_type.h", "gpu_driver_bug_workaround_type.h",
"gpu_driver_bug_workarounds.cc", "gpu_driver_bug_workarounds.cc",
"gpu_driver_bug_workarounds.h", "gpu_driver_bug_workarounds.h",
"gpu_dx_diagnostics_win.cc",
"gpu_extra_info.cc", "gpu_extra_info.cc",
"gpu_extra_info.h", "gpu_extra_info.h",
"gpu_feature_info.cc", "gpu_feature_info.cc",
...@@ -151,10 +143,6 @@ source_set("config_sources") { ...@@ -151,10 +143,6 @@ source_set("config_sources") {
"gpu_info.h", "gpu_info.h",
"gpu_info_collector.cc", "gpu_info_collector.cc",
"gpu_info_collector.h", "gpu_info_collector.h",
"gpu_info_collector_android.cc",
"gpu_info_collector_linux.cc",
"gpu_info_collector_mac.mm",
"gpu_info_collector_win.cc",
"gpu_mode.h", "gpu_mode.h",
"gpu_preferences.cc", "gpu_preferences.cc",
"gpu_preferences.h", "gpu_preferences.h",
...@@ -210,7 +198,14 @@ source_set("config_sources") { ...@@ -210,7 +198,14 @@ source_set("config_sources") {
# Prefer mesa GL headers to system headers, which cause problems on Win. # Prefer mesa GL headers to system headers, which cause problems on Win.
include_dirs = [ "//third_party/mesa_headers" ] include_dirs = [ "//third_party/mesa_headers" ]
if (is_android) {
sources += [ "gpu_info_collector_android.cc" ]
}
if (is_win) { if (is_win) {
sources += [
"gpu_dx_diagnostics_win.cc",
"gpu_info_collector_win.cc",
]
libs = [ libs = [
"dxgi.lib", "dxgi.lib",
"dxguid.lib", "dxguid.lib",
...@@ -224,8 +219,12 @@ source_set("config_sources") { ...@@ -224,8 +219,12 @@ source_set("config_sources") {
} }
} }
if (is_mac) { if (is_mac) {
sources += [ "gpu_info_collector_mac.mm" ]
frameworks = [ "OpenGL.framework" ] frameworks = [ "OpenGL.framework" ]
} }
if (is_linux || is_chromeos) {
sources += [ "gpu_info_collector_linux.cc" ]
}
if (is_linux || is_chromeos || is_mac) { if (is_linux || is_chromeos || is_mac) {
deps += [ "//third_party/angle:angle_gpu_info_util" ] deps += [ "//third_party/angle:angle_gpu_info_util" ]
} }
......
...@@ -9,13 +9,6 @@ import("//testing/test.gni") ...@@ -9,13 +9,6 @@ import("//testing/test.gni")
import("//ui/ozone/ozone.gni") import("//ui/ozone/ozone.gni")
import("features.gni") import("features.gni")
# This file depends on the legacy global sources assignment filter. It should
# be converted to check target platform before assigning source files to the
# sources variable. Remove this import and set_sources_assignment_filter call
# when the file has been converted. See https://crbug.com/1018739 for details.
import("//build/config/deprecated_default_sources_assignment_filter.gni")
set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
# Generate a buildflag header for compile-time checking of Vulkan support. # Generate a buildflag header for compile-time checking of Vulkan support.
buildflag_header("buildflags") { buildflag_header("buildflags") {
header = "buildflags.h" header = "buildflags.h"
...@@ -131,10 +124,11 @@ if (enable_vulkan) { ...@@ -131,10 +124,11 @@ if (enable_vulkan) {
data_deps = [] data_deps = []
if (is_posix) { if (is_posix) {
sources += [ sources += [ "vulkan_util_posix.cc" ]
"vulkan_image_linux.cc",
"vulkan_util_posix.cc", if (is_linux || is_chromeos) {
] sources += [ "vulkan_image_linux.cc" ]
}
} }
if (is_android) { if (is_android) {
......
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