Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(204)

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc

Issue 9694025: Add support for GL_COMMANDS_ISSUED_CHROMIUM fence like query. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add cast for std::min Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
index f92a0f63fd152cd61c22b7941532fa8cce015c3c..d9adbfbb323e51aa1951e3ea54126ee8c3f01939 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
@@ -39,17 +39,10 @@ void GLES2DecoderTestBase::SpecializedSetup<GenQueriesEXT, 0>(
// Make the client_query_id_ so that trying to make it again
// will fail.
GetSharedMemoryAs<GLuint*>()[0] = client_query_id_;
- EXPECT_CALL(*gl_, GenQueriesARB(1, _))
- .WillOnce(SetArgumentPointee<1>(kNewServiceId));
GenQueriesEXT cmd;
cmd.Init(1, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
}
- // In the valid case this deletes the one created in the test. In the invalid
- // case it deleted the one above.
- EXPECT_CALL(*gl_, DeleteQueriesARB(1, _))
- .Times(1)
- .RetiresOnSaturation();
};
template <>
@@ -59,17 +52,10 @@ void GLES2DecoderTestBase::SpecializedSetup<GenQueriesEXTImmediate, 0>(
// Make the client_query_id_ so that trying to make it again
// will fail.
GetSharedMemoryAs<GLuint*>()[0] = client_query_id_;
- EXPECT_CALL(*gl_, GenQueriesARB(1, _))
- .WillOnce(SetArgumentPointee<1>(kNewServiceId));
GenQueriesEXT cmd;
cmd.Init(1, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
}
- // In the valid case this deletes the one created in the test. In the invalid
- // case it deleted the one above.
- EXPECT_CALL(*gl_, DeleteQueriesARB(1, _))
- .Times(1)
- .RetiresOnSaturation();
};
template <>
@@ -78,8 +64,6 @@ void GLES2DecoderTestBase::SpecializedSetup<DeleteQueriesEXT, 0>(
if (valid) {
// Make the client_query_id_ so that trying to delete it will succeed.
GetSharedMemoryAs<GLuint*>()[0] = client_query_id_;
- EXPECT_CALL(*gl_, GenQueriesARB(1, _))
- .WillOnce(SetArgumentPointee<1>(kServiceQueryId));
GenQueriesEXT cmd;
cmd.Init(1, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
@@ -92,8 +76,6 @@ void GLES2DecoderTestBase::SpecializedSetup<DeleteQueriesEXTImmediate, 0>(
if (valid) {
// Make the client_query_id_ so that trying to delete it will succeed.
GetSharedMemoryAs<GLuint*>()[0] = client_query_id_;
- EXPECT_CALL(*gl_, GenQueriesARB(1, _))
- .WillOnce(SetArgumentPointee<1>(kServiceQueryId));
GenQueriesEXT cmd;
cmd.Init(1, shared_memory_id_, shared_memory_offset_);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));

Powered by Google App Engine
This is Rietveld 408576698