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

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

Issue 866593002: Fix glGetQueryObjectiv call on devices which expect EXT variants. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit test Created 5 years, 11 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/gpu_tracer_unittest.cc
diff --git a/gpu/command_buffer/service/gpu_tracer_unittest.cc b/gpu/command_buffer/service/gpu_tracer_unittest.cc
index 1b55e785e4517576c002fbd6fc90183d4582c150..142914e4b36f56bfc1d89d0ccc6f369a09f0e2da 100644
--- a/gpu/command_buffer/service/gpu_tracer_unittest.cc
+++ b/gpu/command_buffer/service/gpu_tracer_unittest.cc
@@ -88,7 +88,7 @@ class GlFakeQueries {
}
}
- void GetQueryObjectiv(GLuint id, GLenum pname, GLint* params) {
+ void GetQueryObjectivARB(GLuint id, GLenum pname, GLint* params) {
switch (pname) {
case GL_QUERY_RESULT_AVAILABLE: {
std::map<GLuint, GLint64>::iterator it = query_timestamp_.find(id);
@@ -99,7 +99,7 @@ class GlFakeQueries {
break;
}
default:
- FAIL() << "Invalid variable passed to GetQueryObjectiv: " << pname;
+ FAIL() << "Invalid variable passed to GetQueryObjectivARB: " << pname;
}
}
@@ -255,10 +255,10 @@ class BaseGpuTest : public GpuServiceTest {
.WillRepeatedly(
Invoke(&gl_fake_queries_, &GlFakeQueries::GenQueriesARB));
- EXPECT_CALL(*gl_, GetQueryObjectiv(_, GL_QUERY_RESULT_AVAILABLE,
+ EXPECT_CALL(*gl_, GetQueryObjectivARB(_, GL_QUERY_RESULT_AVAILABLE,
NotNull()))
.WillRepeatedly(
- Invoke(&gl_fake_queries_, &GlFakeQueries::GetQueryObjectiv));
+ Invoke(&gl_fake_queries_, &GlFakeQueries::GetQueryObjectivARB));
if (GetTracerType() == kTracerTypeDisjointTimer) {
EXPECT_CALL(*gl_, GetInteger64v(GL_TIMESTAMP, _))
« gpu/command_buffer/service/gpu_tracer.cc ('K') | « gpu/command_buffer/service/gpu_tracer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698