diff options
| -rw-r--r-- | chrome/browser/gpu_process_host_ui_shim.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/resources/gpu_blacklist.json | 16 |
2 files changed, 20 insertions, 2 deletions
diff --git a/chrome/browser/gpu_process_host_ui_shim.cc b/chrome/browser/gpu_process_host_ui_shim.cc index 93d455a..ef3f999 100644 --- a/chrome/browser/gpu_process_host_ui_shim.cc +++ b/chrome/browser/gpu_process_host_ui_shim.cc @@ -4,6 +4,8 @@ #include "chrome/browser/gpu_process_host_ui_shim.h" +#include "app/app_switches.h" +#include "app/gfx/gl/gl_implementation.h" #include "base/command_line.h" #include "base/metrics/histogram.h" #include "chrome/browser/browser_thread.h" @@ -326,7 +328,9 @@ void GpuProcessHostUIShim::OnChannelEstablished( gpu_feature_flags_set_ = true; const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); - if (!browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist)) { + if (!browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) && + browser_command_line.GetSwitchValueASCII( + switches::kUseGL) != gfx::kGLImplementationOSMesaName) { gpu_feature_flags_ = gpu_blacklist_->DetermineGpuFeatureFlags( GpuBlacklist::kOsAny, NULL, gpu_info); diff --git a/chrome/browser/resources/gpu_blacklist.json b/chrome/browser/resources/gpu_blacklist.json index 8c976c7..203d181 100644 --- a/chrome/browser/resources/gpu_blacklist.json +++ b/chrome/browser/resources/gpu_blacklist.json @@ -38,7 +38,7 @@ { "name": "gpu blacklist", // Please update the version number whenever you change this file. - "version": "0.8", + "version": "0.9", "entries": [ { // ATI Radeon X1900 on Mac, BUGWEBKIT=47028 "id": "1", @@ -138,6 +138,20 @@ "webgl", "accelerated_compositing" ] + }, + { // Windows XP, BUG=72975 + "id": "9", + "os": { + "type": "win", + "version": { + "op": "=", + "number": "5" + } + }, + "blacklist": [ + "webgl", + "accelerated_compositing" + ] } ] } |