diff options
| author | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-28 17:31:28 +0000 |
|---|---|---|
| committer | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-28 17:31:28 +0000 |
| commit | 92d18249dcf676e81349a1687903c448e0b5339d (patch) | |
| tree | d17cbed7a7bef4b0707db16cca21b9a443e1a14e | |
| parent | 9763e1056bf970acd1f5587bfb46e5b1c55291a6 (diff) | |
| download | chromium_src-92d18249dcf676e81349a1687903c448e0b5339d.zip chromium_src-92d18249dcf676e81349a1687903c448e0b5339d.tar.gz chromium_src-92d18249dcf676e81349a1687903c448e0b5339d.tar.bz2 | |
Turn off shader name hashing by default.
This has to be turned off due to a mac AMD driver regression.
This is for M26, so once it's landed on trunk and merged back to M26, I will revert it on trunk.
BUG=178287
TEST=run MapsGL on a MacBook Pro with AMD GPU and the latest 10.8.3 12D68 seed, zoom in to a city, and ensure end caps of streets render correctly.
TBR=gman
Review URL: https://codereview.chromium.org/12379005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185269 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | gpu/command_buffer/service/feature_info.cc | 4 | ||||
| -rw-r--r-- | gpu/command_buffer/service/gpu_switches.cc | 6 | ||||
| -rw-r--r-- | gpu/command_buffer/service/gpu_switches.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/gpu/command_buffer/service/feature_info.cc b/gpu/command_buffer/service/feature_info.cc index bde9f3e..fa631d1 100644 --- a/gpu/command_buffer/service/feature_info.cc +++ b/gpu/command_buffer/service/feature_info.cc @@ -188,8 +188,8 @@ void FeatureInfo::AddFeatures() { switches::kDisableGpuDriverBugWorkarounds); feature_flags_.enable_shader_name_hashing = - !CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableShaderNameHashing); + CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableShaderNameHashing); bool npot_ok = false; diff --git a/gpu/command_buffer/service/gpu_switches.cc b/gpu/command_buffer/service/gpu_switches.cc index aebaf8b..1392267 100644 --- a/gpu/command_buffer/service/gpu_switches.cc +++ b/gpu/command_buffer/service/gpu_switches.cc @@ -20,8 +20,8 @@ const char kDisableGLSLTranslator[] = "disable-glsl-translator"; const char kDisableGpuDriverBugWorkarounds[] = "disable-gpu-driver-bug-workarounds"; -// Turn off user-defined name hashing in shaders. -const char kDisableShaderNameHashing[] = "disable-shader-name-hashing"; +// Turn on user-defined name hashing in shaders. +const char kEnableShaderNameHashing[] = "enable-shader-name-hashing"; // Turn on Logging GPU commands. const char kEnableGPUCommandLogging[] = "enable-gpu-command-logging"; @@ -63,7 +63,7 @@ const char* kGpuSwitches[] = { kDisableGLErrorLimit, kDisableGLSLTranslator, kDisableGpuDriverBugWorkarounds, - kDisableShaderNameHashing, + kEnableShaderNameHashing, kEnableGPUCommandLogging, kEnableGPUDebugging, kEnableGPUServiceLoggingGPU, diff --git a/gpu/command_buffer/service/gpu_switches.h b/gpu/command_buffer/service/gpu_switches.h index 1314854..1246392 100644 --- a/gpu/command_buffer/service/gpu_switches.h +++ b/gpu/command_buffer/service/gpu_switches.h @@ -15,7 +15,7 @@ GPU_EXPORT extern const char kCompileShaderAlwaysSucceeds[]; GPU_EXPORT extern const char kDisableGLErrorLimit[]; GPU_EXPORT extern const char kDisableGLSLTranslator[]; GPU_EXPORT extern const char kDisableGpuDriverBugWorkarounds[]; -GPU_EXPORT extern const char kDisableShaderNameHashing[]; +GPU_EXPORT extern const char kEnableShaderNameHashing[]; GPU_EXPORT extern const char kEnableGPUCommandLogging[]; GPU_EXPORT extern const char kEnableGPUDebugging[]; GPU_EXPORT extern const char kEnableGPUServiceLoggingGPU[]; |