summaryrefslogtreecommitdiffstats
path: root/content/gpu
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-26 23:59:24 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-26 23:59:24 +0000
commita07fb6d62e5762df82304256e0fc712c10a55498 (patch)
treef61b51855a1d1e88c0b22342dc24c5b588719948 /content/gpu
parenta703e71ecc392ca01fb72d01f91129d347f24a7b (diff)
downloadchromium_src-a07fb6d62e5762df82304256e0fc712c10a55498.zip
chromium_src-a07fb6d62e5762df82304256e0fc712c10a55498.tar.gz
chromium_src-a07fb6d62e5762df82304256e0fc712c10a55498.tar.bz2
Windows: disable collection of D3D11 stats.
BUG=175525 Review URL: https://codereview.chromium.org/12326110 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184780 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu')
-rw-r--r--content/gpu/gpu_info_collector_win.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/content/gpu/gpu_info_collector_win.cc b/content/gpu/gpu_info_collector_win.cc
index da9169b8..e318e31 100644
--- a/content/gpu/gpu_info_collector_win.cc
+++ b/content/gpu/gpu_info_collector_win.cc
@@ -170,6 +170,9 @@ AMDVideoCardType GetAMDVideocardType();
// Collects information about the level of D3D11 support and records it in
// the UMA stats. Records no stats when D3D11 in not supported at all.
+//
+// http://crbug.com/175525. Using D3D11 seems to crash when dlumd32.dll is
+// loaded. This function is not currently called.
void CollectD3D11Support(HMODULE d3d11_module) {
TRACE_EVENT0("gpu", "CollectD3D11Support");
@@ -308,12 +311,6 @@ bool CollectDriverInfoD3D(const std::wstring& device_id,
content::GPUInfo* gpu_info) {
TRACE_EVENT0("gpu", "CollectDriverInfoD3D");
- base::WorkerPool::PostTask(
- FROM_HERE,
- base::Bind(CollectD3D11SupportDelayed,
- base::MessageLoopProxy::current()),
- false);
-
// create device info for the display device
HDEVINFO device_info = SetupDiGetClassDevsW(
NULL, device_id.c_str(), NULL,