Move BenchTimer to tools as Timer

tools/timer/GpuTimer.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "BenchGpuTimer_gl.h"
+#include "GpuTimer.h"
 #include "gl/SkGLContextHelper.h"
 #include "gl/GrGLUtil.h"
 
-BenchGpuTimer::BenchGpuTimer(const SkGLContextHelper* glctx) {
-    fContext = glctx;
-    glctx->ref();
-    glctx->makeCurrent();
-    fStarted = false;
-    fSupported = GrGLGetVersion(glctx->gl()) > GR_GL_VER(3,3) ||
-                 glctx->hasExtension("GL_ARB_timer_query") ||
-                 glctx->hasExtension("GL_EXT_timer_query");
+GpuTimer::GpuTimer(const SkGLContextHelper* glctx) : fContext(glctx) {
+    if (fContext) {

[tfarina, 2014/06/20 18:05:58]

if glctx is NULL, aren't we going to leaving fStarted, fSupported and fQuery
uninitialized? Could we initialize them regardless in the initializer list with
some default value?

[tfarina, 2014/06/20 18:06:40]

s/leaving/leave

[mtklein, 2014/06/20 18:08:18]

Yes.  If fContext is NULL, we'll never touch any of the other members.  We could
initialize them, but that seems misleading.  They're not meaningful without
fContext.  I'd rather tools yell at us for using uninitialized memory than
silently get some default if we screw up here.

+        fContext->ref();
+        fContext->makeCurrent();
+        fStarted = false;
+        fSupported = GrGLGetVersion(fContext->gl()) > GR_GL_VER(3,3) ||
+                     fContext->hasExtension("GL_ARB_timer_query") ||
+                     fContext->hasExtension("GL_EXT_timer_query");
 
-    if (fSupported) {
-        SK_GL(*glctx, GenQueries(1, &fQuery));
+        if (fSupported) {
+            SK_GL(*fContext, GenQueries(1, &fQuery));
+        }
     }
 }
 
-BenchGpuTimer::~BenchGpuTimer() {
-    if (fSupported) {
-        fContext->makeCurrent();
-        SK_GL(*fContext, DeleteQueries(1, &fQuery));
+GpuTimer::~GpuTimer() {
+    if (fContext) {
+        if (fSupported) {
+            fContext->makeCurrent();
+            SK_GL(*fContext, DeleteQueries(1, &fQuery));
+        }
+        fContext->unref();
     }
-    fContext->unref();
 }
 
-void BenchGpuTimer::startGpu() {
-    if (fSupported) {
+void GpuTimer::start() {
+    if (fContext && fSupported) {
         fContext->makeCurrent();
         fStarted = true;
         SK_GL(*fContext, BeginQuery(GR_GL_TIME_ELAPSED, fQuery));
     }
 }
 
 /**
  * It is important to stop the cpu clocks first,
  * as this will cpu wait for the gpu to finish.
  */
-double BenchGpuTimer::endGpu() {
-    if (fSupported) {
+double GpuTimer::end() {
+    if (fContext && fSupported) {
         fStarted = false;
         fContext->makeCurrent();
         SK_GL(*fContext, EndQuery(GR_GL_TIME_ELAPSED));
 
         GrGLint available = 0;
         while (!available) {
             SK_GL_NOERRCHECK(*fContext, GetQueryObjectiv(fQuery,
-                                             GR_GL_QUERY_RESULT_AVAILABLE,
-                                             &available));
+                                                         GR_GL_QUERY_RESULT_AVAILABLE,
+                                                         &available));
             // If GetQueryObjectiv is erroring out we need some alternative
             // means of breaking out of this loop
             GrGLenum error;
             SK_GL_RET_NOERRCHECK(*fContext, error, GetError());
             if (GR_GL_NO_ERROR != error) {
                 break;
             }
         }
         GrGLuint64 totalGPUTimeElapsed = 0;
         SK_GL(*fContext, GetQueryObjectui64v(fQuery,
                                              GR_GL_QUERY_RESULT,
                                              &totalGPUTimeElapsed));
 
         return totalGPUTimeElapsed / 1000000.0;
     } else {
         return 0;
     }
 }