gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.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_unittest_2.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

« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | gpu/command_buffer/service/program_manager.h » ('j') | gpu/command_buffer/service/program_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc

diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc

index 4901ba1577a0c1f94694101d5a1bf456cfe3dca9..2d37097ed88473d3658bc9468cfbc08b6342906d 100644

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

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

@@ -475,10 +475,6 @@ void GLES2DecoderTestBase::SpecializedSetup<cmds::GetProgramInfoLog, 0>(

.WillOnce(SetArgumentPointee<2>(0));

EXPECT_CALL(*gl_, GetProgramiv(kServiceProgramId, GL_ACTIVE_UNIFORMS, _))

.WillOnce(SetArgumentPointee<2>(0));

- EXPECT_CALL(

- *gl_,

- GetProgramiv(kServiceProgramId, GL_ACTIVE_UNIFORM_MAX_LENGTH, _))

- .WillOnce(SetArgumentPointee<2>(0));

Program* program = GetProgram(client_program_id_);

ASSERT_TRUE(program != NULL);

@@ -589,10 +585,6 @@ void GLES2DecoderTestBase::SpecializedSetup<cmds::LinkProgram, 0>(

.WillOnce(SetArgumentPointee<2>(0));

EXPECT_CALL(*gl_, GetProgramiv(kServiceProgramId, GL_ACTIVE_UNIFORMS, _))

.WillOnce(SetArgumentPointee<2>(0));

- EXPECT_CALL(

- *gl_,

- GetProgramiv(kServiceProgramId, GL_ACTIVE_UNIFORM_MAX_LENGTH, _))

- .WillOnce(SetArgumentPointee<2>(0));

cmds::AttachShader attach_cmd;

attach_cmd.Init(client_program_id_, kClientVertexShaderId);