| 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 abf12a0ef1be33d4752bf836b42f247ae3ef8b43..f15351aab221f4b7cc5bcc9846e2273aa9ec7102 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
|
| @@ -119,7 +119,8 @@ GLES2DecoderTestBase::GLES2DecoderTestBase()
|
| cached_color_mask_alpha_(true),
|
| cached_depth_mask_(true),
|
| cached_stencil_front_mask_(static_cast<GLuint>(-1)),
|
| - cached_stencil_back_mask_(static_cast<GLuint>(-1)) {
|
| + cached_stencil_back_mask_(static_cast<GLuint>(-1)),
|
| + shader_language_version_(100) {
|
| memset(immediate_buffer_, 0xEE, sizeof(immediate_buffer_));
|
| }
|
|
|
| @@ -1488,6 +1489,9 @@ const char* GLES2DecoderTestBase::kUniform1Name = "uniform1";
|
| const char* GLES2DecoderTestBase::kUniform2Name = "uniform2[0]";
|
| const char* GLES2DecoderTestBase::kUniform3Name = "uniform3[0]";
|
|
|
| +const char* GLES2DecoderTestBase::kOutputVariable1Name = "gl_FragColor";
|
| +const char* GLES2DecoderTestBase::kOutputVariable1NameESSL3 = "color";
|
| +
|
| void GLES2DecoderTestBase::SetupDefaultProgram() {
|
| {
|
| static AttribInfo attribs[] = {
|
| @@ -1622,10 +1626,18 @@ void GLES2DecoderTestBase::SetupShader(
|
| GL_FRAGMENT_SHADER, fragment_shader_client_id,
|
| fragment_shader_service_id);
|
|
|
| - TestHelper::SetShaderStates(
|
| - gl_.get(), GetShader(vertex_shader_client_id), true);
|
| - TestHelper::SetShaderStates(
|
| - gl_.get(), GetShader(fragment_shader_client_id), true);
|
| + TestHelper::SetShaderStates(gl_.get(), GetShader(vertex_shader_client_id),
|
| + true, NULL, NULL, &shader_language_version_, NULL,
|
| + NULL, NULL, NULL, NULL);
|
| +
|
| + AttributeList frag_output_variable_list;
|
| + frag_output_variable_list.push_back(TestHelper::ConstructAttribute(
|
| + GL_FLOAT_VEC4, 0, GL_MEDIUM_FLOAT, true,
|
| + shader_language_version_ == 100 ? kOutputVariable1Name
|
| + : kOutputVariable1NameESSL3));
|
| + TestHelper::SetShaderStates(gl_.get(), GetShader(fragment_shader_client_id),
|
| + true, NULL, NULL, &shader_language_version_, NULL,
|
| + NULL, NULL, &frag_output_variable_list, NULL);
|
|
|
| cmds::AttachShader attach_cmd;
|
| attach_cmd.Init(program_client_id, vertex_shader_client_id);
|
|
|