| Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
|
| diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
|
| index ea1be2833f0b023706bc80eef2b177913aab3c81..8512aa57cce771dc1eb93f33dff20a03d549d763 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
|
| @@ -1808,29 +1808,16 @@ TEST_F(GLES2DecoderTest2, ViewportInvalidArgs3_0) {
|
| // TODO(gman): TexStorage2DEXT
|
|
|
| TEST_F(GLES2DecoderTest2, GenQueriesEXTValidArgs) {
|
| - EXPECT_CALL(*gl_, GenQueriesARB(1, _))
|
| - .WillOnce(SetArgumentPointee<1>(kNewServiceId));
|
| GetSharedMemoryAs<GLuint*>()[0] = kNewClientId;
|
| SpecializedSetup<GenQueriesEXT, 0>(true);
|
| GenQueriesEXT cmd;
|
| cmd.Init(1, shared_memory_id_, shared_memory_offset_);
|
| EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
|
| EXPECT_EQ(GL_NO_ERROR, GetGLError());
|
| - EXPECT_TRUE(GetQueryInfo(kNewClientId) != NULL);
|
| -}
|
| -
|
| -TEST_F(GLES2DecoderTest2, GenQueriesEXTInvalidArgs) {
|
| - EXPECT_CALL(*gl_, GenQueriesARB(_, _)).Times(0);
|
| - GetSharedMemoryAs<GLuint*>()[0] = client_query_id_;
|
| - SpecializedSetup<GenQueriesEXT, 0>(false);
|
| - GenQueriesEXT cmd;
|
| - cmd.Init(1, shared_memory_id_, shared_memory_offset_);
|
| - EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(cmd));
|
| +
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, GenQueriesEXTImmediateValidArgs) {
|
| - EXPECT_CALL(*gl_, GenQueriesARB(1, _))
|
| - .WillOnce(SetArgumentPointee<1>(kNewServiceId));
|
| GenQueriesEXTImmediate* cmd = GetImmediateAs<GenQueriesEXTImmediate>();
|
| GLuint temp = kNewClientId;
|
| SpecializedSetup<GenQueriesEXTImmediate, 0>(true);
|
| @@ -1842,7 +1829,6 @@ TEST_F(GLES2DecoderTest2, GenQueriesEXTImmediateValidArgs) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, GenQueriesEXTImmediateInvalidArgs) {
|
| - EXPECT_CALL(*gl_, GenQueriesARB(_, _)).Times(0);
|
| GenQueriesEXTImmediate* cmd = GetImmediateAs<GenQueriesEXTImmediate>();
|
| SpecializedSetup<GenQueriesEXTImmediate, 0>(false);
|
| cmd->Init(1, &client_query_id_);
|
| @@ -1851,10 +1837,6 @@ TEST_F(GLES2DecoderTest2, GenQueriesEXTImmediateInvalidArgs) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, DeleteQueriesEXTValidArgs) {
|
| - EXPECT_CALL(
|
| - *gl_,
|
| - DeleteQueriesARB(1, Pointee(kServiceQueryId)))
|
| - .Times(1);
|
| GetSharedMemoryAs<GLuint*>()[0] = client_query_id_;
|
| SpecializedSetup<DeleteQueriesEXT, 0>(true);
|
| DeleteQueriesEXT cmd;
|
| @@ -1874,10 +1856,6 @@ TEST_F(GLES2DecoderTest2, DeleteQueriesEXTInvalidArgs) {
|
| }
|
|
|
| TEST_F(GLES2DecoderTest2, DeleteQueriesEXTImmediateValidArgs) {
|
| - EXPECT_CALL(
|
| - *gl_,
|
| - DeleteQueriesARB(1, Pointee(kServiceQueryId)))
|
| - .Times(1);
|
| DeleteQueriesEXTImmediate& cmd =
|
| *GetImmediateAs<DeleteQueriesEXTImmediate>();
|
| SpecializedSetup<DeleteQueriesEXTImmediate, 0>(true);
|
|
|