Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(65)

Side by Side Diff: gpu/command_buffer/service/shader_translator.h

Issue 8486016: Add OVERRIDE to gpu/ and gl/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « gpu/command_buffer/service/gpu_scheduler.h ('k') | ui/gfx/gl/gl_context_cgl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 public: 76 public:
77 ShaderTranslator(); 77 ShaderTranslator();
78 virtual ~ShaderTranslator(); 78 virtual ~ShaderTranslator();
79 79
80 // Overridden from ShaderTranslatorInterface. 80 // Overridden from ShaderTranslatorInterface.
81 virtual bool Init( 81 virtual bool Init(
82 ShShaderType shader_type, 82 ShShaderType shader_type,
83 ShShaderSpec shader_spec, 83 ShShaderSpec shader_spec,
84 const ShBuiltInResources* resources, 84 const ShBuiltInResources* resources,
85 GlslImplementationType glsl_implementation_type, 85 GlslImplementationType glsl_implementation_type,
86 GlslBuiltInFunctionBehavior glsl_built_in_function_behavior); 86 GlslBuiltInFunctionBehavior glsl_built_in_function_behavior) OVERRIDE;
87 87
88 // Overridden from ShaderTranslatorInterface. 88 // Overridden from ShaderTranslatorInterface.
89 virtual bool Translate(const char* shader); 89 virtual bool Translate(const char* shader) OVERRIDE;
90 90
91 // Overridden from ShaderTranslatorInterface. 91 // Overridden from ShaderTranslatorInterface.
92 virtual const char* translated_shader() const; 92 virtual const char* translated_shader() const OVERRIDE;
93 virtual const char* info_log() const; 93 virtual const char* info_log() const OVERRIDE;
94 94
95 // Overridden from ShaderTranslatorInterface. 95 // Overridden from ShaderTranslatorInterface.
96 virtual const VariableMap& attrib_map() const; 96 virtual const VariableMap& attrib_map() const OVERRIDE;
97 virtual const VariableMap& uniform_map() const; 97 virtual const VariableMap& uniform_map() const OVERRIDE;
98 98
99 private: 99 private:
100 void ClearResults(); 100 void ClearResults();
101 101
102 ShHandle compiler_; 102 ShHandle compiler_;
103 scoped_array<char> translated_shader_; 103 scoped_array<char> translated_shader_;
104 scoped_array<char> info_log_; 104 scoped_array<char> info_log_;
105 VariableMap attrib_map_; 105 VariableMap attrib_map_;
106 VariableMap uniform_map_; 106 VariableMap uniform_map_;
107 bool implementation_is_glsl_es_; 107 bool implementation_is_glsl_es_;
108 bool needs_built_in_function_emulation_; 108 bool needs_built_in_function_emulation_;
109 109
110 DISALLOW_COPY_AND_ASSIGN(ShaderTranslator); 110 DISALLOW_COPY_AND_ASSIGN(ShaderTranslator);
111 }; 111 };
112 112
113 } // namespace gles2 113 } // namespace gles2
114 } // namespace gpu 114 } // namespace gpu
115 115
116 #endif // GPU_COMMAND_BUFFER_SERVICE_SHADER_TRANSLATOR_H_ 116 #endif // GPU_COMMAND_BUFFER_SERVICE_SHADER_TRANSLATOR_H_
117 117
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gpu_scheduler.h ('k') | ui/gfx/gl/gl_context_cgl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698