Print out the first flow pair, too.

[nageru] / flow.cpp

diff --git a/flow.cpp b/flow.cpp
index 4782de712aeece38e971f1e87ae3b093387a092b..001b14af8cd173068c36f4198211f4fc3dc648a5 100644 (file)
--- a/flow.cpp
+++ b/flow.cpp
@@ -37,6 +37,8 @@ constexpr unsigned patch_size_pixels = 12;
 // since we have different normalizations and ranges in some cases.
 float vr_gamma = 10.0f, vr_delta = 5.0f, vr_alpha = 10.0f;
 
+bool enable_timing = true;
+
 // Some global OpenGL objects.
 // TODO: These should really be part of DISComputeFlow.
 GLuint nearest_sampler, linear_sampler, smoothness_sampler;
@@ -923,6 +925,10 @@ private:
 
 pair<GLuint, GLuint> GPUTimers::begin_timer(const string &name, int level)
 {
+       if (!enable_timing) {
+               return make_pair(0, 0);
+       }
+
        GLuint queries[2];
        glGenQueries(2, queries);
        glQueryCounter(queries[0], GL_TIMESTAMP);
@@ -974,7 +980,7 @@ public:
 
        void end()
        {
-               if (!ended) {
+               if (enable_timing && !ended) {
                        glQueryCounter(query.second, GL_TIMESTAMP);
                        ended = true;
                }
@@ -1311,7 +1317,8 @@ int main(int argc, char **argv)
         static const option long_options[] = {
                 { "alpha", required_argument, 0, 'a' },
                 { "delta", required_argument, 0, 'd' },
-                { "gamma", required_argument, 0, 'g' }
+                { "gamma", required_argument, 0, 'g' },
+               { "disable-timing", no_argument, 0, 1000 }
        };
 
        for ( ;; ) {
@@ -1331,6 +1338,9 @@ int main(int argc, char **argv)
                case 'g':
                        vr_gamma = atof(optarg);
                        break;
+               case 1000:
+                       enable_timing = false;
+                       break;
                default:
                        fprintf(stderr, "Unknown option '%s'\n", argv[option_index]);
                        exit(1);
@@ -1358,10 +1368,15 @@ int main(int argc, char **argv)
        SDL_GLContext context = SDL_GL_CreateContext(window);
        assert(context != nullptr);
 
+       const char *filename0 = argc >= (optind + 1) ? argv[optind] : "test1499.png";
+       const char *filename1 = argc >= (optind + 2) ? argv[optind + 1] : "test1500.png";
+       const char *flow_filename = argc >= (optind + 3) ? argv[optind + 2] : "flow.flo";
+       fprintf(stderr, "%s %s -> %s\n", filename0, filename1, flow_filename);
+
        // Load pictures.
        unsigned width1, height1, width2, height2;
-       GLuint tex0 = load_texture(argc >= (optind + 1) ? argv[optind] : "test1499.png", &width1, &height1);
-       GLuint tex1 = load_texture(argc >= (optind + 2) ? argv[optind + 1] : "test1500.png", &width2, &height2);
+       GLuint tex0 = load_texture(filename0, &width1, &height1);
+       GLuint tex1 = load_texture(filename1, &width2, &height2);
 
        if (width1 != width2 || height1 != height2) {
                fprintf(stderr, "Image dimensions don't match (%dx%d versus %dx%d)\n",
@@ -1389,7 +1404,7 @@ int main(int argc, char **argv)
 
        compute_flow.release_texture(final_tex);
 
-       write_flow(argc >= (optind + 3) ? argv[optind + 2] : "flow.flo", dense_flow.get(), width1, height1);
+       write_flow(flow_filename, dense_flow.get(), width1, height1);
        write_ppm("flow.ppm", dense_flow.get(), width1, height1);
 
        dense_flow.reset();