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
cbchan · Mar 4, 2013 · 36d7aee · 36d7aee
1 parent e1f38dd
commit 36d7aee
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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[];