Switch to use ANGLE's new APIs to query shader variables.

gpu/command_buffer/service/shader_manager.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 <utility>
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 
 namespace gpu {
 namespace gles2 {
 
+namespace {
+
+// Given a variable name | a[0].b.c[0] |, return |a|.
+std::string GetTopVariableName(const std::string& fullname) {
+  size_t pos = fullname.find_first_of("[.");
+  if (pos == std::string::npos)
+    return fullname;
+  return fullname.substr(0, pos);
+}
+
+}  // namespace anonymous
+
 Shader::Shader(GLuint service_id, GLenum shader_type)
       : use_count_(0),
         service_id_(service_id),
         shader_type_(shader_type),
         valid_(false) {
 }
 
 Shader::~Shader() {
 }
 
@@ skipping 64 matching lines @@
 void Shader::DecUseCount() {
   --use_count_;
   DCHECK_GE(use_count_, 0);
 }
 
 void Shader::MarkAsDeleted() {
   DCHECK_NE(service_id_, 0u);
   service_id_ = 0;
 }
 
-const Shader::VariableInfo* Shader::GetAttribInfo(
-    const std::string& name) const {
-  VariableMap::const_iterator it = attrib_map_.find(name);
+const sh::Attribute* Shader::GetAttribInfo(const std::string& name) const {
+  // Vertex attributes can't be arrays or structs (GLSL ES 3.00.4, section
+  // 4.3.4, "Input Variables"), so |name| is the top level name used as
+  // the AttributeMap key.
+  AttributeMap::const_iterator it = attrib_map_.find(name);
   return it != attrib_map_.end() ? &it->second : NULL;
 }
 
 const std::string* Shader::GetAttribMappedName(
     const std::string& original_name) const {
-  for (VariableMap::const_iterator it = attrib_map_.begin();
+  for (AttributeMap::const_iterator it = attrib_map_.begin();
        it != attrib_map_.end(); ++it) {
     if (it->second.name == original_name)
       return &(it->first);
   }
   return NULL;
 }
 
 const std::string* Shader::GetOriginalNameFromHashedName(
     const std::string& hashed_name) const {
   NameMap::const_iterator it = name_map_.find(hashed_name);
   if (it != name_map_.end())
     return &(it->second);
   return NULL;
 }
 
-const Shader::VariableInfo* Shader::GetUniformInfo(
-    const std::string& name) const {
-  VariableMap::const_iterator it = uniform_map_.find(name);
+const sh::Uniform* Shader::GetUniformInfo(const std::string& name) const {
+  UniformMap::const_iterator it = uniform_map_.find(GetTopVariableName(name));
   return it != uniform_map_.end() ? &it->second : NULL;
 }
 
-const Shader::VariableInfo* Shader::GetVaryingInfo(
-    const std::string& name) const {
-  VariableMap::const_iterator it = varying_map_.find(name);
+const sh::Varying* Shader::GetVaryingInfo(const std::string& name) const {
+  VaryingMap::const_iterator it = varying_map_.find(GetTopVariableName(name));
   return it != varying_map_.end() ? &it->second : NULL;
 }
 
 ShaderManager::ShaderManager() {}
 
 ShaderManager::~ShaderManager() {
   DCHECK(shaders_.empty());
 }
 
 void ShaderManager::Destroy(bool have_context) {
@@ skipping 80 matching lines @@
   DCHECK(shader);
   DCHECK(IsOwned(shader));
   shader->DecUseCount();
   RemoveShader(shader);
 }
 
 }  // namespace gles2
 }  // namespace gpu