| Index: gpu/command_buffer/client/gles2_implementation_unittest_autogen.h
|
| diff --git a/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h b/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h
|
| index a327aee9a31d4ae908e0aeac703f41c399a388fd..4d44ad73b9f1be533f34bb8705877a0eb0b3b42a 100644
|
| --- a/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h
|
| +++ b/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h
|
| @@ -174,13 +174,13 @@ TEST_F(GLES2ImplementationTest, CheckFramebufferStatus) {
|
| Cmds expected;
|
| ExpectedMemoryInfo result1 =
|
| GetExpectedResultMemory(sizeof(cmds::CheckFramebufferStatus::Result));
|
| - expected.cmd.Init(1, result1.id, result1.offset);
|
| + expected.cmd.Init(GL_FRAMEBUFFER, result1.id, result1.offset);
|
|
|
| EXPECT_CALL(*command_buffer(), OnFlush())
|
| - .WillOnce(SetMemory(result1.ptr, uint32_t(1)))
|
| + .WillOnce(SetMemory(result1.ptr, uint32_t(GL_TRUE)))
|
| .RetiresOnSaturation();
|
|
|
| - GLboolean result = gl_->CheckFramebufferStatus(1);
|
| + GLboolean result = gl_->CheckFramebufferStatus(GL_FRAMEBUFFER);
|
| EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
|
| EXPECT_TRUE(result);
|
| }
|
| @@ -429,6 +429,17 @@ TEST_F(GLES2ImplementationTest, DeleteSamplers) {
|
| EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
|
| }
|
|
|
| +TEST_F(GLES2ImplementationTest, DeleteSync) {
|
| + struct Cmds {
|
| + cmds::DeleteSync cmd;
|
| + };
|
| + Cmds expected;
|
| + expected.cmd.Init(1);
|
| +
|
| + gl_->DeleteSync(reinterpret_cast<GLsync>(1));
|
| + EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
|
| +}
|
| +
|
| TEST_F(GLES2ImplementationTest, DeleteShader) {
|
| struct Cmds {
|
| cmds::DeleteShader cmd;
|
| @@ -1058,7 +1069,7 @@ TEST_F(GLES2ImplementationTest, IsBuffer) {
|
| expected.cmd.Init(1, result1.id, result1.offset);
|
|
|
| EXPECT_CALL(*command_buffer(), OnFlush())
|
| - .WillOnce(SetMemory(result1.ptr, uint32_t(1)))
|
| + .WillOnce(SetMemory(result1.ptr, uint32_t(GL_TRUE)))
|
| .RetiresOnSaturation();
|
|
|
| GLboolean result = gl_->IsBuffer(1);
|
| @@ -1066,25 +1077,6 @@ TEST_F(GLES2ImplementationTest, IsBuffer) {
|
| EXPECT_TRUE(result);
|
| }
|
|
|
| -TEST_F(GLES2ImplementationTest, IsEnabled) {
|
| - struct Cmds {
|
| - cmds::IsEnabled cmd;
|
| - };
|
| -
|
| - Cmds expected;
|
| - ExpectedMemoryInfo result1 =
|
| - GetExpectedResultMemory(sizeof(cmds::IsEnabled::Result));
|
| - expected.cmd.Init(1, result1.id, result1.offset);
|
| -
|
| - EXPECT_CALL(*command_buffer(), OnFlush())
|
| - .WillOnce(SetMemory(result1.ptr, uint32_t(1)))
|
| - .RetiresOnSaturation();
|
| -
|
| - GLboolean result = gl_->IsEnabled(1);
|
| - EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
|
| - EXPECT_TRUE(result);
|
| -}
|
| -
|
| TEST_F(GLES2ImplementationTest, IsFramebuffer) {
|
| struct Cmds {
|
| cmds::IsFramebuffer cmd;
|
| @@ -1096,7 +1088,7 @@ TEST_F(GLES2ImplementationTest, IsFramebuffer) {
|
| expected.cmd.Init(1, result1.id, result1.offset);
|
|
|
| EXPECT_CALL(*command_buffer(), OnFlush())
|
| - .WillOnce(SetMemory(result1.ptr, uint32_t(1)))
|
| + .WillOnce(SetMemory(result1.ptr, uint32_t(GL_TRUE)))
|
| .RetiresOnSaturation();
|
|
|
| GLboolean result = gl_->IsFramebuffer(1);
|
| @@ -1115,7 +1107,7 @@ TEST_F(GLES2ImplementationTest, IsProgram) {
|
| expected.cmd.Init(1, result1.id, result1.offset);
|
|
|
| EXPECT_CALL(*command_buffer(), OnFlush())
|
| - .WillOnce(SetMemory(result1.ptr, uint32_t(1)))
|
| + .WillOnce(SetMemory(result1.ptr, uint32_t(GL_TRUE)))
|
| .RetiresOnSaturation();
|
|
|
| GLboolean result = gl_->IsProgram(1);
|
| @@ -1134,7 +1126,7 @@ TEST_F(GLES2ImplementationTest, IsRenderbuffer) {
|
| expected.cmd.Init(1, result1.id, result1.offset);
|
|
|
| EXPECT_CALL(*command_buffer(), OnFlush())
|
| - .WillOnce(SetMemory(result1.ptr, uint32_t(1)))
|
| + .WillOnce(SetMemory(result1.ptr, uint32_t(GL_TRUE)))
|
| .RetiresOnSaturation();
|
|
|
| GLboolean result = gl_->IsRenderbuffer(1);
|
| @@ -1153,7 +1145,7 @@ TEST_F(GLES2ImplementationTest, IsSampler) {
|
| expected.cmd.Init(1, result1.id, result1.offset);
|
|
|
| EXPECT_CALL(*command_buffer(), OnFlush())
|
| - .WillOnce(SetMemory(result1.ptr, uint32_t(1)))
|
| + .WillOnce(SetMemory(result1.ptr, uint32_t(GL_TRUE)))
|
| .RetiresOnSaturation();
|
|
|
| GLboolean result = gl_->IsSampler(1);
|
| @@ -1172,7 +1164,7 @@ TEST_F(GLES2ImplementationTest, IsShader) {
|
| expected.cmd.Init(1, result1.id, result1.offset);
|
|
|
| EXPECT_CALL(*command_buffer(), OnFlush())
|
| - .WillOnce(SetMemory(result1.ptr, uint32_t(1)))
|
| + .WillOnce(SetMemory(result1.ptr, uint32_t(GL_TRUE)))
|
| .RetiresOnSaturation();
|
|
|
| GLboolean result = gl_->IsShader(1);
|
| @@ -1180,6 +1172,25 @@ TEST_F(GLES2ImplementationTest, IsShader) {
|
| EXPECT_TRUE(result);
|
| }
|
|
|
| +TEST_F(GLES2ImplementationTest, IsSync) {
|
| + struct Cmds {
|
| + cmds::IsSync cmd;
|
| + };
|
| +
|
| + Cmds expected;
|
| + ExpectedMemoryInfo result1 =
|
| + GetExpectedResultMemory(sizeof(cmds::IsSync::Result));
|
| + expected.cmd.Init(1, result1.id, result1.offset);
|
| +
|
| + EXPECT_CALL(*command_buffer(), OnFlush())
|
| + .WillOnce(SetMemory(result1.ptr, uint32_t(GL_TRUE)))
|
| + .RetiresOnSaturation();
|
| +
|
| + GLboolean result = gl_->IsSync(reinterpret_cast<GLsync>(1));
|
| + EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
|
| + EXPECT_TRUE(result);
|
| +}
|
| +
|
| TEST_F(GLES2ImplementationTest, IsTexture) {
|
| struct Cmds {
|
| cmds::IsTexture cmd;
|
| @@ -1191,7 +1202,7 @@ TEST_F(GLES2ImplementationTest, IsTexture) {
|
| expected.cmd.Init(1, result1.id, result1.offset);
|
|
|
| EXPECT_CALL(*command_buffer(), OnFlush())
|
| - .WillOnce(SetMemory(result1.ptr, uint32_t(1)))
|
| + .WillOnce(SetMemory(result1.ptr, uint32_t(GL_TRUE)))
|
| .RetiresOnSaturation();
|
|
|
| GLboolean result = gl_->IsTexture(1);
|
| @@ -1210,7 +1221,7 @@ TEST_F(GLES2ImplementationTest, IsTransformFeedback) {
|
| expected.cmd.Init(1, result1.id, result1.offset);
|
|
|
| EXPECT_CALL(*command_buffer(), OnFlush())
|
| - .WillOnce(SetMemory(result1.ptr, uint32_t(1)))
|
| + .WillOnce(SetMemory(result1.ptr, uint32_t(GL_TRUE)))
|
| .RetiresOnSaturation();
|
|
|
| GLboolean result = gl_->IsTransformFeedback(1);
|
| @@ -2516,7 +2527,7 @@ TEST_F(GLES2ImplementationTest, IsVertexArrayOES) {
|
| expected.cmd.Init(1, result1.id, result1.offset);
|
|
|
| EXPECT_CALL(*command_buffer(), OnFlush())
|
| - .WillOnce(SetMemory(result1.ptr, uint32_t(1)))
|
| + .WillOnce(SetMemory(result1.ptr, uint32_t(GL_TRUE)))
|
| .RetiresOnSaturation();
|
|
|
| GLboolean result = gl_->IsVertexArrayOES(1);
|
| @@ -2628,7 +2639,7 @@ TEST_F(GLES2ImplementationTest, IsValuebufferCHROMIUM) {
|
| expected.cmd.Init(1, result1.id, result1.offset);
|
|
|
| EXPECT_CALL(*command_buffer(), OnFlush())
|
| - .WillOnce(SetMemory(result1.ptr, uint32_t(1)))
|
| + .WillOnce(SetMemory(result1.ptr, uint32_t(GL_TRUE)))
|
| .RetiresOnSaturation();
|
|
|
| GLboolean result = gl_->IsValuebufferCHROMIUM(1);
|
|
|