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

Unified Diff: gpu/perftests/texture_upload_perftest.cc

Issue 940633004: Added disjoint context class which manages disjoints within gpu timing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Simplified DisjointContext to simply be an ID instead of an object 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/perftests/texture_upload_perftest.cc
diff --git a/gpu/perftests/texture_upload_perftest.cc b/gpu/perftests/texture_upload_perftest.cc
index 18bc5ff5fd6894a118e14d0a33cfeb9167408355..b788b6a5a2cc921c44f7bf7ebd971ddbb7c71829 100644
--- a/gpu/perftests/texture_upload_perftest.cc
+++ b/gpu/perftests/texture_upload_perftest.cc
@@ -122,10 +122,10 @@ class TextureUploadPerfTest : public testing::Test {
glViewport(0, 0, size_.width(), size_.height());
- if (gpu_timing_.Initialize(gl_context_.get())) {
+ gpu_timing_.Initialize(gl_context_.get());
+ if (gpu_timing_.GetTimerType() != GPUTiming::kTimerTypeInvalid) {
LOG(INFO) << "Gpu timing initialized with timer type: "
<< gpu_timing_.GetTimerTypeName();
- gpu_timing_.CheckAndResetTimerErrors();
gpu_timing_.InvalidateTimerOffset();
} else {
LOG(WARNING) << "Can't initialize gpu timing";
« gpu/command_buffer/service/gpu_timing.cc ('K') | « gpu/command_buffer/service/gpu_tracer_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698