diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-28 12:47:58 -0400 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-28 12:47:58 -0400 |
commit | dbddd3c904d34eecdda4bb7d1d0dc30c4ea7e13b (patch) | |
tree | c3f40984bd0ec4cf136ad90de871b5e87a55062b /src | |
parent | 602b9da9928e10b55489d2a5c9599107b32dc90a (diff) | |
download | qtlocation-mapboxgl-dbddd3c904d34eecdda4bb7d1d0dc30c4ea7e13b.tar.gz |
gyp fixes
Diffstat (limited to 'src')
-rw-r--r-- | src/renderer/painter.cpp | 4 | ||||
-rw-r--r-- | src/shader/shader.cpp | 4 | ||||
-rw-r--r-- | src/util/stopwatch.cpp (renamed from src/util/timer.cpp) | 16 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/renderer/painter.cpp b/src/renderer/painter.cpp index 38c2176aed..228783b3c3 100644 --- a/src/renderer/painter.cpp +++ b/src/renderer/painter.cpp @@ -11,7 +11,7 @@ #include <mbgl/geometry/sprite_atlas.hpp> #if defined(DEBUG) -#include <mbgl/util/timer.hpp> +#include <mbgl/util/stopwatch.hpp> #endif #include <cassert> @@ -35,7 +35,7 @@ bool Painter::needsAnimation() const { void Painter::setup() { #if defined(DEBUG) - util::timer timer("painter setup"); + util::stopwatch stopwatch("painter setup"); #endif setupShaders(); diff --git a/src/shader/shader.cpp b/src/shader/shader.cpp index d9f63cae12..84cb55eac4 100644 --- a/src/shader/shader.cpp +++ b/src/shader/shader.cpp @@ -1,6 +1,6 @@ #include <mbgl/shader/shader.hpp> #include <mbgl/platform/gl.hpp> -#include <mbgl/util/timer.hpp> +#include <mbgl/util/stopwatch.hpp> #include <mbgl/platform/log.hpp> #include <cstring> @@ -12,7 +12,7 @@ Shader::Shader(const char *name_, const GLchar *vertSource, const GLchar *fragSo : name(name_), valid(false), program(0) { - util::timer timer("shader compilation", Event::Shader); + util::stopwatch stopwatch("shader compilation", Event::Shader); GLuint vertShader; if (!compileShader(&vertShader, GL_VERTEX_SHADER, vertSource)) { diff --git a/src/util/timer.cpp b/src/util/stopwatch.cpp index 5c4af51da4..c9b8756e3b 100644 --- a/src/util/timer.cpp +++ b/src/util/stopwatch.cpp @@ -1,5 +1,5 @@ -#ifndef DISABLE_TIMER -#include <mbgl/util/timer.hpp> +#ifndef DISABLE_STOPWATCH +#include <mbgl/util/stopwatch.hpp> #include <mbgl/util/time.hpp> #include <mbgl/platform/log.hpp> @@ -8,26 +8,26 @@ using namespace mbgl::util; -timer::timer(Event event_) +stopwatch::stopwatch(Event event_) : event(event_), start(now()) {} -timer::timer(EventSeverity severity_, Event event_) +stopwatch::stopwatch(EventSeverity severity_, Event event_) : severity(severity_), event(event_), start(now()) {} -timer::timer(const std::string &name_, Event event_) +stopwatch::stopwatch(const std::string &name_, Event event_) : name(name_), event(event_), start(now()) {} -timer::timer(const std::string &name_, EventSeverity severity_, Event event_) +stopwatch::stopwatch(const std::string &name_, EventSeverity severity_, Event event_) : name(name_), severity(severity_), event(event_), start(now()) {} -void timer::report(const std::string &name_) { +void stopwatch::report(const std::string &name_) { timestamp duration = now() - start; Log::Record(severity, event, name_ + ": " + std::to_string((double)(duration) / 1_millisecond) + "ms"); start += duration; } -timer::~timer() { +stopwatch::~stopwatch() { if (name.size()) { report(name); } |