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

Unified Diff: chrome/gpu/gpu_info_collector_win.cc

Issue 4860001: Collect DirectX diagnostic information asynchronously.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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 | « chrome/gpu/gpu_info_collector_mac.mm ('k') | chrome/gpu/gpu_thread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/gpu/gpu_info_collector_win.cc
===================================================================
--- chrome/gpu/gpu_info_collector_win.cc (revision 66118)
+++ chrome/gpu/gpu_info_collector_win.cc (working copy)
@@ -37,13 +37,14 @@
if (FAILED(device->GetDirect3D(&d3d)))
return false;
- // Don't fail if DirectX diagnostics are not available. Just leave the tree
- // empty. The other GPU info is still valuable.
- DxDiagNode dx_diagnostics;
- if (GetDxDiagnostics(&dx_diagnostics))
- gpu_info->SetDxDiagnostics(dx_diagnostics);
+ if (!CollectGraphicsInfoD3D(d3d, gpu_info))
+ return false;
- return CollectGraphicsInfoD3D(d3d, gpu_info);
+ // DirectX diagnostics are collected asynchronously because it takes a
+ // couple of seconds. Do not mark as complete until that is done.
+ gpu_info->SetProgress(GPUInfo::kPartial);
+
+ return true;
}
bool CollectGraphicsInfoD3D(IDirect3D9* d3d, GPUInfo* gpu_info) {
« no previous file with comments | « chrome/gpu/gpu_info_collector_mac.mm ('k') | chrome/gpu/gpu_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698