Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(239)

Unified Diff: gpu/config/gpu_info_collector.cc

Issue 1463823002: Add DriverBugWorkaroundsInGpuProcessPage to gpu_process_test.py (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: To fix win bot failure, call IdentifyActiveGPU when receiving GpuInfi back from the GPU process thr… Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/config/gpu_driver_bug_workaround_type.h ('k') | gpu/ipc/common/gpu_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/config/gpu_info_collector.cc
diff --git a/gpu/config/gpu_info_collector.cc b/gpu/config/gpu_info_collector.cc
index 44df9f1550b2b73ed58c3bc6b994130cbaca8498..471718c398359d4a857559d986baa9010a4f039a 100644
--- a/gpu/config/gpu_info_collector.cc
+++ b/gpu/config/gpu_info_collector.cc
@@ -176,7 +176,12 @@ void MergeGPUInfoGL(GPUInfo* basic_gpu_info,
DCHECK(basic_gpu_info);
// Copy over GPUs because which one is active could change.
basic_gpu_info->gpu = context_gpu_info.gpu;
- basic_gpu_info->secondary_gpus = context_gpu_info.secondary_gpus;
+
+ // TODO(j.isorce): Currently the GPU process does not know about any secondary
+ // gpu. So for now make sure to keep them when receiving GpuInfo from the GPU
+ // process through GpuHostMsg_GraphicsInfoCollected.
+ if (context_gpu_info.secondary_gpus.size() > 0)
+ basic_gpu_info->secondary_gpus = context_gpu_info.secondary_gpus;
basic_gpu_info->gl_renderer = context_gpu_info.gl_renderer;
basic_gpu_info->gl_vendor = context_gpu_info.gl_vendor;
« no previous file with comments | « gpu/config/gpu_driver_bug_workaround_type.h ('k') | gpu/ipc/common/gpu_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698