| Index: gpu/command_buffer/service/shader_manager.h
|
| diff --git a/gpu/command_buffer/service/shader_manager.h b/gpu/command_buffer/service/shader_manager.h
|
| index 1f97f42b41294f4ceddf0808a429a1b34e0c382a..c3c40f1e2345405692e0d8a31f46cdfb4946af01 100644
|
| --- a/gpu/command_buffer/service/shader_manager.h
|
| +++ b/gpu/command_buffer/service/shader_manager.h
|
| @@ -84,7 +84,9 @@ class GPU_EXPORT Shader : public base::RefCounted<Shader> {
|
|
|
| const sh::Attribute* GetAttribInfo(const std::string& name) const;
|
| const sh::Uniform* GetUniformInfo(const std::string& name) const;
|
| - const sh::Varying* GetVaryingInfo(const std::string& name) const;
|
| + const sh::Varying* GetInputVariableInfo(const std::string& name) const;
|
| + const sh::OutputVariable* GetOutputVariableInfo(
|
| + const std::string& name) const;
|
|
|
| // If the original_name is not found, return NULL.
|
| const std::string* GetAttribMappedName(
|
| @@ -134,6 +136,10 @@ class GPU_EXPORT Shader : public base::RefCounted<Shader> {
|
| return varying_map_;
|
| }
|
|
|
| + const OutputVariableList& output_variable_list() const {
|
| + return output_variable_list_;
|
| + }
|
| +
|
| // Used by program cache.
|
| void set_attrib_map(const AttributeMap& attrib_map) {
|
| // copied because cache might be cleared
|
| @@ -152,6 +158,13 @@ class GPU_EXPORT Shader : public base::RefCounted<Shader> {
|
| varying_map_ = VaryingMap(varying_map);
|
| }
|
|
|
| + // Used by program cache.
|
| + void set_output_variable_list(
|
| + const OutputVariableList& output_variable_list) {
|
| + // copied because cache might be cleared
|
| + output_variable_list_ = output_variable_list;
|
| + }
|
| +
|
| private:
|
| friend class base::RefCounted<Shader>;
|
| friend class ShaderManager;
|
| @@ -211,6 +224,7 @@ class GPU_EXPORT Shader : public base::RefCounted<Shader> {
|
| AttributeMap attrib_map_;
|
| UniformMap uniform_map_;
|
| VaryingMap varying_map_;
|
| + OutputVariableList output_variable_list_;
|
|
|
| // The name hashing info when the shader was last compiled.
|
| NameMap name_map_;
|
|
|