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

Unified Diff: gpu/config/gpu_info_collector_win.cc

Issue 2698273004: Add workaround for GPU detection inside a Citrix remote session. (Closed)
Patch Set: Created 3 years, 10 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/config/gpu_info_collector_win.cc
diff --git a/gpu/config/gpu_info_collector_win.cc b/gpu/config/gpu_info_collector_win.cc
index d13b817fb6ff6f3d7636e1d855b2befc4654fe00..8dab759f23ca11410c90ba3a8aefc28fe5a7e4a9 100644
--- a/gpu/config/gpu_info_collector_win.cc
+++ b/gpu/config/gpu_info_collector_win.cc
@@ -350,8 +350,14 @@ CollectInfoResult CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
}
if (id.length() <= 20) {
- // Check if it is the RDP mirror driver "RDPUDD Chained DD"
- if (wcscmp(dd.DeviceString, L"RDPUDD Chained DD") != 0) {
+ // EnumDisplayDevices returns an empty id when called inside a remote
+ // session (unless that session happens to be attached to the console). In
+ // that case, we do not want to fail, as we should be able to grab the
+ // device/vendor ids from the D3D context, below. Therefore, only fail if
+ // the device string is not one of either the RDP mirror driver "RDPUDD
+ // Chained DD" or the citrix display driver.
+ if (wcscmp(dd.DeviceString, L"RDPUDD Chained DD") != 0 &&
+ wcscmp(dd.DeviceString, L"Citrix Systems Inc. Display Driver") != 0) {
gpu_info->basic_info_state = kCollectInfoNonFatalFailure;
return kCollectInfoNonFatalFailure;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698