| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef GPU_COMMAND_BUFFER_SERVICE_SHADER_TRANSLATOR_H_ | 5 #ifndef GPU_COMMAND_BUFFER_SERVICE_SHADER_TRANSLATOR_H_ |
| 6 #define GPU_COMMAND_BUFFER_SERVICE_SHADER_TRANSLATOR_H_ | 6 #define GPU_COMMAND_BUFFER_SERVICE_SHADER_TRANSLATOR_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 virtual bool Init( | 68 virtual bool Init( |
| 69 ShShaderType shader_type, | 69 ShShaderType shader_type, |
| 70 ShShaderSpec shader_spec, | 70 ShShaderSpec shader_spec, |
| 71 const ShBuiltInResources* resources, | 71 const ShBuiltInResources* resources, |
| 72 bool implementation_is_glsl_es); | 72 bool implementation_is_glsl_es); |
| 73 | 73 |
| 74 // Overridden from ShaderTranslatorInterface. | 74 // Overridden from ShaderTranslatorInterface. |
| 75 virtual bool Translate(const char* shader); | 75 virtual bool Translate(const char* shader); |
| 76 | 76 |
| 77 // Overridden from ShaderTranslatorInterface. | 77 // Overridden from ShaderTranslatorInterface. |
| 78 virtual const char* translated_shader() const { | 78 virtual const char* translated_shader() const; |
| 79 return translated_shader_.get(); } | 79 virtual const char* info_log() const; |
| 80 virtual const char* info_log() const { return info_log_.get(); } | |
| 81 | 80 |
| 82 // Overridden from ShaderTranslatorInterface. | 81 // Overridden from ShaderTranslatorInterface. |
| 83 virtual const VariableMap& attrib_map() const { return attrib_map_; } | 82 virtual const VariableMap& attrib_map() const; |
| 84 virtual const VariableMap& uniform_map() const { return uniform_map_; } | 83 virtual const VariableMap& uniform_map() const; |
| 85 | 84 |
| 86 private: | 85 private: |
| 87 void ClearResults(); | 86 void ClearResults(); |
| 88 | 87 |
| 89 ShHandle compiler_; | 88 ShHandle compiler_; |
| 90 scoped_array<char> translated_shader_; | 89 scoped_array<char> translated_shader_; |
| 91 scoped_array<char> info_log_; | 90 scoped_array<char> info_log_; |
| 92 VariableMap attrib_map_; | 91 VariableMap attrib_map_; |
| 93 VariableMap uniform_map_; | 92 VariableMap uniform_map_; |
| 94 bool implementation_is_glsl_es_; | 93 bool implementation_is_glsl_es_; |
| 95 | 94 |
| 96 DISALLOW_COPY_AND_ASSIGN(ShaderTranslator); | 95 DISALLOW_COPY_AND_ASSIGN(ShaderTranslator); |
| 97 }; | 96 }; |
| 98 | 97 |
| 99 } // namespace gles2 | 98 } // namespace gles2 |
| 100 } // namespace gpu | 99 } // namespace gpu |
| 101 | 100 |
| 102 #endif // GPU_COMMAND_BUFFER_SERVICE_SHADER_TRANSLATOR_H_ | 101 #endif // GPU_COMMAND_BUFFER_SERVICE_SHADER_TRANSLATOR_H_ |
| 103 | 102 |
| OLD | NEW |