| Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc
|
| diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc
|
| index b0f21623aa26aee7bfbef7ac12fe4c17f43faa78..0460b0746a044a9900bf2c744a27445622a63b9c 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc
|
| @@ -1810,6 +1810,23 @@ TEST_P(GLES2DecoderManualInitTest, ARBTextureRectangleTexImage2D) {
|
| GL_TEXTURE_RECTANGLE_ARB, client_texture_id_, kServiceTextureId);
|
| ASSERT_TRUE(GetTexture(client_texture_id_) != NULL);
|
|
|
| + EXPECT_CALL(*gl_, GetError())
|
| + .WillOnce(Return(GL_NO_ERROR))
|
| + .WillOnce(Return(GL_NO_ERROR))
|
| + .RetiresOnSaturation();
|
| + EXPECT_CALL(*gl_,
|
| + TexImage2D(target,
|
| + level,
|
| + internal_format,
|
| + width,
|
| + height,
|
| + 0,
|
| + format,
|
| + type,
|
| + _))
|
| + .Times(1)
|
| + .RetiresOnSaturation();
|
| +
|
| TexImage2D cmd;
|
| cmd.Init(target,
|
| level,
|
| @@ -1822,7 +1839,7 @@ TEST_P(GLES2DecoderManualInitTest, ARBTextureRectangleTexImage2D) {
|
| kSharedMemoryOffset);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
|
|
| - EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| + EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| }
|
|
|
| TEST_P(GLES2DecoderManualInitTest, ARBTextureRectangleTexImage2DInvalid) {
|
| @@ -1855,7 +1872,7 @@ TEST_P(GLES2DecoderManualInitTest, ARBTextureRectangleTexImage2DInvalid) {
|
| kSharedMemoryOffset);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
|
|
| - EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
|
| + EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
|
| }
|
|
|
| TEST_P(GLES2DecoderManualInitTest, TexSubImage2DClearsAfterTexImage2DNULL) {
|
|
|