gpu/command_buffer/service/gles2_cmd_decoder.cc - Issue 1419393005: command_buffer: Make inactive bound uniforms reserve the location

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: fix a cc bug exposed by the implementation 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

« cc/output/shader.cc ('K') | « gpu/GLES2/extensions/CHROMIUM/CHROMIUM_bind_uniform_location.txt ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 fbdd7d32167a9ee9db098eb6896ff339172c02f6..83b86061139eee35c9501f3192a32fa9791d1ee7 100644

--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc

+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc

@@ -7061,7 +7061,8 @@ bool GLES2DecoderImpl::CheckCurrentProgramForUniform(

if (!CheckCurrentProgram(function_name)) {

return false;

}

- return location != -1;

+ return !state_.current_program->IsInactiveUniformLocationByFakeLocation(

+ location);

}

bool GLES2DecoderImpl::CheckDrawingFeedbackLoops() {