summaryrefslogtreecommitdiffstats
path: root/chrome/gpu/gpu_info_collector_win.cc
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-08 01:30:46 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-08 01:30:46 +0000
commit5c6ddd0fb21889b6aaa65e075f5ad574a04d9aab (patch)
treec2148a29cfe6360cfd174e55077815f3a99aff0e /chrome/gpu/gpu_info_collector_win.cc
parentc4bd23d31da3e295baa43c048590d72f9c019d9a (diff)
downloadchromium_src-5c6ddd0fb21889b6aaa65e075f5ad574a04d9aab.zip
chromium_src-5c6ddd0fb21889b6aaa65e075f5ad574a04d9aab.tar.gz
chromium_src-5c6ddd0fb21889b6aaa65e075f5ad574a04d9aab.tar.bz2
Added DirectX Diagnostics information to about:gpu on Windows.
This includes the name of the GPU hardware and the driver version and release date and some other information that might potentially also be valuable in the GPU stats. TEST=try BUG=none Review URL: http://codereview.chromium.org/3547020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61904 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/gpu/gpu_info_collector_win.cc')
-rw-r--r--chrome/gpu/gpu_info_collector_win.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/gpu/gpu_info_collector_win.cc b/chrome/gpu/gpu_info_collector_win.cc
index 1e3124b..b5d30b4 100644
--- a/chrome/gpu/gpu_info_collector_win.cc
+++ b/chrome/gpu/gpu_info_collector_win.cc
@@ -37,6 +37,12 @@ bool CollectGraphicsInfo(GPUInfo* gpu_info) {
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);
+
return CollectGraphicsInfoD3D(d3d, gpu_info);
}