Turn on shader name hashing by default.

Do this before the M26 branch cut, so our canary users can test this out (although I already tested this pretty heavily).

BUG=160369
TEST=
Review URL: https://codereview.chromium.org/12082106

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179991 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 7 insertions, 6 deletions

diff --git a/gpu/command_buffer/service/feature_info.cc b/gpu/command_buffer/service/feature_info.cc
index d48912a..30c82d7 100644
--- a/gpu/command_buffer/service/feature_info.cc
+++ b/gpu/command_buffer/service/feature_info.cc
@@ -185,8 +185,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 dd84f0b..d029cfb 100644
--- a/gpu/command_buffer/service/gpu_switches.cc
+++ b/gpu/command_buffer/service/gpu_switches.cc
@@ -20,6 +20,9 @@ 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 Logging GPU commands.
 const char kEnableGPUCommandLogging[]       = "enable-gpu-command-logging";
 
@@ -31,9 +34,6 @@ const char kEnableGPUDebugging[]            = "enable-gpu-debugging";
 // dlls.
 const char kEnableGPUServiceLoggingGPU[]    = "enable-gpu-service-logging";
 
-// Turn on user-defined name hashing in shaders.
-const char kEnableShaderNameHashing[]       = "enable-shader-name-hashing";
-
 // Turn off gpu program caching
 const char kDisableGpuProgramCache[]        = "disable-gpu-program-cache";
 
@@ -58,6 +58,7 @@ const char* kGpuSwitches[] = {
   kDisableGLErrorLimit,
   kDisableGLSLTranslator,
   kDisableGpuDriverBugWorkarounds,
+  kDisableShaderNameHashing,
   kEnableGPUCommandLogging,
   kEnableGPUDebugging,
   kEnableGPUServiceLoggingGPU,
diff --git a/gpu/command_buffer/service/gpu_switches.h b/gpu/command_buffer/service/gpu_switches.h
index 0c45be6..0a51e70 100644
--- a/gpu/command_buffer/service/gpu_switches.h
+++ b/gpu/command_buffer/service/gpu_switches.h
@@ -15,10 +15,10 @@ 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 kEnableGPUCommandLogging[];
 GPU_EXPORT extern const char kEnableGPUDebugging[];
 GPU_EXPORT extern const char kEnableGPUServiceLoggingGPU[];
-GPU_EXPORT extern const char kEnableShaderNameHashing[];
 GPU_EXPORT extern const char kDisableGpuProgramCache[];
 GPU_EXPORT extern const char kEnforceGLMinimums[];
 GPU_EXPORT extern const char kForceGLFinishWorkaround[];