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

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

Issue 1610613002: command_buffer: Fix setting samplers with bound uniforms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clarification Created 4 years, 11 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/program_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_PROGRAM_MANAGER_H_ 5 #ifndef GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
6 #define GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_ 6 #define GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 248
249 // Returns the fragment shader output variable color name binding. 249 // Returns the fragment shader output variable color name binding.
250 // Returns -1 if |original_name| is not an out variable or error. 250 // Returns -1 if |original_name| is not an out variable or error.
251 GLint GetFragDataLocation(const std::string& original_name) const; 251 GLint GetFragDataLocation(const std::string& original_name) const;
252 252
253 // Returns the fragment shader output variable color index binding. 253 // Returns the fragment shader output variable color index binding.
254 // Returns -1 if |original_name| is not an out variable or error. 254 // Returns -1 if |original_name| is not an out variable or error.
255 GLint GetFragDataIndex(const std::string& original_name) const; 255 GLint GetFragDataIndex(const std::string& original_name) const;
256 256
257 // Sets the sampler values for a uniform. 257 // Sets the sampler values for a uniform.
258 // This is safe to call for any location. If the location is not 258 // This should be called only for valid fake location pointing to
259 // a sampler uniform nothing will happen. 259 // an active uniform.
260 // Returns false if fake_location is a sampler and any value 260 // If the location is not a sampler uniform nothing will happen.
261 // is >= num_texture_units. Returns true otherwise. 261 // Returns false if fake_location is a sampler and any value is >=
262 // num_texture_units. Returns true otherwise.
262 bool SetSamplers( 263 bool SetSamplers(
263 GLint num_texture_units, GLint fake_location, 264 GLint num_texture_units, GLint fake_location,
264 GLsizei count, const GLint* value); 265 GLsizei count, const GLint* value);
265 266
266 bool IsDeleted() const { 267 bool IsDeleted() const {
267 return deleted_; 268 return deleted_;
268 } 269 }
269 270
270 void GetProgramiv(GLenum pname, GLint* params); 271 void GetProgramiv(GLenum pname, GLint* params);
271 272
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 }; 624 };
624 625
625 inline const FeatureInfo& Program::feature_info() const { 626 inline const FeatureInfo& Program::feature_info() const {
626 return *manager_->feature_info_.get(); 627 return *manager_->feature_info_.get();
627 } 628 }
628 629
629 } // namespace gles2 630 } // namespace gles2
630 } // namespace gpu 631 } // namespace gpu
631 632
632 #endif // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_ 633 #endif // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | gpu/command_buffer/service/program_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698