Fix some uniforms not getting through to the motion search vertex shader.

[nageru] / flow.cpp

diff --git a/flow.cpp b/flow.cpp
index 001b14af8cd173068c36f4198211f4fc3dc648a5..df6ac6df625d96586049234fc9c0e9094eca9017 100644 (file)
--- a/flow.cpp
+++ b/flow.cpp
@@ -38,6 +38,7 @@ constexpr unsigned patch_size_pixels = 12;
 float vr_gamma = 10.0f, vr_delta = 5.0f, vr_alpha = 10.0f;
 
 bool enable_timing = true;
+bool enable_variational_refinement = true;  // Just for debugging.
 
 // Some global OpenGL objects.
 // TODO: These should really be part of DISComputeFlow.
@@ -352,7 +353,7 @@ private:
        GLuint motion_search_program;
        GLuint motion_search_vao;
 
-       GLuint uniform_image_size, uniform_inv_image_size, uniform_inv_prev_level_size;
+       GLuint uniform_image_size, uniform_inv_image_size, uniform_inv_flow_size, uniform_inv_prev_level_size;
        GLuint uniform_image0_tex, uniform_image1_tex, uniform_grad0_tex, uniform_flow_tex;
 };
 
@@ -373,6 +374,7 @@ MotionSearch::MotionSearch()
 
        uniform_image_size = glGetUniformLocation(motion_search_program, "image_size");
        uniform_inv_image_size = glGetUniformLocation(motion_search_program, "inv_image_size");
+       uniform_inv_flow_size = glGetUniformLocation(motion_search_program, "inv_flow_size");
        uniform_inv_prev_level_size = glGetUniformLocation(motion_search_program, "inv_prev_level_size");
        uniform_image0_tex = glGetUniformLocation(motion_search_program, "image0_tex");
        uniform_image1_tex = glGetUniformLocation(motion_search_program, "image1_tex");
@@ -391,6 +393,7 @@ void MotionSearch::exec(GLuint tex0_view, GLuint tex1_view, GLuint grad0_tex, GL
 
        glProgramUniform2f(motion_search_program, uniform_image_size, level_width, level_height);
        glProgramUniform2f(motion_search_program, uniform_inv_image_size, 1.0f / level_width, 1.0f / level_height);
+       glProgramUniform2f(motion_search_program, uniform_inv_flow_size, 1.0f / width_patches, 1.0f / height_patches);
        glProgramUniform2f(motion_search_program, uniform_inv_prev_level_size, 1.0f / prev_level_width, 1.0f / prev_level_height);
 
        glViewport(0, 0, width_patches, height_patches);
@@ -1207,8 +1210,10 @@ GLuint DISComputeFlow::exec(GLuint tex0, GLuint tex1)
                // Add the differential flow found by the variational refinement to the base flow,
                // giving the final flow estimate for this level.
                // The output is in diff_flow_tex; we don't need to make a new texture.
-               // You can comment out this part if you wish to test disabling of the variational refinement.
-               {
+               //
+               // Disabling this doesn't save any time (although we could easily make it so that
+               // it is more efficient), but it helps debug the motion search.
+               if (enable_variational_refinement) {
                        ScopedTimer timer("Add differential flow", &varref_timer);
                        add_base_flow.exec(base_flow_tex, du_dv_tex, level_width, level_height);
                }
@@ -1269,6 +1274,14 @@ void DISComputeFlow::release_texture(GLuint tex_num)
        assert(false);
 }
 
+// OpenGL uses a bottom-left coordinate system, .flo files use a top-left coordinate system.
+void flip_coordinate_system(float *dense_flow, unsigned width, unsigned height)
+{
+       for (unsigned i = 0; i < width * height; ++i) {
+               dense_flow[i * 2 + 1] = -dense_flow[i * 2 + 1];
+       }
+}
+
 void write_flow(const char *filename, const float *dense_flow, unsigned width, unsigned height)
 {
        FILE *flowfp = fopen(filename, "wb");
@@ -1277,15 +1290,7 @@ void write_flow(const char *filename, const float *dense_flow, unsigned width, u
        fwrite(&height, 4, 1, flowfp);
        for (unsigned y = 0; y < height; ++y) {
                int yy = height - y - 1;
-               for (unsigned x = 0; x < unsigned(width); ++x) {
-                       float du = dense_flow[(yy * width + x) * 2 + 0];
-                       float dv = dense_flow[(yy * width + x) * 2 + 1];
-
-                       dv = -dv;
-
-                       fwrite(&du, 4, 1, flowfp);
-                       fwrite(&dv, 4, 1, flowfp);
-               }
+               fwrite(&dense_flow[yy * width * 2], width * 2 * sizeof(float), 1, flowfp);
        }
        fclose(flowfp);
 }
@@ -1300,8 +1305,6 @@ void write_ppm(const char *filename, const float *dense_flow, unsigned width, un
                        float du = dense_flow[(yy * width + x) * 2 + 0];
                        float dv = dense_flow[(yy * width + x) * 2 + 1];
 
-                       dv = -dv;
-
                        uint8_t r, g, b;
                        flow2rgb(du, dv, &r, &g, &b);
                        putc(r, fp);
@@ -1318,7 +1321,8 @@ int main(int argc, char **argv)
                 { "alpha", required_argument, 0, 'a' },
                 { "delta", required_argument, 0, 'd' },
                 { "gamma", required_argument, 0, 'g' },
-               { "disable-timing", no_argument, 0, 1000 }
+               { "disable-timing", no_argument, 0, 1000 },
+               { "ignore-variational-refinement", no_argument, 0, 1001 }  // Still calculates it, just doesn't apply it.
        };
 
        for ( ;; ) {
@@ -1341,6 +1345,9 @@ int main(int argc, char **argv)
                case 1000:
                        enable_timing = false;
                        break;
+               case 1001:
+                       enable_variational_refinement = false;
+                       break;
                default:
                        fprintf(stderr, "Unknown option '%s'\n", argv[option_index]);
                        exit(1);
@@ -1404,6 +1411,7 @@ int main(int argc, char **argv)
 
        compute_flow.release_texture(final_tex);
 
+       flip_coordinate_system(dense_flow.get(), width1, height1);
        write_flow(flow_filename, dense_flow.get(), width1, height1);
        write_ppm("flow.ppm", dense_flow.get(), width1, height1);
 
@@ -1440,6 +1448,7 @@ int main(int argc, char **argv)
 
                compute_flow.release_texture(final_tex);
 
+               flip_coordinate_system(dense_flow.get(), width, height);
                write_flow(flow_filename, dense_flow.get(), width, height);
        }