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

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

Issue 2857083002: Fix behavior of GetOriginalNameFromHashedName (Closed)
Patch Set: remove GetMappedName Created 3 years, 7 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
« no previous file with comments | « no previous file | gpu/command_buffer/service/shader_manager.cc » ('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) 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_MANAGER_H_ 5 #ifndef GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_
6 #define GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_ 6 #define GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 const std::string& original_name) const; 117 const std::string& original_name) const;
118 118
119 // If the original_name is not found, return NULL. 119 // If the original_name is not found, return NULL.
120 const std::string* GetOutputVariableMappedName( 120 const std::string* GetOutputVariableMappedName(
121 const std::string& original_name) const; 121 const std::string& original_name) const;
122 122
123 // If the hashed_name is not found, return NULL. 123 // If the hashed_name is not found, return NULL.
124 const std::string* GetOriginalNameFromHashedName( 124 const std::string* GetOriginalNameFromHashedName(
125 const std::string& hashed_name) const; 125 const std::string& hashed_name) const;
126 126
127 const std::string* GetMappedName(
128 const std::string& original_name) const;
129
130 const std::string& log_info() const { 127 const std::string& log_info() const {
131 return log_info_; 128 return log_info_;
132 } 129 }
133 130
134 bool valid() const { 131 bool valid() const {
135 return shader_state_ == kShaderStateCompiled && valid_; 132 return shader_state_ == kShaderStateCompiled && valid_;
136 } 133 }
137 134
138 bool IsDeleted() const { 135 bool IsDeleted() const {
139 return marked_for_deletion_; 136 return marked_for_deletion_;
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 ProgressReporter* progress_reporter_; 313 ProgressReporter* progress_reporter_;
317 314
318 DISALLOW_COPY_AND_ASSIGN(ShaderManager); 315 DISALLOW_COPY_AND_ASSIGN(ShaderManager);
319 }; 316 };
320 317
321 } // namespace gles2 318 } // namespace gles2
322 } // namespace gpu 319 } // namespace gpu
323 320
324 #endif // GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_ 321 #endif // GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_
325 322
OLDNEW
« no previous file with comments | « no previous file | gpu/command_buffer/service/shader_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698