gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc - Issue 147593011: Hookup clear_uniforms_before_first_program_use workaround with implementation.

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_base.cc

Issue 147593011: Hookup clear_uniforms_before_first_program_use workaround with implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h ('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_base.cc

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

index c41777a9e946f5c66f0613d13b5f36860e2e1a30..6f74bde049790c3f6748fbf28102a5ff7bea346b 100644

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

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

@@ -1263,9 +1263,6 @@ void GLES2DecoderTestBase::SetupShader(

link_cmd.Init(program_client_id);

EXPECT_EQ(error::kNoError, ExecuteCmd(link_cmd));

- // Assume the next command will be UseProgram.

- SetupExpectationsForClearingUniforms(uniforms, num_uniforms);

Ken Russell (switch to Gerrit) 2014/02/04 22:15:11 The removal of these expectations is problematic.

Zhenyao Mo 2014/02/05 02:02:41 The ClearUniforms is covered in ProgramManagerWith

}

void GLES2DecoderTestBase::DoEnableVertexAttribArray(GLint index) {