Remove NameMap from shader translator and shader/program managers

gpu/command_buffer/service/shader_manager_unittest.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_manager.h"
 
 #include "gpu/command_buffer/service/gpu_service_test.h"
 #include "gpu/command_buffer/service/mocks.h"
 #include "gpu/command_buffer/service/test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 178 matching lines @@
   VaryingMap varying_map;
   varying_map[kVarying1Name] = TestHelper::ConstructVarying(
       kVarying1Type, kVarying1Size, kVarying1Precision,
       kVarying1StaticUse, kVarying1Name);
   OutputVariableList output_variable_list;
   output_variable_list.push_back(TestHelper::ConstructOutputVariable(
       kOutputVariable1Type, kOutputVariable1Size, kOutputVariable1Precision,
       kOutputVariable1StaticUse, kOutputVariable1Name));
   TestHelper::SetShaderStates(
       gl_.get(), shader1, true, &kLog, &kTranslatedSource, nullptr, &attrib_map,
-      &uniform_map, &varying_map, nullptr, &output_variable_list, nullptr);
+      &uniform_map, &varying_map, nullptr, &output_variable_list);
   EXPECT_TRUE(shader1->valid());
   // When compilation succeeds, no log is recorded.
   EXPECT_STREQ("", shader1->log_info().c_str());
   EXPECT_STREQ(kClient1Source, shader1->last_compiled_source().c_str());
   EXPECT_STREQ(kTranslatedSource.c_str(), shader1->translated_source().c_str());
 
   // Check varying infos got copied.
   EXPECT_EQ(attrib_map.size(), shader1->attrib_map().size());
   for (AttributeMap::const_iterator it = attrib_map.begin();
        it != attrib_map.end(); ++it) {
     const sh::Attribute* variable_info = shader1->GetAttribInfo(it->first);
     ASSERT_TRUE(variable_info != NULL);
     EXPECT_EQ(it->second.type, variable_info->type);
     EXPECT_EQ(it->second.arraySize, variable_info->arraySize);
     EXPECT_EQ(it->second.precision, variable_info->precision);
     EXPECT_EQ(it->second.staticUse, variable_info->staticUse);
     EXPECT_STREQ(it->second.name.c_str(), variable_info->name.c_str());
+    EXPECT_STREQ(it->second.name.c_str(),
+                 shader1->GetOriginalNameFromHashedName(it->first)->c_str());
   }
   // Check uniform infos got copied.
   EXPECT_EQ(uniform_map.size(), shader1->uniform_map().size());
   for (UniformMap::const_iterator it = uniform_map.begin();
        it != uniform_map.end(); ++it) {
     const sh::Uniform* variable_info = shader1->GetUniformInfo(it->first);
     ASSERT_TRUE(variable_info != NULL);
     EXPECT_EQ(it->second.type, variable_info->type);
     EXPECT_EQ(it->second.arraySize, variable_info->arraySize);
     EXPECT_EQ(it->second.precision, variable_info->precision);
     EXPECT_EQ(it->second.staticUse, variable_info->staticUse);
     EXPECT_STREQ(it->second.name.c_str(), variable_info->name.c_str());
+    EXPECT_STREQ(it->second.name.c_str(),
+                 shader1->GetOriginalNameFromHashedName(it->first)->c_str());
   }
   // Check varying infos got copied.
   EXPECT_EQ(varying_map.size(), shader1->varying_map().size());
   for (VaryingMap::const_iterator it = varying_map.begin();
        it != varying_map.end(); ++it) {
     const sh::Varying* variable_info = shader1->GetVaryingInfo(it->first);
     ASSERT_TRUE(variable_info != NULL);
     EXPECT_EQ(it->second.type, variable_info->type);
     EXPECT_EQ(it->second.arraySize, variable_info->arraySize);
     EXPECT_EQ(it->second.precision, variable_info->precision);
     EXPECT_EQ(it->second.staticUse, variable_info->staticUse);
     EXPECT_STREQ(it->second.name.c_str(), variable_info->name.c_str());
+    EXPECT_STREQ(it->second.name.c_str(),
+                 shader1->GetOriginalNameFromHashedName(it->first)->c_str());
   }
+  // TODO(kainino): Check interface block infos got copied.

[Ken Russell (switch to Gerrit), 2017/05/03 22:52:48]

What's the plan to address this TODO?

[Kai Ninomiya, 2017/05/03 23:02:34]

I didn't have much of a plan except "not now because it would add too much
complexity to this CL" - there's no helper code to make this work. I don't mind
queueing it up after this CL, should hopefully not take too long.

[Ken Russell (switch to Gerrit), 2017/05/03 23:10:02]

Could you please do this in a follow-on CL? It will help ensure that this
doesn't regress. Thanks much.

   // Check output variable infos got copied.
   EXPECT_EQ(output_variable_list.size(),
             shader1->output_variable_list().size());
   for (auto it = output_variable_list.begin(); it != output_variable_list.end();
        ++it) {
     const sh::OutputVariable* variable_info =
         shader1->GetOutputVariableInfo(it->mappedName);
     ASSERT_TRUE(variable_info != nullptr);
     EXPECT_EQ(it->type, variable_info->type);
     EXPECT_EQ(it->arraySize, variable_info->arraySize);
     EXPECT_EQ(it->precision, variable_info->precision);
     EXPECT_EQ(it->staticUse, variable_info->staticUse);
     EXPECT_STREQ(it->name.c_str(), variable_info->name.c_str());
+    EXPECT_STREQ(
+        it->name.c_str(),
+        shader1->GetOriginalNameFromHashedName(it->mappedName)->c_str());
   }
 
   // Compile failure case.
-  TestHelper::SetShaderStates(gl_.get(), shader1, false, &kLog,
-                              &kTranslatedSource, nullptr, &attrib_map,
-                              &uniform_map, &varying_map, nullptr,
-                              &output_variable_list, nullptr);
+  TestHelper::SetShaderStates(
+      gl_.get(), shader1, false, &kLog, &kTranslatedSource, nullptr,
+      &attrib_map, &uniform_map, &varying_map, nullptr, &output_variable_list);
   EXPECT_FALSE(shader1->valid());
   EXPECT_STREQ(kLog.c_str(), shader1->log_info().c_str());
   EXPECT_STREQ("", shader1->translated_source().c_str());
   EXPECT_TRUE(shader1->attrib_map().empty());
   EXPECT_TRUE(shader1->uniform_map().empty());
   EXPECT_TRUE(shader1->varying_map().empty());
   EXPECT_TRUE(shader1->output_variable_list().empty());
 }
 
 TEST_F(ShaderManagerTest, ShaderInfoUseCount) {
@@ skipping 40 matching lines @@
   EXPECT_CALL(*gl_, DeleteShader(kService1Id))
       .Times(1)
       .RetiresOnSaturation();
   manager_.Delete(shader1);  // this should delete the shader.
   shader2 = manager_.GetShader(kClient1Id);
   EXPECT_TRUE(shader2 == NULL);
 }
 
 }  // namespace gles2
 }  // namespace gpu