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

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

Issue 1222563003: Revert of Added support for Time Elapsed queries through the command buffer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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/gles2_implementation_unittest.cc
diff --git a/gpu/command_buffer/client/gles2_implementation_unittest.cc b/gpu/command_buffer/client/gles2_implementation_unittest.cc
index 94715ddfaf9cbe38d3cd71eba1681cf3188cb304..bbd1c53fda20bf1e4875e47028344fbed79c1b07 100644
--- a/gpu/command_buffer/client/gles2_implementation_unittest.cc
+++ b/gpu/command_buffer/client/gles2_implementation_unittest.cc
@@ -3179,26 +3179,6 @@
ClearCommands();
gl_->GetQueryObjectuivEXT(id1, GL_QUERY_RESULT_AVAILABLE_EXT, &available);
EXPECT_EQ(0u, available);
-
- // Test GetQueryObjectui64vEXT fails if unused id
- GLuint64 available2 = 0xBDu;
- ClearCommands();
- gl_->GetQueryObjectui64vEXT(id2, GL_QUERY_RESULT_AVAILABLE_EXT, &available2);
- EXPECT_TRUE(NoCommandsWritten());
- EXPECT_EQ(0xBDu, available2);
- EXPECT_EQ(GL_INVALID_OPERATION, CheckError());
-
- // Test GetQueryObjectui64vEXT fails if bad id
- ClearCommands();
- gl_->GetQueryObjectui64vEXT(4567, GL_QUERY_RESULT_AVAILABLE_EXT, &available2);
- EXPECT_TRUE(NoCommandsWritten());
- EXPECT_EQ(0xBDu, available2);
- EXPECT_EQ(GL_INVALID_OPERATION, CheckError());
-
- // Test GetQueryObjectui64vEXT CheckResultsAvailable
- ClearCommands();
- gl_->GetQueryObjectui64vEXT(id1, GL_QUERY_RESULT_AVAILABLE_EXT, &available2);
- EXPECT_EQ(0u, available2);
}
TEST_F(GLES2ImplementationTest, ErrorQuery) {
« no previous file with comments | « gpu/command_buffer/client/gles2_implementation_autogen.h ('k') | gpu/command_buffer/client/gles2_interface_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698