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

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

Issue 1135943002: Pull in various gpu/command_buffer fixes from chromium (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 7 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
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 cfd1c1a8cf6c712097a5f24a04769010f3c11e3e..234a6e81bf7c78a8ce3d9f6b2a6e74ab961ab903 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
@@ -367,26 +367,6 @@ void GLES2DecoderTestBase::SpecializedSetup<cmds::UseProgram, 0>(
};
template <>
-void GLES2DecoderTestBase::SpecializedSetup<cmds::ValidateProgram, 0>(
- bool /* valid */) {
- // Needs the same setup as LinkProgram.
- SpecializedSetup<cmds::LinkProgram, 0>(false);
-
- EXPECT_CALL(*gl_, LinkProgram(kServiceProgramId))
- .Times(1)
- .RetiresOnSaturation();
-
- cmds::LinkProgram link_cmd;
- link_cmd.Init(client_program_id_);
- EXPECT_EQ(error::kNoError, ExecuteCmd(link_cmd));
-
- EXPECT_CALL(*gl_,
- GetProgramiv(kServiceProgramId, GL_INFO_LOG_LENGTH, _))
- .WillOnce(SetArgumentPointee<2>(0))
- .RetiresOnSaturation();
-};
-
-template <>
void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform1f, 0>(
bool /* valid */) {
SetupShaderForUniform(GL_FLOAT);

Powered by Google App Engine
This is Rietveld 408576698