| 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..1b0e19d79cf5bcb24d3f00191ca98a009e310c7d 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
|
| @@ -479,7 +479,17 @@ void GLES2DecoderTestBase::SpecializedSetup<cmds::GetProgramInfoLog, 0>(
|
| *gl_,
|
| GetProgramiv(kServiceProgramId, GL_ACTIVE_UNIFORM_MAX_LENGTH, _))
|
| .WillOnce(SetArgumentPointee<2>(0));
|
| + if (feature_info()->feature_flags().ext_blend_func_extended) {
|
| + EXPECT_CALL(*gl_,
|
| + GetProgramInterfaceiv(kServiceProgramId, GL_PROGRAM_OUTPUT,
|
| + GL_ACTIVE_RESOURCES, _))
|
| + .WillOnce(SetArgumentPointee<3>(0));
|
|
|
| + EXPECT_CALL(*gl_,
|
| + GetProgramInterfaceiv(kServiceProgramId, GL_PROGRAM_OUTPUT,
|
| + GL_MAX_NAME_LENGTH, _))
|
| + .WillOnce(SetArgumentPointee<3>(0));
|
| + }
|
| Program* program = GetProgram(client_program_id_);
|
| ASSERT_TRUE(program != NULL);
|
|
|
| @@ -593,6 +603,17 @@ void GLES2DecoderTestBase::SpecializedSetup<cmds::LinkProgram, 0>(
|
| *gl_,
|
| GetProgramiv(kServiceProgramId, GL_ACTIVE_UNIFORM_MAX_LENGTH, _))
|
| .WillOnce(SetArgumentPointee<2>(0));
|
| + if (feature_info()->feature_flags().ext_blend_func_extended) {
|
| + EXPECT_CALL(*gl_,
|
| + GetProgramInterfaceiv(kServiceProgramId, GL_PROGRAM_OUTPUT,
|
| + GL_ACTIVE_RESOURCES, _))
|
| + .WillOnce(SetArgumentPointee<3>(0));
|
| +
|
| + EXPECT_CALL(*gl_,
|
| + GetProgramInterfaceiv(kServiceProgramId, GL_PROGRAM_OUTPUT,
|
| + GL_MAX_NAME_LENGTH, _))
|
| + .WillOnce(SetArgumentPointee<3>(0));
|
| + }
|
|
|
| cmds::AttachShader attach_cmd;
|
| attach_cmd.Init(client_program_id_, kClientVertexShaderId);
|
|
|