diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-24 03:52:55 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-24 03:52:55 +0000 |
| commit | 0d471d495dc8793bb3af04df5a3fe4780b623d7a (patch) | |
| tree | 033b819e24941e68ab1d28aa815307d0525ec1b9 /content | |
| parent | 374e5743405e896fd4a66d77950201f226aff27c (diff) | |
| download | chromium_src-0d471d495dc8793bb3af04df5a3fe4780b623d7a.zip chromium_src-0d471d495dc8793bb3af04df5a3fe4780b623d7a.tar.gz chromium_src-0d471d495dc8793bb3af04df5a3fe4780b623d7a.tar.bz2 | |
Windows: Do not collect D3D11 stats for Ivy Bridge on Vista or DisplayLink.
Doing this can cause the browser process to crash.
Review URL: https://chromiumcodereview.appspot.com/12787018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/gpu/gpu_info_collector_win.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/content/gpu/gpu_info_collector_win.cc b/content/gpu/gpu_info_collector_win.cc index f3e7677..c085681 100644 --- a/content/gpu/gpu_info_collector_win.cc +++ b/content/gpu/gpu_info_collector_win.cc @@ -210,11 +210,17 @@ bool D3D11ShouldWork(const content::GPUInfo& gpu_info) { // Intel? if (gpu_info.gpu.vendor_id == 0x8086) { - // 2nd Generation Core Processor Family Integrated Graphics Controller? + // 2nd Generation Core Processor Family Integrated Graphics Controller + // or Intel Ivy Bridge? if (gpu_info.gpu.device_id == 0x0102 || gpu_info.gpu.device_id == 0x0106 || gpu_info.gpu.device_id == 0x0116 || - gpu_info.gpu.device_id == 0x0126) { + gpu_info.gpu.device_id == 0x0126 || + gpu_info.gpu.device_id == 0x0152 || + gpu_info.gpu.device_id == 0x0156 || + gpu_info.gpu.device_id == 0x015a || + gpu_info.gpu.device_id == 0x0162 || + gpu_info.gpu.device_id == 0x0166) { // http://crbug.com/196373. if (base::win::GetVersion() == base::win::VERSION_VISTA) return false; |