diff options
Diffstat (limited to 'gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc')
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc | 17 |
1 files changed, 10 insertions, 7 deletions
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 119096bb..8648134 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc @@ -126,6 +126,7 @@ void GLES2DecoderTestBase::SetUp() { // Autogenerated tests do not overwrite version or extension string, // so we have to pick something that supports everything here. init.gl_version = "4.4"; + init.extensions += " GL_ARB_compatibility"; init.has_alpha = true; init.has_depth = true; init.request_alpha = true; @@ -321,13 +322,15 @@ void GLES2DecoderTestBase::InitDecoderWithCommandLine( .WillOnce(SetArgumentPointee<1>(normalized_init.has_stencil ? 8 : 0)) .RetiresOnSaturation(); - EXPECT_CALL(*gl_, Enable(GL_VERTEX_PROGRAM_POINT_SIZE)) - .Times(1) - .RetiresOnSaturation(); + if (!group_->feature_info()->gl_version_info().BehavesLikeGLES()) { + EXPECT_CALL(*gl_, Enable(GL_VERTEX_PROGRAM_POINT_SIZE)) + .Times(1) + .RetiresOnSaturation(); - EXPECT_CALL(*gl_, Enable(GL_POINT_SPRITE)) - .Times(1) - .RetiresOnSaturation(); + EXPECT_CALL(*gl_, Enable(GL_POINT_SPRITE)) + .Times(1) + .RetiresOnSaturation(); + } static GLint max_viewport_dims[] = { kMaxViewportWidth, @@ -1684,7 +1687,7 @@ void GLES2DecoderTestBase::DeleteIndexBuffer() { void GLES2DecoderTestBase::AddExpectationsForSimulatedAttrib0WithError( GLsizei num_vertices, GLuint buffer_id, GLenum error) { - if (gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2) { + if (group_->feature_info()->gl_version_info().BehavesLikeGLES()) { return; } |