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/gpu_tracer_unittest.cc

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: 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
« no previous file with comments | « gpu/command_buffer/service/gpu_tracer.cc ('k') | gpu/command_buffer/service/mailbox_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 37370187c0333e2bae426cf43824a09f777e040b..1b10fc67c32dcba47f681511e2ae35ca38443169 100644
--- a/gpu/command_buffer/service/gpu_tracer_unittest.cc
+++ b/gpu/command_buffer/service/gpu_tracer_unittest.cc
@@ -225,7 +225,17 @@ class BaseGpuTest : public GpuServiceTest {
protected:
void SetUp() override {
- GpuServiceTest::SetUp();
+ const char* gl_version = "3.2";
+ const char* extensions = nullptr;
+ if (GetTracerType() == kTracerTypeDisjointTimer) {
+ gl_version = "opengl es 3.0";
+ extensions = "GL_EXT_disjoint_timer_query";
+ } else if (GetTracerType() == kTracerTypeARBTimer) {
+ // TODO(sievers): The tracer should not depend on ARB_occlusion_query.
+ // Try merge Query APIs (core, ARB, EXT) into a single binding each.
+ extensions = "GL_ARB_timer_query GL_ARB_occlusion_query";
+ }
+ GpuServiceTest::SetUpWithGLVersion(gl_version, extensions);
gl_fake_queries_.Reset();
gl_surface_ = new gfx::GLSurfaceStub();
gl_context_ = new gfx::GLContextStub();
« no previous file with comments | « gpu/command_buffer/service/gpu_tracer.cc ('k') | gpu/command_buffer/service/mailbox_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698