Report relevant variable names in info logs on failed shader link

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 170 matching lines @@
   // returns false if error.
   bool SetUniformLocationBinding(const std::string& name, GLint location);
 
   // Detects if there are attribute location conflicts from
   // glBindAttribLocation() calls.
   // We only consider the declared attributes in the program.
   bool DetectAttribLocationBindingConflicts() const;
 
   // Detects if there are uniforms of the same name but different type
   // or precision in vertex/fragment shaders.
-  // Return true if such cases are detected.
-  bool DetectUniformsMismatch() const;
+  // Return true and set the first found conflicting hashed name to
+  // conflicting_name if such cases are detected.
+  bool DetectUniformsMismatch(std::string& conflicting_name) const;

[piman, 2014/01/09 18:16:46]

nit: style doesn't allow non-const references, instead using pointers (or
returning the string if it makes sense).

 
   // Return true if a varying is statically used in fragment shader, but it
   // is not declared in vertex shader.
-  bool DetectVaryingsMismatch() const;
+  bool DetectVaryingsMismatch(std::string& conflicting_name) const;
 
   // Return true if an uniform and an attribute share the same name.
-  bool DetectGlobalNameConflicts() const;
+  bool DetectGlobalNameConflicts(std::string& conflicting_name) const;
 
   // Return false if varyings can't be packed into the max available
   // varying registers.
   bool CheckVaryingsPacking() const;
 
   // Visible for testing
   const LocationMap& bind_attrib_location_map() const {
     return bind_attrib_location_map_;
   }
 
@@ skipping 202 matching lines @@
 
   uint32 max_varying_vectors_;
 
   DISALLOW_COPY_AND_ASSIGN(ProgramManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_