diff --git a/gpu/command_buffer/tests/gl_test_utils.cc b/gpu/command_buffer/tests/gl_test_utils.cc index 48818342427a48..25346d7e32d26b 100644 --- a/gpu/command_buffer/tests/gl_test_utils.cc +++ b/gpu/command_buffer/tests/gl_test_utils.cc @@ -374,7 +374,7 @@ bool GpuCommandBufferTestEGL::InitializeEGLGLES2(int width, int height) { } gpu::GPUInfo gpu_info; - gpu::CollectContextGraphicsInfo(&gpu_info, gpu::GpuPreferences()); + gpu::CollectContextGraphicsInfo(&gpu_info); // See crbug.com/822716, the ATI proprietary driver has eglGetProcAddress // but eglInitialize crashes with x11. if (gpu_info.gl_vendor.find("ATI Technologies Inc.") != std::string::npos) { diff --git a/gpu/config/gpu_info_collector.cc b/gpu/config/gpu_info_collector.cc index 3e1ecedb688787..ad0e520f37fcab 100644 --- a/gpu/config/gpu_info_collector.cc +++ b/gpu/config/gpu_info_collector.cc @@ -20,7 +20,6 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/trace_event/trace_event.h" -#include "gpu/config/gpu_preferences.h" #include "gpu/config/gpu_switches.h" #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck #include "third_party/skia/include/core/SkGraphics.h" @@ -171,8 +170,7 @@ bool CollectBasicGraphicsInfo(const base::CommandLine* command_line, return CollectBasicGraphicsInfo(gpu_info); } -bool CollectGraphicsInfoGL(GPUInfo* gpu_info, - const GpuPreferences& gpu_preferences) { +bool CollectGraphicsInfoGL(GPUInfo* gpu_info) { TRACE_EVENT0("startup", "gpu_info_collector::CollectGraphicsInfoGL"); DCHECK_NE(gl::GetGLImplementation(), gl::kGLImplementationNone); @@ -380,7 +378,7 @@ void FillGPUInfoFromSystemInfo(GPUInfo* gpu_info, void CollectGraphicsInfoForTesting(GPUInfo* gpu_info) { DCHECK(gpu_info); #if defined(OS_ANDROID) - CollectContextGraphicsInfo(gpu_info, GpuPreferences()); + CollectContextGraphicsInfo(gpu_info); #else CollectBasicGraphicsInfo(gpu_info); #endif // OS_ANDROID diff --git a/gpu/config/gpu_info_collector.h b/gpu/config/gpu_info_collector.h index 9421bab49d905d..10d3fef7b65440 100644 --- a/gpu/config/gpu_info_collector.h +++ b/gpu/config/gpu_info_collector.h @@ -20,7 +20,6 @@ class CommandLine; } namespace gpu { -struct GpuPreferences; // Collects basic GPU info without creating a GL/DirectX context (and without // the danger of crashing), including vendor_id and device_id. @@ -35,9 +34,7 @@ GPU_EXPORT bool CollectBasicGraphicsInfo(const base::CommandLine* command_line, // Create a GL/DirectX context and collect related info. // This is called at GPU process startup time. -GPU_EXPORT bool CollectContextGraphicsInfo( - GPUInfo* gpu_info, - const GpuPreferences& gpu_preferences); +GPU_EXPORT bool CollectContextGraphicsInfo(GPUInfo* gpu_info); #if defined(OS_WIN) // Collect the DirectX Disagnostics information about the attached displays. @@ -47,8 +44,7 @@ GPU_EXPORT void RecordGpuSupportedRuntimeVersionHistograms( #endif // OS_WIN // Create a GL context and collect GL strings and versions. -GPU_EXPORT bool CollectGraphicsInfoGL(GPUInfo* gpu_info, - const GpuPreferences& gpu_preferences); +GPU_EXPORT bool CollectGraphicsInfoGL(GPUInfo* gpu_info); // If more than one GPUs are identified, and GL strings are available, // identify the active GPU based on GL strings. diff --git a/gpu/config/gpu_info_collector_android.cc b/gpu/config/gpu_info_collector_android.cc index 1e7b09442b9d6b..f8ba4bdf49b09f 100644 --- a/gpu/config/gpu_info_collector_android.cc +++ b/gpu/config/gpu_info_collector_android.cc @@ -12,8 +12,7 @@ namespace gpu { -bool CollectContextGraphicsInfo(GPUInfo* gpu_info, - const GpuPreferences& gpu_preferences) { +bool CollectContextGraphicsInfo(GPUInfo* gpu_info) { // When command buffer is compiled as a standalone library, the process might // not have a Java environment. if (base::android::IsVMInitialized()) { @@ -22,7 +21,7 @@ bool CollectContextGraphicsInfo(GPUInfo* gpu_info, } // At this point GL bindings have been initialized already. - return CollectGraphicsInfoGL(gpu_info, gpu_preferences); + return CollectGraphicsInfoGL(gpu_info); } bool CollectBasicGraphicsInfo(GPUInfo* gpu_info) { diff --git a/gpu/config/gpu_info_collector_fuchsia.cc b/gpu/config/gpu_info_collector_fuchsia.cc index d285e4bb563a03..0288191a68c543 100644 --- a/gpu/config/gpu_info_collector_fuchsia.cc +++ b/gpu/config/gpu_info_collector_fuchsia.cc @@ -8,13 +8,12 @@ namespace gpu { -bool CollectContextGraphicsInfo(GPUInfo* gpu_info, - const GpuPreferences& gpu_preferences) { +bool CollectContextGraphicsInfo(GPUInfo* gpu_info) { DCHECK(gpu_info); TRACE_EVENT0("gpu", "gpu_info_collector::CollectGraphicsInfo"); - return CollectGraphicsInfoGL(gpu_info, gpu_preferences); + return CollectGraphicsInfoGL(gpu_info); } bool CollectBasicGraphicsInfo(GPUInfo* gpu_info) { diff --git a/gpu/config/gpu_info_collector_linux.cc b/gpu/config/gpu_info_collector_linux.cc index 87834a1f66de0d..2ecc1922ce56cc 100644 --- a/gpu/config/gpu_info_collector_linux.cc +++ b/gpu/config/gpu_info_collector_linux.cc @@ -4,18 +4,16 @@ #include "base/trace_event/trace_event.h" #include "gpu/config/gpu_info_collector.h" -#include "gpu/config/gpu_preferences.h" #include "third_party/angle/src/gpu_info_util/SystemInfo.h" namespace gpu { -bool CollectContextGraphicsInfo(GPUInfo* gpu_info, - const GpuPreferences& gpu_preferences) { +bool CollectContextGraphicsInfo(GPUInfo* gpu_info) { DCHECK(gpu_info); TRACE_EVENT0("gpu", "gpu_info_collector::CollectGraphicsInfo"); - return CollectGraphicsInfoGL(gpu_info, gpu_preferences); + return CollectGraphicsInfoGL(gpu_info); } bool CollectBasicGraphicsInfo(GPUInfo* gpu_info) { diff --git a/gpu/config/gpu_info_collector_mac.mm b/gpu/config/gpu_info_collector_mac.mm index 3550b55ecf681c..62b5c074de5364 100644 --- a/gpu/config/gpu_info_collector_mac.mm +++ b/gpu/config/gpu_info_collector_mac.mm @@ -9,12 +9,11 @@ namespace gpu { -bool CollectContextGraphicsInfo(GPUInfo* gpu_info, - const GpuPreferences& gpu_preferences) { +bool CollectContextGraphicsInfo(GPUInfo* gpu_info) { DCHECK(gpu_info); TRACE_EVENT0("gpu", "gpu_info_collector::CollectGraphicsInfo"); - return CollectGraphicsInfoGL(gpu_info, gpu_preferences); + return CollectGraphicsInfoGL(gpu_info); } bool CollectBasicGraphicsInfo(GPUInfo* gpu_info) { diff --git a/gpu/config/gpu_info_collector_unittest.cc b/gpu/config/gpu_info_collector_unittest.cc index 77aa910c1163ef..6fbdc287992806 100644 --- a/gpu/config/gpu_info_collector_unittest.cc +++ b/gpu/config/gpu_info_collector_unittest.cc @@ -12,7 +12,6 @@ #include "base/strings/string_split.h" #include "gpu/config/gpu_info.h" #include "gpu/config/gpu_info_collector.h" -#include "gpu/config/gpu_preferences.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gl/gl_context_stub.h" @@ -208,7 +207,7 @@ INSTANTIATE_TEST_SUITE_P(GPUConfig, // be fixed. TEST_P(GPUInfoCollectorTest, CollectGraphicsInfoGL) { GPUInfo gpu_info; - CollectGraphicsInfoGL(&gpu_info, GpuPreferences()); + CollectGraphicsInfoGL(&gpu_info); #if defined(OS_WIN) if (GetParam() == kMockedWindows) { EXPECT_EQ(test_values_.gpu.driver_vendor, gpu_info.gpu.driver_vendor); diff --git a/gpu/config/gpu_info_collector_win.cc b/gpu/config/gpu_info_collector_win.cc index 4b0453b89f0e4b..4220cd9090dd6d 100644 --- a/gpu/config/gpu_info_collector_win.cc +++ b/gpu/config/gpu_info_collector_win.cc @@ -557,13 +557,12 @@ void RecordGpuSupportedRuntimeVersionHistograms(Dx12VulkanVersionInfo* info) { } } -bool CollectContextGraphicsInfo(GPUInfo* gpu_info, - const GpuPreferences& gpu_preferences) { +bool CollectContextGraphicsInfo(GPUInfo* gpu_info) { TRACE_EVENT0("gpu", "CollectGraphicsInfo"); DCHECK(gpu_info); - if (!CollectGraphicsInfoGL(gpu_info, gpu_preferences)) + if (!CollectGraphicsInfoGL(gpu_info)) return false; // ANGLE's renderer strings are of the form: diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc index 2fd0939ad6cec6..f07f9bf4604abc 100644 --- a/gpu/config/gpu_util.cc +++ b/gpu/config/gpu_util.cc @@ -629,7 +629,7 @@ bool InitializeGLThreadSafe(base::CommandLine* command_line, return false; } } - CollectContextGraphicsInfo(out_gpu_info, gpu_preferences); + CollectContextGraphicsInfo(out_gpu_info); *out_gpu_feature_info = ComputeGpuFeatureInfo(*out_gpu_info, gpu_preferences, command_line, nullptr); if (!out_gpu_feature_info->disabled_extensions.empty()) { diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc index db58aeaa1be0a5..6cb08f2193065c 100644 --- a/gpu/ipc/service/gpu_init.cc +++ b/gpu/ipc/service/gpu_init.cc @@ -58,7 +58,7 @@ bool CollectGraphicsInfo(GPUInfo* gpu_info, DCHECK(gpu_info); TRACE_EVENT0("gpu,startup", "Collect Graphics Info"); base::TimeTicks before_collect_context_graphics_info = base::TimeTicks::Now(); - bool success = CollectContextGraphicsInfo(gpu_info, gpu_preferences); + bool success = CollectContextGraphicsInfo(gpu_info); if (!success) LOG(ERROR) << "gpu::CollectGraphicsInfo failed."; @@ -456,7 +456,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* command_line, bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled; if (!gl_disabled && !use_swiftshader) { - CollectContextGraphicsInfo(&gpu_info_, gpu_preferences_); + CollectContextGraphicsInfo(&gpu_info_); gpu_feature_info_ = ComputeGpuFeatureInfo(gpu_info_, gpu_preferences_, command_line, nullptr); use_swiftshader = EnableSwiftShaderIfNeeded( @@ -494,7 +494,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* command_line, // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. if (!gl_disabled && !use_swiftshader) { - CollectContextGraphicsInfo(&gpu_info_, gpu_preferences_); + CollectContextGraphicsInfo(&gpu_info_); gpu_feature_info_ = ComputeGpuFeatureInfo(gpu_info_, gpu_preferences_, command_line, nullptr); use_swiftshader = EnableSwiftShaderIfNeeded( @@ -524,7 +524,7 @@ void GpuInit::AdjustInfoToSwiftShader() { gpu_info_.passthrough_cmd_decoder = false; gpu_feature_info_for_hardware_gpu_ = gpu_feature_info_; gpu_feature_info_ = ComputeGpuFeatureInfoForSwiftShader(); - CollectContextGraphicsInfo(&gpu_info_, gpu_preferences_); + CollectContextGraphicsInfo(&gpu_info_); } scoped_refptr GpuInit::TakeDefaultOffscreenSurface() {