cc/output/shader.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: cc/output/shader.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

Index: cc/output/shader.cc

diff --git a/cc/output/shader.cc b/cc/output/shader.cc

index f356c7c8f8ab30036f31737b4170b0c85a4b74ba..de1ddd4d0a6226060adf5cc4789eb6842bc005e0 100644

--- a/cc/output/shader.cc

+++ b/cc/output/shader.cc

@@ -2105,15 +2105,8 @@ void FragmentShaderYUVAVideo::Init(GLES2Interface* context,

unsigned program,

int* base_uniform_index) {

static const char* uniforms[] = {

- "y_texture",

- "u_texture",

- "v_texture",

- "a_texture",

- "alpha",

- "cc_matrix",

enne (OOO) 2015/11/20 18:26:15 Oops!

- "yuv_adj",

- "ya_clamp_rect",

- "uv_clamp_rect",

+ "y_texture", "u_texture", "v_texture", "a_texture", "alpha",

+ "yuv_matrix", "yuv_adj", "ya_clamp_rect", "uv_clamp_rect",

};

int locations[arraysize(uniforms)];

« no previous file with comments | « no previous file | gpu/GLES2/extensions/CHROMIUM/CHROMIUM_bind_uniform_location.txt » ('j') | no next file with comments »