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

Unified Diff: gpu/config/gpu_info_collector_mac.mm

Issue 1547793004: Make gpu black list work again on Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clear existing gpu testing switches before each test Created 4 years, 11 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
Index: gpu/config/gpu_info_collector_mac.mm
diff --git a/gpu/config/gpu_info_collector_mac.mm b/gpu/config/gpu_info_collector_mac.mm
index f6d81fda599b4c72d41738a719cc6cd9ceeb60f1..32ffbcf5e8193ff9bcff358d2efa94113d0dca8d 100644
--- a/gpu/config/gpu_info_collector_mac.mm
+++ b/gpu/config/gpu_info_collector_mac.mm
@@ -61,6 +61,9 @@ GPUInfo::GPUDevice GetActiveGPU() {
io_registry_entry_t dsp_port = CGDisplayIOServicePort(kCGDirectMainDisplay);
gpu.vendor_id = GetEntryProperty(dsp_port, CFSTR("vendor-id"));
gpu.device_id = GetEntryProperty(dsp_port, CFSTR("device-id"));
+
+ ParseTestingIds(&gpu.vendor_id, &gpu.device_id);
+
return gpu;
}
@@ -88,6 +91,9 @@ CollectInfoResult CollectPCIVideoCardInfo(GPUInfo* gpu_info) {
}
gpu.vendor_id = GetEntryProperty(entry, CFSTR("vendor-id"));
gpu.device_id = GetEntryProperty(entry, CFSTR("device-id"));
+
+ ParseTestingIds(&gpu.vendor_id, &gpu.device_id);
+
if (gpu.vendor_id && gpu.device_id) {
if (gpu.vendor_id == active_gpu.vendor_id &&
gpu.device_id == active_gpu.device_id) {

Powered by Google App Engine
This is Rietveld 408576698