diff options
| author | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-04 17:48:25 +0000 |
|---|---|---|
| committer | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-04 17:48:25 +0000 |
| commit | 36d7aee078e3586ca7032cd875b6f0eb9a74e1f2 (patch) | |
| tree | 6a2c7ebec946f845197f17d3ecbadcfd91042377 /gpu/command_buffer/service | |
| parent | e1f38ddc7202c6825ea52be2f729382a1ee2d880 (diff) | |
| download | chromium_src-36d7aee078e3586ca7032cd875b6f0eb9a74e1f2.zip chromium_src-36d7aee078e3586ca7032cd875b6f0eb9a74e1f2.tar.gz chromium_src-36d7aee078e3586ca7032cd875b6f0eb9a74e1f2.tar.bz2 | |
Revert 185269
> 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
TBR=zmo@chromium.org
Review URL: https://codereview.chromium.org/12377083
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service')
| -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 fa631d1..bde9f3e 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::kEnableShaderNameHashing); + !CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableShaderNameHashing); bool npot_ok = false; diff --git a/gpu/command_buffer/service/gpu_switches.cc b/gpu/command_buffer/service/gpu_switches.cc index 1392267..aebaf8b 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 on user-defined name hashing in shaders. -const char kEnableShaderNameHashing[] = "enable-shader-name-hashing"; +// Turn off user-defined name hashing in shaders. +const char kDisableShaderNameHashing[] = "disable-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, - kEnableShaderNameHashing, + kDisableShaderNameHashing, kEnableGPUCommandLogging, kEnableGPUDebugging, kEnableGPUServiceLoggingGPU, diff --git a/gpu/command_buffer/service/gpu_switches.h b/gpu/command_buffer/service/gpu_switches.h index 1246392..1314854 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 kEnableShaderNameHashing[]; +GPU_EXPORT extern const char kDisableShaderNameHashing[]; GPU_EXPORT extern const char kEnableGPUCommandLogging[]; GPU_EXPORT extern const char kEnableGPUDebugging[]; GPU_EXPORT extern const char kEnableGPUServiceLoggingGPU[]; |