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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1006093002: Collapsed gl query functions with their ARB/EXT variants. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Collapsed all glQuery functions Created 5 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
« no previous file with comments | « gpu/command_buffer/service/query_manager.cc ('k') | ui/gl/generate_bindings.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/query_manager_unittest.cc
diff --git a/gpu/command_buffer/service/query_manager_unittest.cc b/gpu/command_buffer/service/query_manager_unittest.cc
index 9c3dd10327edc584490901b2a07d975db2cb8ccf..f6e3682219582791b7af187a729042561864af6c 100644
--- a/gpu/command_buffer/service/query_manager_unittest.cc
+++ b/gpu/command_buffer/service/query_manager_unittest.cc
@@ -61,7 +61,7 @@ class QueryManagerTest : public GpuServiceTest {
QueryManager::Query* CreateQuery(
GLenum target, GLuint client_id, int32 shm_id, uint32 shm_offset,
GLuint service_id) {
- EXPECT_CALL(*gl_, GenQueriesARB(1, _))
+ EXPECT_CALL(*gl_, GenQueries(1, _))
.WillOnce(SetArgumentPointee<1>(service_id))
.RetiresOnSaturation();
return manager_->CreateQuery(target, client_id, shm_id, shm_offset);
@@ -70,10 +70,10 @@ class QueryManagerTest : public GpuServiceTest {
void QueueQuery(QueryManager::Query* query,
GLuint service_id,
base::subtle::Atomic32 submit_count) {
- EXPECT_CALL(*gl_, BeginQueryARB(query->target(), service_id))
+ EXPECT_CALL(*gl_, BeginQuery(query->target(), service_id))
.Times(1)
.RetiresOnSaturation();
- EXPECT_CALL(*gl_, EndQueryARB(query->target()))
+ EXPECT_CALL(*gl_, EndQuery(query->target()))
.Times(1)
.RetiresOnSaturation();
EXPECT_TRUE(manager_->BeginQuery(query));
@@ -177,7 +177,7 @@ TEST_F(QueryManagerTest, Destroy) {
CreateQuery(GL_ANY_SAMPLES_PASSED_EXT, kClient1Id,
kSharedMemoryId, kSharedMemoryOffset, kService1Id));
ASSERT_TRUE(query.get() != NULL);
- EXPECT_CALL(*gl_, DeleteQueriesARB(1, ::testing::Pointee(kService1Id)))
+ EXPECT_CALL(*gl_, DeleteQueries(1, ::testing::Pointee(kService1Id)))
.Times(1)
.RetiresOnSaturation();
manager_->Destroy(true);
@@ -236,7 +236,7 @@ TEST_F(QueryManagerTest, ProcessPendingQuery) {
// Process with return not available.
// Expect 1 GL command.
EXPECT_CALL(*gl_,
- GetQueryObjectuivARB(kService1Id, GL_QUERY_RESULT_AVAILABLE_EXT, _))
+ GetQueryObjectuiv(kService1Id, GL_QUERY_RESULT_AVAILABLE_EXT, _))
.WillOnce(SetArgumentPointee<2>(0))
.RetiresOnSaturation();
EXPECT_TRUE(manager_->ProcessPendingQueries(false));
@@ -247,11 +247,11 @@ TEST_F(QueryManagerTest, ProcessPendingQuery) {
// Process with return available.
// Expect 2 GL commands.
EXPECT_CALL(*gl_,
- GetQueryObjectuivARB(kService1Id, GL_QUERY_RESULT_AVAILABLE_EXT, _))
+ GetQueryObjectuiv(kService1Id, GL_QUERY_RESULT_AVAILABLE_EXT, _))
.WillOnce(SetArgumentPointee<2>(1))
.RetiresOnSaturation();
EXPECT_CALL(*gl_,
- GetQueryObjectuivARB(kService1Id, GL_QUERY_RESULT_EXT, _))
+ GetQueryObjectuiv(kService1Id, GL_QUERY_RESULT_EXT, _))
.WillOnce(SetArgumentPointee<2>(kResult))
.RetiresOnSaturation();
EXPECT_TRUE(manager_->ProcessPendingQueries(false));
@@ -323,23 +323,23 @@ TEST_F(QueryManagerTest, ProcessPendingQueries) {
{
InSequence s;
EXPECT_CALL(*gl_,
- GetQueryObjectuivARB(kService1Id, GL_QUERY_RESULT_AVAILABLE_EXT, _))
+ GetQueryObjectuiv(kService1Id, GL_QUERY_RESULT_AVAILABLE_EXT, _))
.WillOnce(SetArgumentPointee<2>(1))
.RetiresOnSaturation();
EXPECT_CALL(*gl_,
- GetQueryObjectuivARB(kService1Id, GL_QUERY_RESULT_EXT, _))
+ GetQueryObjectuiv(kService1Id, GL_QUERY_RESULT_EXT, _))
.WillOnce(SetArgumentPointee<2>(kResult1))
.RetiresOnSaturation();
EXPECT_CALL(*gl_,
- GetQueryObjectuivARB(kService2Id, GL_QUERY_RESULT_AVAILABLE_EXT, _))
+ GetQueryObjectuiv(kService2Id, GL_QUERY_RESULT_AVAILABLE_EXT, _))
.WillOnce(SetArgumentPointee<2>(1))
.RetiresOnSaturation();
EXPECT_CALL(*gl_,
- GetQueryObjectuivARB(kService2Id, GL_QUERY_RESULT_EXT, _))
+ GetQueryObjectuiv(kService2Id, GL_QUERY_RESULT_EXT, _))
.WillOnce(SetArgumentPointee<2>(kResult2))
.RetiresOnSaturation();
EXPECT_CALL(*gl_,
- GetQueryObjectuivARB(kService3Id, GL_QUERY_RESULT_AVAILABLE_EXT, _))
+ GetQueryObjectuiv(kService3Id, GL_QUERY_RESULT_AVAILABLE_EXT, _))
.WillOnce(SetArgumentPointee<2>(0))
.RetiresOnSaturation();
EXPECT_TRUE(manager_->ProcessPendingQueries(false));
@@ -358,7 +358,7 @@ TEST_F(QueryManagerTest, ProcessPendingQueries) {
// Process with renaming query. No result.
// Expect 1 GL commands.
EXPECT_CALL(*gl_,
- GetQueryObjectuivARB(kService3Id, GL_QUERY_RESULT_AVAILABLE_EXT, _))
+ GetQueryObjectuiv(kService3Id, GL_QUERY_RESULT_AVAILABLE_EXT, _))
.WillOnce(SetArgumentPointee<2>(0))
.RetiresOnSaturation();
EXPECT_TRUE(manager_->ProcessPendingQueries(false));
@@ -370,11 +370,11 @@ TEST_F(QueryManagerTest, ProcessPendingQueries) {
// Process with renaming query. With result.
// Expect 2 GL commands.
EXPECT_CALL(*gl_,
- GetQueryObjectuivARB(kService3Id, GL_QUERY_RESULT_AVAILABLE_EXT, _))
+ GetQueryObjectuiv(kService3Id, GL_QUERY_RESULT_AVAILABLE_EXT, _))
.WillOnce(SetArgumentPointee<2>(1))
.RetiresOnSaturation();
EXPECT_CALL(*gl_,
- GetQueryObjectuivARB(kService3Id, GL_QUERY_RESULT_EXT, _))
+ GetQueryObjectuiv(kService3Id, GL_QUERY_RESULT_EXT, _))
.WillOnce(SetArgumentPointee<2>(kResult3))
.RetiresOnSaturation();
EXPECT_TRUE(manager_->ProcessPendingQueries(false));
@@ -403,11 +403,11 @@ TEST_F(QueryManagerTest, ProcessPendingBadSharedMemoryId) {
// Process with return available.
// Expect 2 GL commands.
EXPECT_CALL(*gl_,
- GetQueryObjectuivARB(kService1Id, GL_QUERY_RESULT_AVAILABLE_EXT, _))
+ GetQueryObjectuiv(kService1Id, GL_QUERY_RESULT_AVAILABLE_EXT, _))
.WillOnce(SetArgumentPointee<2>(1))
.RetiresOnSaturation();
EXPECT_CALL(*gl_,
- GetQueryObjectuivARB(kService1Id, GL_QUERY_RESULT_EXT, _))
+ GetQueryObjectuiv(kService1Id, GL_QUERY_RESULT_EXT, _))
.WillOnce(SetArgumentPointee<2>(kResult))
.RetiresOnSaturation();
EXPECT_FALSE(manager_->ProcessPendingQueries(false));
@@ -432,11 +432,11 @@ TEST_F(QueryManagerTest, ProcessPendingBadSharedMemoryOffset) {
// Process with return available.
// Expect 2 GL commands.
EXPECT_CALL(*gl_,
- GetQueryObjectuivARB(kService1Id, GL_QUERY_RESULT_AVAILABLE_EXT, _))
+ GetQueryObjectuiv(kService1Id, GL_QUERY_RESULT_AVAILABLE_EXT, _))
.WillOnce(SetArgumentPointee<2>(1))
.RetiresOnSaturation();
EXPECT_CALL(*gl_,
- GetQueryObjectuivARB(kService1Id, GL_QUERY_RESULT_EXT, _))
+ GetQueryObjectuiv(kService1Id, GL_QUERY_RESULT_EXT, _))
.WillOnce(SetArgumentPointee<2>(kResult))
.RetiresOnSaturation();
EXPECT_FALSE(manager_->ProcessPendingQueries(false));
@@ -474,17 +474,17 @@ TEST_F(QueryManagerTest, ARBOcclusionQuery2) {
scoped_ptr<QueryManager> manager(
new QueryManager(decoder_.get(), feature_info.get()));
- EXPECT_CALL(*gl_, GenQueriesARB(1, _))
+ EXPECT_CALL(*gl_, GenQueries(1, _))
.WillOnce(SetArgumentPointee<1>(kService1Id))
.RetiresOnSaturation();
QueryManager::Query* query = manager->CreateQuery(
kTarget, kClient1Id, kSharedMemoryId, kSharedMemoryOffset);
ASSERT_TRUE(query != NULL);
- EXPECT_CALL(*gl_, BeginQueryARB(GL_ANY_SAMPLES_PASSED_EXT, kService1Id))
+ EXPECT_CALL(*gl_, BeginQuery(GL_ANY_SAMPLES_PASSED_EXT, kService1Id))
.Times(1)
.RetiresOnSaturation();
- EXPECT_CALL(*gl_, EndQueryARB(GL_ANY_SAMPLES_PASSED_EXT))
+ EXPECT_CALL(*gl_, EndQuery(GL_ANY_SAMPLES_PASSED_EXT))
.Times(1)
.RetiresOnSaturation();
EXPECT_TRUE(manager->BeginQuery(query));
@@ -508,17 +508,17 @@ TEST_F(QueryManagerTest, ARBOcclusionQuery) {
scoped_ptr<QueryManager> manager(
new QueryManager(decoder_.get(), feature_info.get()));
- EXPECT_CALL(*gl_, GenQueriesARB(1, _))
+ EXPECT_CALL(*gl_, GenQueries(1, _))
.WillOnce(SetArgumentPointee<1>(kService1Id))
.RetiresOnSaturation();
QueryManager::Query* query = manager->CreateQuery(
kTarget, kClient1Id, kSharedMemoryId, kSharedMemoryOffset);
ASSERT_TRUE(query != NULL);
- EXPECT_CALL(*gl_, BeginQueryARB(GL_SAMPLES_PASSED_ARB, kService1Id))
+ EXPECT_CALL(*gl_, BeginQuery(GL_SAMPLES_PASSED_ARB, kService1Id))
.Times(1)
.RetiresOnSaturation();
- EXPECT_CALL(*gl_, EndQueryARB(GL_SAMPLES_PASSED_ARB))
+ EXPECT_CALL(*gl_, EndQuery(GL_SAMPLES_PASSED_ARB))
.Times(1)
.RetiresOnSaturation();
EXPECT_TRUE(manager->BeginQuery(query));
« no previous file with comments | « gpu/command_buffer/service/query_manager.cc ('k') | ui/gl/generate_bindings.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698