Remove NameMap from shader translator and shader/program managers

gpu/command_buffer/service/shader_translator.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/shader_translator.h"
 
 #include <GLES2/gl2.h>
 #include <stddef.h>
 #include <string.h>
 #include <algorithm>
@@ skipping 72 matching lines @@
   var_map->clear();
   const std::vector<sh::InterfaceBlock>* interface_blocks =
       sh::GetInterfaceBlocks(compiler);
   if (interface_blocks) {
     for (const auto& block : *interface_blocks) {
       (*var_map)[block.mappedName] = block;
     }
   }
 }
 
-void GetNameHashingInfo(ShHandle compiler, NameMap* name_map) {
-  if (!name_map)
-    return;
-  name_map->clear();
-
-  typedef std::map<std::string, std::string> NameMapANGLE;
-  const NameMapANGLE* angle_map = sh::GetNameHashingMap(compiler);
-  DCHECK(angle_map);
-
-  for (NameMapANGLE::const_iterator iter = angle_map->begin();
-       iter != angle_map->end(); ++iter) {
-    // Note that in ANGLE, the map is (original_name, hash);
-    // here, we want (hash, original_name).
-    (*name_map)[iter->second] = iter->first;
-  }
-}
-
 }  // namespace
 
 ShShaderOutput ShaderTranslator::GetShaderOutputLanguageForContext(
     const gl::GLVersionInfo& version_info) {
   if (version_info.is_es) {
     return SH_ESSL_OUTPUT;
   }
 
   // Determine the GLSL version based on OpenGL specification.
 
@@ skipping 82 matching lines @@
       break;
   }
 
   return compiler_ != NULL;
 }
 
 ShCompileOptions ShaderTranslator::GetCompileOptions() const {
   return compile_options_;
 }
 
-bool ShaderTranslator::Translate(const std::string& shader_source,
-                                 std::string* info_log,
-                                 std::string* translated_source,
-                                 int* shader_version,
-                                 AttributeMap* attrib_map,
-                                 UniformMap* uniform_map,
-                                 VaryingMap* varying_map,
-                                 InterfaceBlockMap* interface_block_map,
-                                 OutputVariableList* output_variable_list,
-                                 NameMap* name_map) const {
+bool ShaderTranslator::Translate(
+    const std::string& shader_source,
+    std::string* info_log,
+    std::string* translated_source,
+    int* shader_version,
+    AttributeMap* attrib_map,
+    UniformMap* uniform_map,
+    VaryingMap* varying_map,
+    InterfaceBlockMap* interface_block_map,
+    OutputVariableList* output_variable_list) const {
   // Make sure this instance is initialized.
   DCHECK(compiler_ != NULL);
 
   bool success = false;
   {
     TRACE_EVENT0("gpu", "ShCompile");
     const char* const shader_strings[] = { shader_source.c_str() };
     success = sh::Compile(compiler_, shader_strings, 1, GetCompileOptions());
   }
   if (success) {
     // Get translated shader.
     if (translated_source) {
       *translated_source = sh::GetObjectCode(compiler_);
     }
     // Get shader version.
     *shader_version = sh::GetShaderVersion(compiler_);
     // Get info for attribs, uniforms, varyings and output variables.
     GetAttributes(compiler_, attrib_map);
     GetUniforms(compiler_, uniform_map);
     GetVaryings(compiler_, varying_map);
     GetInterfaceBlocks(compiler_, interface_block_map);
     GetOutputVariables(compiler_, output_variable_list);
-    // Get info for name hashing.
-    GetNameHashingInfo(compiler_, name_map);
   }
 
   // Get info log.
   if (info_log) {
     *info_log = sh::GetInfoLog(compiler_);
   }
 
   // We don't need results in the compiler anymore.
   sh::ClearResults(compiler_);
 
@@ skipping 22 matching lines @@
   for (auto& observer : destruction_observers_)
     observer.OnDestruct(this);
 
   if (compiler_ != NULL)
     sh::Destruct(compiler_);
 }
 
 }  // namespace gles2
 }  // namespace gpu