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

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder.cc

Issue 1419393005: command_buffer: Make inactive bound uniforms reserve the location (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 39e0a2954c987119b03744e8848c02faffce1ff9..cc1471b221e94778e1e0e1caf79c498605795a70 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -7056,7 +7056,8 @@ bool GLES2DecoderImpl::CheckCurrentProgramForUniform(
if (!CheckCurrentProgram(function_name)) {
return false;
}
- return location != -1;
+ return !state_.current_program->IsInactiveUniformLocationByFakeLocation(
+ location);
}
bool GLES2DecoderImpl::CheckDrawingFeedbackLoops() {

Powered by Google App Engine
This is Rietveld 408576698