| Index: gpu/command_buffer/service/program_manager.h
|
| diff --git a/gpu/command_buffer/service/program_manager.h b/gpu/command_buffer/service/program_manager.h
|
| index 258a3c3cf5f6206249fb35743218a0922feb5e4e..0da039dc121ec2051a55d98f5933d2edd2f6b984 100644
|
| --- a/gpu/command_buffer/service/program_manager.h
|
| +++ b/gpu/command_buffer/service/program_manager.h
|
| @@ -188,15 +188,16 @@ class GPU_EXPORT Program : public base::RefCounted<Program> {
|
|
|
| // 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;
|
|
|
| // 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.
|
|
|