]> git.sesse.net Git - nageru/commitdiff
Small cleanup.
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Mon, 23 Jul 2018 08:56:30 +0000 (10:56 +0200)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Mon, 23 Jul 2018 08:57:11 +0000 (10:57 +0200)
flow.cpp

index e7f6820a778b6b7a3139789ea6d388c97f7e3bc8..81d835b73a3e0b0eef8eab547c3e89e5b816d88b 100644 (file)
--- a/flow.cpp
+++ b/flow.cpp
@@ -829,35 +829,6 @@ void AddBaseFlow::exec(GLuint base_flow_tex, GLuint diff_flow_tex, int level_wid
        glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 }
 
-class GPUTimers {
-public:
-       void print();
-       pair<GLuint, GLuint> begin_timer(const string &name, int level);
-
-private:
-       struct Timer {
-               string name;
-               int level;
-               pair<GLuint, GLuint> query;
-       };
-       vector<Timer> timers;
-};
-
-pair<GLuint, GLuint> GPUTimers::begin_timer(const string &name, int level)
-{
-       GLuint queries[2];
-       glGenQueries(2, queries);
-       glQueryCounter(queries[0], GL_TIMESTAMP);
-
-       Timer timer;
-       timer.name = name;
-       timer.level = level;
-       timer.query.first = queries[0];
-       timer.query.second = queries[1];
-       timers.push_back(timer);
-       return timer.query;
-}
-
 // Take a copy of the flow, bilinearly interpolated and scaled up.
 class ResizeFlow {
 public:
@@ -913,6 +884,35 @@ void ResizeFlow::exec(GLuint flow_tex, GLuint out_tex, int input_width, int inpu
        glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 }
 
+class GPUTimers {
+public:
+       void print();
+       pair<GLuint, GLuint> begin_timer(const string &name, int level);
+
+private:
+       struct Timer {
+               string name;
+               int level;
+               pair<GLuint, GLuint> query;
+       };
+       vector<Timer> timers;
+};
+
+pair<GLuint, GLuint> GPUTimers::begin_timer(const string &name, int level)
+{
+       GLuint queries[2];
+       glGenQueries(2, queries);
+       glQueryCounter(queries[0], GL_TIMESTAMP);
+
+       Timer timer;
+       timer.name = name;
+       timer.level = level;
+       timer.query.first = queries[0];
+       timer.query.second = queries[1];
+       timers.push_back(timer);
+       return timer.query;
+}
+
 void GPUTimers::print()
 {
        for (const Timer &timer : timers) {