Commit af2542bf authored by Sean Gilhuly's avatar Sean Gilhuly Committed by Commit Bot

Remove GpuPreferences arg from CollectGraphicsInfo()

The |gpu_preferences| argument is no longer used in CollectGraphicsInfo,
so remove it from the signature and callsites.

Change-Id: I73399b711a94dc98983bcea7cb82df8499758028
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1949063Reviewed-by: default avatarZhenyao Mo <zmo@chromium.org>
Commit-Queue: Sean Gilhuly <sgilhuly@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721127}
parent 1c8da5b5
...@@ -57,8 +57,7 @@ ...@@ -57,8 +57,7 @@
namespace gpu { namespace gpu {
namespace { namespace {
bool CollectGraphicsInfo(GPUInfo* gpu_info, bool CollectGraphicsInfo(GPUInfo* gpu_info) {
const GpuPreferences& gpu_preferences) {
DCHECK(gpu_info); DCHECK(gpu_info);
TRACE_EVENT0("gpu,startup", "Collect Graphics Info"); TRACE_EVENT0("gpu,startup", "Collect Graphics Info");
base::TimeTicks before_collect_context_graphics_info = base::TimeTicks::Now(); base::TimeTicks before_collect_context_graphics_info = base::TimeTicks::Now();
...@@ -332,7 +331,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, ...@@ -332,7 +331,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
// We need to collect GL strings (VENDOR, RENDERER) for blacklisting purposes. // We need to collect GL strings (VENDOR, RENDERER) for blacklisting purposes.
if (!gl_disabled) { if (!gl_disabled) {
if (!use_swiftshader) { if (!use_swiftshader) {
if (!CollectGraphicsInfo(&gpu_info_, gpu_preferences_)) if (!CollectGraphicsInfo(&gpu_info_))
return false; return false;
gpu::SetKeysForCrashLogging(gpu_info_); gpu::SetKeysForCrashLogging(gpu_info_);
gpu_feature_info_ = gpu::ComputeGpuFeatureInfo( gpu_feature_info_ = gpu::ComputeGpuFeatureInfo(
...@@ -363,7 +362,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, ...@@ -363,7 +362,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
// Collect GPU info, so we can use blacklist to disable vulkan if it // Collect GPU info, so we can use blacklist to disable vulkan if it
// is needed. // is needed.
gpu::GPUInfo gpu_info; gpu::GPUInfo gpu_info;
if (!CollectGraphicsInfo(&gpu_info, gpu_preferences_)) if (!CollectGraphicsInfo(&gpu_info))
return false; return false;
auto gpu_feature_info = gpu::ComputeGpuFeatureInfo( auto gpu_feature_info = gpu::ComputeGpuFeatureInfo(
gpu_info, gpu_preferences_, command_line, nullptr); gpu_info, gpu_preferences_, command_line, nullptr);
...@@ -416,7 +415,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, ...@@ -416,7 +415,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
// information on Linux platform. Try to collect graphics information // information on Linux platform. Try to collect graphics information
// based on core profile context after disabling platform extensions. // based on core profile context after disabling platform extensions.
if (!gl_disabled && !use_swiftshader) { if (!gl_disabled && !use_swiftshader) {
if (!CollectGraphicsInfo(&gpu_info_, gpu_preferences_)) if (!CollectGraphicsInfo(&gpu_info_))
return false; return false;
gpu::SetKeysForCrashLogging(gpu_info_); gpu::SetKeysForCrashLogging(gpu_info_);
gpu_feature_info_ = gpu::ComputeGpuFeatureInfo(gpu_info_, gpu_preferences_, gpu_feature_info_ = gpu::ComputeGpuFeatureInfo(gpu_info_, gpu_preferences_,
......
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