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

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

Issue 629913002: Replacing the OVERRIDE with override and FINAL with final in gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Included autogen python file for OVERRIDE Created 6 years, 2 months 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 }; 110 };
111 111
112 ShaderTranslator(); 112 ShaderTranslator();
113 113
114 // Overridden from ShaderTranslatorInterface. 114 // Overridden from ShaderTranslatorInterface.
115 virtual bool Init( 115 virtual bool Init(
116 sh::GLenum shader_type, 116 sh::GLenum shader_type,
117 ShShaderSpec shader_spec, 117 ShShaderSpec shader_spec,
118 const ShBuiltInResources* resources, 118 const ShBuiltInResources* resources,
119 GlslImplementationType glsl_implementation_type, 119 GlslImplementationType glsl_implementation_type,
120 ShCompileOptions driver_bug_workarounds) OVERRIDE; 120 ShCompileOptions driver_bug_workarounds) override;
121 121
122 // Overridden from ShaderTranslatorInterface. 122 // Overridden from ShaderTranslatorInterface.
123 virtual bool Translate(const std::string& shader_source, 123 virtual bool Translate(const std::string& shader_source,
124 std::string* info_log, 124 std::string* info_log,
125 std::string* translated_source, 125 std::string* translated_source,
126 VariableMap* attrib_map, 126 VariableMap* attrib_map,
127 VariableMap* uniform_map, 127 VariableMap* uniform_map,
128 VariableMap* varying_map, 128 VariableMap* varying_map,
129 NameMap* name_map) const OVERRIDE; 129 NameMap* name_map) const override;
130 130
131 virtual std::string GetStringForOptionsThatWouldAffectCompilation() const 131 virtual std::string GetStringForOptionsThatWouldAffectCompilation() const
132 OVERRIDE; 132 override;
133 133
134 void AddDestructionObserver(DestructionObserver* observer); 134 void AddDestructionObserver(DestructionObserver* observer);
135 void RemoveDestructionObserver(DestructionObserver* observer); 135 void RemoveDestructionObserver(DestructionObserver* observer);
136 136
137 private: 137 private:
138 friend class base::RefCounted<ShaderTranslator>; 138 friend class base::RefCounted<ShaderTranslator>;
139 139
140 virtual ~ShaderTranslator(); 140 virtual ~ShaderTranslator();
141 int GetCompileOptions() const; 141 int GetCompileOptions() const;
142 142
143 ShHandle compiler_; 143 ShHandle compiler_;
144 ShBuiltInResources compiler_options_; 144 ShBuiltInResources compiler_options_;
145 bool implementation_is_glsl_es_; 145 bool implementation_is_glsl_es_;
146 ShCompileOptions driver_bug_workarounds_; 146 ShCompileOptions driver_bug_workarounds_;
147 ObserverList<DestructionObserver> destruction_observers_; 147 ObserverList<DestructionObserver> destruction_observers_;
148 148
149 DISALLOW_COPY_AND_ASSIGN(ShaderTranslator); 149 DISALLOW_COPY_AND_ASSIGN(ShaderTranslator);
150 }; 150 };
151 151
152 } // namespace gles2 152 } // namespace gles2
153 } // namespace gpu 153 } // namespace gpu
154 154
155 #endif // GPU_COMMAND_BUFFER_SERVICE_SHADER_TRANSLATOR_H_ 155 #endif // GPU_COMMAND_BUFFER_SERVICE_SHADER_TRANSLATOR_H_
156 156
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/query_manager_unittest.cc ('k') | gpu/command_buffer/service/shader_translator_cache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698