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

Unified Diff: gpu/command_buffer/client/query_tracker_unittest.cc

Issue 896723008: Add OrderingBarrierCHROMIUM API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed nits. Created 5 years, 10 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/client/query_tracker_unittest.cc
diff --git a/gpu/command_buffer/client/query_tracker_unittest.cc b/gpu/command_buffer/client/query_tracker_unittest.cc
index 53f51954059616792009ceadf2c4be180c0136f2..f6f48ecef2a70e93105827d063e77988d81fd29a 100644
--- a/gpu/command_buffer/client/query_tracker_unittest.cc
+++ b/gpu/command_buffer/client/query_tracker_unittest.cc
@@ -161,24 +161,23 @@ TEST_F(QueryTrackerTest, Query) {
EXPECT_EQ(kToken, query->token());
EXPECT_EQ(1, query->submit_count());
- // Check CheckResultsAvailable.
- EXPECT_FALSE(query->CheckResultsAvailable(helper_.get()));
- EXPECT_FALSE(query->NeverUsed());
- EXPECT_TRUE(query->Pending());
-
// Flush only once if no more flushes happened between a call to
// EndQuery command and CheckResultsAvailable
// Advance put_ so flush calls in CheckResultsAvailable go through
// and updates flush_generation count
helper_->Noop(1);
- // Set Query in pending state_ to simulate EndQuery command is called
- query->MarkAsPending(kToken);
- EXPECT_TRUE(query->Pending());
+
// Store FlushGeneration count after EndQuery is called
uint32 gen1 = GetFlushGeneration();
+
+ // Check CheckResultsAvailable.
EXPECT_FALSE(query->CheckResultsAvailable(helper_.get()));
+ EXPECT_FALSE(query->NeverUsed());
+ EXPECT_TRUE(query->Pending());
+
uint32 gen2 = GetFlushGeneration();
EXPECT_NE(gen1, gen2);
+
// Repeated calls to CheckResultsAvailable should not flush unnecessarily
EXPECT_FALSE(query->CheckResultsAvailable(helper_.get()));
gen1 = GetFlushGeneration();

Powered by Google App Engine
This is Rietveld 408576698