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

gpu/command_buffer/service/program_manager.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 61 matching lines @@
     GLenum type;
     uint32 accepts_api_type;
     GLint fake_location_base;
     bool is_array;
     std::string name;
     std::vector<GLint> element_locations;
     std::vector<GLuint> texture_units;
   };
   struct VertexAttrib {
     VertexAttrib(GLsizei _size, GLenum _type, const std::string& _name,
-                     GLint _location)
+                 GLint _location)
         : size(_size),
           type(_type),
           location(_location),
           name(_name) {
     }
     GLsizei size;
     GLenum type;
     GLint location;
     std::string name;
   };
@@ skipping 181 matching lines @@
   // glBindAttribLocation() again with the mapped names.
   // This is called right before the glLink() call, but after shaders are
   // translated.
   void ExecuteBindAttribLocationCalls();
 
   bool AddUniformInfo(
       GLsizei size, GLenum type, GLint location, GLint fake_base_location,
       const std::string& name, const std::string& original_name,
       size_t* next_available_index);
 
-  void GetCorrectedVariableInfo(
-      bool use_uniforms, const std::string& name, std::string* corrected_name,
-      std::string* original_name, GLsizei* size, GLenum* type) const;
+  // Query uniform data returned by ANGLE translator by the mapped name.
+  // Some drivers incorrectly return an uniform name of size-1 array without
+  // "[0]". In this case, we correct the name by appending "[0]" to it.
+  void GetCorrectedUniformData(
+      const std::string& name,
+      std::string* corrected_name, std::string* original_name,
+      GLsizei* size, GLenum* type) const;
+
+  // Query VertexAttrib data returned by ANGLE translator by the mapped name.
+  void GetVertexAttribData(
+      const std::string& name, std::string* original_name, GLenum* type) const;
 
   void DetachShaders(ShaderManager* manager);
 
   static inline GLint GetUniformInfoIndexFromFakeLocation(
       GLint fake_location) {
     return fake_location & 0xFFFF;
   }
 
   static inline GLint GetArrayElementIndexFromFakeLocation(
       GLint fake_location) {
@@ skipping 129 matching lines @@
 
   uint32 max_varying_vectors_;
 
   DISALLOW_COPY_AND_ASSIGN(ProgramManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_