]> git.sesse.net Git - nageru/blobdiff - flow.cpp
Stop leaking texture views (and by extension, textures).
[nageru] / flow.cpp
index 4f869cba8de3562717fde4487fee93d70e89d0b9..4d520eb8fc5dca1acd9a515682e5563065d1fc8e 100644 (file)
--- a/flow.cpp
+++ b/flow.cpp
 #include <SDL2/SDL_video.h>
 
 #include <assert.h>
+#include <getopt.h>
 #include <stdio.h>
 #include <unistd.h>
 
 #include "util.h"
 
 #include <algorithm>
+#include <deque>
 #include <memory>
+#include <map>
+#include <stack>
 #include <vector>
 
 #define BUFFER_OFFSET(i) ((char *)nullptr + (i))
@@ -30,10 +34,32 @@ constexpr unsigned coarsest_level = 5;
 constexpr unsigned finest_level = 1;
 constexpr unsigned patch_size_pixels = 12;
 
+// Weighting constants for the different parts of the variational refinement.
+// These don't correspond 1:1 to the values given in the DIS paper,
+// since we have different normalizations and ranges in some cases.
+// These are found through a simple grid search on some MPI-Sintel data,
+// although the error (EPE) seems to be fairly insensitive to the precise values.
+// Only the relative values matter, so we fix alpha (the smoothness constant)
+// at unity and tweak the others.
+float vr_alpha = 1.0f, vr_delta = 0.25f, vr_gamma = 0.25f;
+
+bool enable_timing = true;
+bool enable_variational_refinement = true;  // Just for debugging.
+
 // Some global OpenGL objects.
-GLuint nearest_sampler, linear_sampler, smoothness_sampler;
+// TODO: These should really be part of DISComputeFlow.
+GLuint nearest_sampler, linear_sampler, zero_border_sampler;
 GLuint vertex_vbo;
 
+// Structures for asynchronous readback. We assume everything is the same size (and GL_RG16F).
+struct ReadInProgress {
+       GLuint pbo;
+       string filename0, filename1;
+       string flow_filename, ppm_filename;  // Either may be empty for no write.
+};
+stack<GLuint> spare_pbos;
+deque<ReadInProgress> reads_in_progress;
+
 string read_file(const string &filename)
 {
        FILE *fp = fopen(filename.c_str(), "r");
@@ -221,6 +247,58 @@ void bind_sampler(GLuint program, GLint location, GLuint texture_unit, GLuint te
        glProgramUniform1i(program, location, texture_unit);
 }
 
+// A class that caches FBOs that render to a given set of textures.
+// It never frees anything, so it is only suitable for rendering to
+// the same (small) set of textures over and over again.
+template<size_t num_elements>
+class PersistentFBOSet {
+public:
+       void render_to(const array<GLuint, num_elements> &textures);
+
+       // Convenience wrappers.
+       void render_to(GLuint texture0, enable_if<num_elements == 1> * = nullptr) {
+               render_to({{texture0}});
+       }
+
+       void render_to(GLuint texture0, GLuint texture1, enable_if<num_elements == 2> * = nullptr) {
+               render_to({{texture0, texture1}});
+       }
+
+       void render_to(GLuint texture0, GLuint texture1, GLuint texture2, enable_if<num_elements == 3> * = nullptr) {
+               render_to({{texture0, texture1, texture2}});
+       }
+
+       void render_to(GLuint texture0, GLuint texture1, GLuint texture2, GLuint texture3, enable_if<num_elements == 4> * = nullptr) {
+               render_to({{texture0, texture1, texture2, texture3}});
+       }
+
+private:
+       // TODO: Delete these on destruction.
+       map<array<GLuint, num_elements>, GLuint> fbos;
+};
+
+template<size_t num_elements>
+void PersistentFBOSet<num_elements>::render_to(const array<GLuint, num_elements> &textures)
+{
+       auto it = fbos.find(textures);
+       if (it != fbos.end()) {
+               glBindFramebuffer(GL_FRAMEBUFFER, it->second);
+               return;
+       }
+
+       GLuint fbo;
+       glCreateFramebuffers(1, &fbo);
+       GLenum bufs[num_elements];
+       for (size_t i = 0; i < num_elements; ++i) {
+               glNamedFramebufferTexture(fbo, GL_COLOR_ATTACHMENT0 + i, textures[i], 0);
+               bufs[i] = GL_COLOR_ATTACHMENT0 + i;
+       }
+       glNamedFramebufferDrawBuffers(fbo, num_elements, bufs);
+
+       fbos[textures] = fbo;
+       glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+}
+
 // Compute gradients in every point, used for the motion search.
 // The DIS paper doesn't actually mention how these are computed,
 // but seemingly, a 3x3 Sobel operator is used here (at least in
@@ -235,12 +313,13 @@ public:
        void exec(GLint tex0_view, GLint grad0_tex, int level_width, int level_height);
 
 private:
+       PersistentFBOSet<1> fbos;
        GLuint sobel_vs_obj;
        GLuint sobel_fs_obj;
        GLuint sobel_program;
        GLuint sobel_vao;
 
-       GLuint uniform_tex, uniform_image_size;
+       GLuint uniform_tex;
 };
 
 Sobel::Sobel()
@@ -263,16 +342,10 @@ Sobel::Sobel()
 void Sobel::exec(GLint tex0_view, GLint grad0_tex, int level_width, int level_height)
 {
        glUseProgram(sobel_program);
-       glBindTextureUnit(0, tex0_view);
-       glBindSampler(0, nearest_sampler);
-       glProgramUniform1i(sobel_program, uniform_tex, 0);
-
-       GLuint grad0_fbo;  // TODO: cleanup
-       glCreateFramebuffers(1, &grad0_fbo);
-       glNamedFramebufferTexture(grad0_fbo, GL_COLOR_ATTACHMENT0, grad0_tex, 0);
+       bind_sampler(sobel_program, uniform_tex, 0, tex0_view, nearest_sampler);
 
        glViewport(0, 0, level_width, level_height);
-       glBindFramebuffer(GL_FRAMEBUFFER, grad0_fbo);
+       fbos.render_to(grad0_tex);
        glBindVertexArray(sobel_vao);
        glUseProgram(sobel_program);
        glDisable(GL_BLEND);
@@ -286,12 +359,14 @@ public:
        void exec(GLuint tex0_view, GLuint tex1_view, GLuint grad0_tex, GLuint flow_tex, GLuint flow_out_tex, int level_width, int level_height, int prev_level_width, int prev_level_height, int width_patches, int height_patches);
 
 private:
+       PersistentFBOSet<1> fbos;
+
        GLuint motion_vs_obj;
        GLuint motion_fs_obj;
        GLuint motion_search_program;
        GLuint motion_search_vao;
 
-       GLuint uniform_image_size, uniform_inv_image_size, uniform_inv_prev_level_size;
+       GLuint uniform_inv_image_size, uniform_inv_prev_level_size;
        GLuint uniform_image0_tex, uniform_image1_tex, uniform_grad0_tex, uniform_flow_tex;
 };
 
@@ -310,7 +385,6 @@ MotionSearch::MotionSearch()
        glEnableVertexArrayAttrib(motion_search_vao, position_attrib);
        glVertexAttribPointer(position_attrib, 2, GL_FLOAT, GL_FALSE, 0, BUFFER_OFFSET(0));
 
-       uniform_image_size = glGetUniformLocation(motion_search_program, "image_size");
        uniform_inv_image_size = glGetUniformLocation(motion_search_program, "inv_image_size");
        uniform_inv_prev_level_size = glGetUniformLocation(motion_search_program, "inv_prev_level_size");
        uniform_image0_tex = glGetUniformLocation(motion_search_program, "image0_tex");
@@ -325,19 +399,14 @@ void MotionSearch::exec(GLuint tex0_view, GLuint tex1_view, GLuint grad0_tex, GL
 
        bind_sampler(motion_search_program, uniform_image0_tex, 0, tex0_view, nearest_sampler);
        bind_sampler(motion_search_program, uniform_image1_tex, 1, tex1_view, linear_sampler);
-       bind_sampler(motion_search_program, uniform_grad0_tex, 2, grad0_tex, nearest_sampler);
+       bind_sampler(motion_search_program, uniform_grad0_tex, 2, grad0_tex, zero_border_sampler);
        bind_sampler(motion_search_program, uniform_flow_tex, 3, flow_tex, linear_sampler);
 
-       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_prev_level_size, 1.0f / prev_level_width, 1.0f / prev_level_height);
 
-       GLuint flow_fbo;  // TODO: cleanup
-       glCreateFramebuffers(1, &flow_fbo);
-       glNamedFramebufferTexture(flow_fbo, GL_COLOR_ATTACHMENT0, flow_out_tex, 0);
-
        glViewport(0, 0, width_patches, height_patches);
-       glBindFramebuffer(GL_FRAMEBUFFER, flow_fbo);
+       fbos.render_to(flow_out_tex);
        glBindVertexArray(motion_search_vao);
        glUseProgram(motion_search_program);
        glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
@@ -357,12 +426,14 @@ public:
        void exec(GLuint tex0_view, GLuint tex1_view, GLuint flow_tex, GLuint dense_flow_tex, int level_width, int level_height, int width_patches, int height_patches);
 
 private:
+       PersistentFBOSet<1> fbos;
+
        GLuint densify_vs_obj;
        GLuint densify_fs_obj;
        GLuint densify_program;
        GLuint densify_vao;
 
-       GLuint uniform_width_patches, uniform_patch_size, uniform_patch_spacing;
+       GLuint uniform_patch_size, uniform_patch_spacing;
        GLuint uniform_image0_tex, uniform_image1_tex, uniform_flow_tex;
 };
 
@@ -381,7 +452,6 @@ Densify::Densify()
        glEnableVertexArrayAttrib(densify_vao, position_attrib);
        glVertexAttribPointer(position_attrib, 2, GL_FLOAT, GL_FALSE, 0, BUFFER_OFFSET(0));
 
-       uniform_width_patches = glGetUniformLocation(densify_program, "width_patches");
        uniform_patch_size = glGetUniformLocation(densify_program, "patch_size");
        uniform_patch_spacing = glGetUniformLocation(densify_program, "patch_spacing");
        uniform_image0_tex = glGetUniformLocation(densify_program, "image0_tex");
@@ -397,7 +467,6 @@ void Densify::exec(GLuint tex0_view, GLuint tex1_view, GLuint flow_tex, GLuint d
        bind_sampler(densify_program, uniform_image1_tex, 1, tex1_view, linear_sampler);
        bind_sampler(densify_program, uniform_flow_tex, 2, flow_tex, nearest_sampler);
 
-       glProgramUniform1i(densify_program, uniform_width_patches, width_patches);
        glProgramUniform2f(densify_program, uniform_patch_size,
                float(patch_size_pixels) / level_width,
                float(patch_size_pixels) / level_height);
@@ -410,15 +479,11 @@ void Densify::exec(GLuint tex0_view, GLuint tex1_view, GLuint flow_tex, GLuint d
                patch_spacing_x / level_width,
                patch_spacing_y / level_height);
 
-       GLuint dense_flow_fbo;  // TODO: cleanup
-       glCreateFramebuffers(1, &dense_flow_fbo);
-       glNamedFramebufferTexture(dense_flow_fbo, GL_COLOR_ATTACHMENT0, dense_flow_tex, 0);
-
        glViewport(0, 0, level_width, level_height);
        glEnable(GL_BLEND);
        glBlendFunc(GL_ONE, GL_ONE);
        glBindVertexArray(densify_vao);
-       glBindFramebuffer(GL_FRAMEBUFFER, dense_flow_fbo);
+       fbos.render_to(dense_flow_tex);
        glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, width_patches * height_patches);
 }
 
@@ -436,13 +501,14 @@ public:
        void exec(GLuint tex0_view, GLuint tex1_view, GLuint flow_tex, GLuint normalized_flow_tex, GLuint I_tex, GLuint I_t_tex, int level_width, int level_height);
 
 private:
+       PersistentFBOSet<3> fbos;
+
        GLuint prewarp_vs_obj;
        GLuint prewarp_fs_obj;
        GLuint prewarp_program;
        GLuint prewarp_vao;
 
        GLuint uniform_image0_tex, uniform_image1_tex, uniform_flow_tex;
-       GLuint uniform_image_size;
 };
 
 Prewarp::Prewarp()
@@ -463,8 +529,6 @@ Prewarp::Prewarp()
        uniform_image0_tex = glGetUniformLocation(prewarp_program, "image0_tex");
        uniform_image1_tex = glGetUniformLocation(prewarp_program, "image1_tex");
        uniform_flow_tex = glGetUniformLocation(prewarp_program, "flow_tex");
-
-       uniform_image_size = glGetUniformLocation(prewarp_program, "image_size");
 }
 
 void Prewarp::exec(GLuint tex0_view, GLuint tex1_view, GLuint flow_tex, GLuint I_tex, GLuint I_t_tex, GLuint normalized_flow_tex, int level_width, int level_height)
@@ -475,20 +539,10 @@ void Prewarp::exec(GLuint tex0_view, GLuint tex1_view, GLuint flow_tex, GLuint I
        bind_sampler(prewarp_program, uniform_image1_tex, 1, tex1_view, linear_sampler);
        bind_sampler(prewarp_program, uniform_flow_tex, 2, flow_tex, nearest_sampler);
 
-       glProgramUniform2f(prewarp_program, uniform_image_size, level_width, level_height);
-
-       GLuint prewarp_fbo;  // TODO: cleanup
-       glCreateFramebuffers(1, &prewarp_fbo);
-       GLenum bufs[] = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2 };
-       glNamedFramebufferDrawBuffers(prewarp_fbo, 3, bufs);
-       glNamedFramebufferTexture(prewarp_fbo, GL_COLOR_ATTACHMENT0, I_tex, 0);
-       glNamedFramebufferTexture(prewarp_fbo, GL_COLOR_ATTACHMENT1, I_t_tex, 0);
-       glNamedFramebufferTexture(prewarp_fbo, GL_COLOR_ATTACHMENT2, normalized_flow_tex, 0);
-
        glViewport(0, 0, level_width, level_height);
        glDisable(GL_BLEND);
        glBindVertexArray(prewarp_vao);
-       glBindFramebuffer(GL_FRAMEBUFFER, prewarp_fbo);
+       fbos.render_to(I_tex, I_t_tex, normalized_flow_tex);
        glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 }
 
@@ -506,6 +560,8 @@ public:
        void exec(GLuint input_tex, GLuint I_x_y_tex, GLuint beta_0_tex, int level_width, int level_height);
 
 private:
+       PersistentFBOSet<2> fbos;
+
        GLuint derivatives_vs_obj;
        GLuint derivatives_fs_obj;
        GLuint derivatives_program;
@@ -538,17 +594,10 @@ void Derivatives::exec(GLuint input_tex, GLuint I_x_y_tex, GLuint beta_0_tex, in
 
        bind_sampler(derivatives_program, uniform_tex, 0, input_tex, nearest_sampler);
 
-       GLuint derivatives_fbo;  // TODO: cleanup
-       glCreateFramebuffers(1, &derivatives_fbo);
-       GLenum bufs[] = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1 };
-       glNamedFramebufferDrawBuffers(derivatives_fbo, 2, bufs);
-       glNamedFramebufferTexture(derivatives_fbo, GL_COLOR_ATTACHMENT0, I_x_y_tex, 0);
-       glNamedFramebufferTexture(derivatives_fbo, GL_COLOR_ATTACHMENT1, beta_0_tex, 0);
-
        glViewport(0, 0, level_width, level_height);
        glDisable(GL_BLEND);
        glBindVertexArray(derivatives_vao);
-       glBindFramebuffer(GL_FRAMEBUFFER, derivatives_fbo);
+       fbos.render_to(I_x_y_tex, beta_0_tex);
        glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 }
 
@@ -565,12 +614,15 @@ public:
        void exec(GLuint flow_tex, GLuint diff_flow_tex, GLuint smoothness_x_tex, GLuint smoothness_y_tex, int level_width, int level_height);
 
 private:
+       PersistentFBOSet<2> fbos;
+
        GLuint smoothness_vs_obj;
        GLuint smoothness_fs_obj;
        GLuint smoothness_program;
        GLuint smoothness_vao;
 
        GLuint uniform_flow_tex, uniform_diff_flow_tex;
+       GLuint uniform_alpha;
 };
 
 ComputeSmoothness::ComputeSmoothness()
@@ -590,6 +642,7 @@ ComputeSmoothness::ComputeSmoothness()
 
        uniform_flow_tex = glGetUniformLocation(smoothness_program, "flow_tex");
        uniform_diff_flow_tex = glGetUniformLocation(smoothness_program, "diff_flow_tex");
+       uniform_alpha = glGetUniformLocation(smoothness_program, "alpha");
 }
 
 void ComputeSmoothness::exec(GLuint flow_tex, GLuint diff_flow_tex, GLuint smoothness_x_tex, GLuint smoothness_y_tex, int level_width, int level_height)
@@ -598,19 +651,13 @@ void ComputeSmoothness::exec(GLuint flow_tex, GLuint diff_flow_tex, GLuint smoot
 
        bind_sampler(smoothness_program, uniform_flow_tex, 0, flow_tex, nearest_sampler);
        bind_sampler(smoothness_program, uniform_diff_flow_tex, 1, diff_flow_tex, nearest_sampler);
-
-       GLuint smoothness_fbo;  // TODO: cleanup
-       glCreateFramebuffers(1, &smoothness_fbo);
-       GLenum bufs[] = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1 };
-       glNamedFramebufferDrawBuffers(smoothness_fbo, 2, bufs);
-       glNamedFramebufferTexture(smoothness_fbo, GL_COLOR_ATTACHMENT0, smoothness_x_tex, 0);
-       glNamedFramebufferTexture(smoothness_fbo, GL_COLOR_ATTACHMENT1, smoothness_y_tex, 0);
+       glProgramUniform1f(smoothness_program, uniform_alpha, vr_alpha);
 
        glViewport(0, 0, level_width, level_height);
 
        glDisable(GL_BLEND);
        glBindVertexArray(smoothness_vao);
-       glBindFramebuffer(GL_FRAMEBUFFER, smoothness_fbo);
+       fbos.render_to(smoothness_x_tex, smoothness_y_tex);
        glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 
        // Make sure the smoothness on the right and upper borders is zero.
@@ -637,6 +684,8 @@ public:
        void exec(GLuint I_x_y_tex, GLuint I_t_tex, GLuint diff_flow_tex, GLuint flow_tex, GLuint beta_0_tex, GLuint smoothness_x_tex, GLuint smoothness_y_tex, GLuint equation_tex, int level_width, int level_height);
 
 private:
+       PersistentFBOSet<1> fbos;
+
        GLuint equations_vs_obj;
        GLuint equations_fs_obj;
        GLuint equations_program;
@@ -646,6 +695,7 @@ private:
        GLuint uniform_diff_flow_tex, uniform_base_flow_tex;
        GLuint uniform_beta_0_tex;
        GLuint uniform_smoothness_x_tex, uniform_smoothness_y_tex;
+       GLuint uniform_gamma, uniform_delta;
 };
 
 SetupEquations::SetupEquations()
@@ -670,6 +720,8 @@ SetupEquations::SetupEquations()
        uniform_beta_0_tex = glGetUniformLocation(equations_program, "beta_0_tex");
        uniform_smoothness_x_tex = glGetUniformLocation(equations_program, "smoothness_x_tex");
        uniform_smoothness_y_tex = glGetUniformLocation(equations_program, "smoothness_y_tex");
+       uniform_gamma = glGetUniformLocation(equations_program, "gamma");
+       uniform_delta = glGetUniformLocation(equations_program, "delta");
 }
 
 void SetupEquations::exec(GLuint I_x_y_tex, GLuint I_t_tex, GLuint diff_flow_tex, GLuint base_flow_tex, GLuint beta_0_tex, GLuint smoothness_x_tex, GLuint smoothness_y_tex, GLuint equation_tex, int level_width, int level_height)
@@ -681,25 +733,20 @@ void SetupEquations::exec(GLuint I_x_y_tex, GLuint I_t_tex, GLuint diff_flow_tex
        bind_sampler(equations_program, uniform_diff_flow_tex, 2, diff_flow_tex, nearest_sampler);
        bind_sampler(equations_program, uniform_base_flow_tex, 3, base_flow_tex, nearest_sampler);
        bind_sampler(equations_program, uniform_beta_0_tex, 4, beta_0_tex, nearest_sampler);
-       bind_sampler(equations_program, uniform_smoothness_x_tex, 5, smoothness_x_tex, smoothness_sampler);
-       bind_sampler(equations_program, uniform_smoothness_y_tex, 6, smoothness_y_tex, smoothness_sampler);
-
-       GLuint equations_fbo;  // TODO: cleanup
-       glCreateFramebuffers(1, &equations_fbo);
-       glNamedFramebufferTexture(equations_fbo, GL_COLOR_ATTACHMENT0, equation_tex, 0);
+       bind_sampler(equations_program, uniform_smoothness_x_tex, 5, smoothness_x_tex, zero_border_sampler);
+       bind_sampler(equations_program, uniform_smoothness_y_tex, 6, smoothness_y_tex, zero_border_sampler);
+       glProgramUniform1f(equations_program, uniform_delta, vr_delta);
+       glProgramUniform1f(equations_program, uniform_gamma, vr_gamma);
 
        glViewport(0, 0, level_width, level_height);
        glDisable(GL_BLEND);
        glBindVertexArray(equations_vao);
-       glBindFramebuffer(GL_FRAMEBUFFER, equations_fbo);
+       fbos.render_to(equation_tex);
        glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 }
 
-// Calculate the smoothness constraints between neighboring pixels;
-// s_x(x,y) stores smoothness between pixel (x,y) and (x+1,y),
-// and s_y(x,y) stores between (x,y) and (x,y+1). We'll sample with
-// border color (0,0) later, so that there's zero diffusion out of
-// the border.
+// Actually solve the equation sets made by SetupEquations, by means of
+// successive over-relaxation (SOR).
 //
 // See variational_refinement.txt for more information.
 class SOR {
@@ -708,6 +755,8 @@ public:
        void exec(GLuint diff_flow_tex, GLuint equation_tex, GLuint smoothness_x_tex, GLuint smoothness_y_tex, int level_width, int level_height, int num_iterations);
 
 private:
+       PersistentFBOSet<1> fbos;
+
        GLuint sor_vs_obj;
        GLuint sor_fs_obj;
        GLuint sor_program;
@@ -716,11 +765,12 @@ private:
        GLuint uniform_diff_flow_tex;
        GLuint uniform_equation_tex;
        GLuint uniform_smoothness_x_tex, uniform_smoothness_y_tex;
+       GLuint uniform_phase;
 };
 
 SOR::SOR()
 {
-       sor_vs_obj = compile_shader(read_file("vs.vert"), GL_VERTEX_SHADER);
+       sor_vs_obj = compile_shader(read_file("sor.vert"), GL_VERTEX_SHADER);
        sor_fs_obj = compile_shader(read_file("sor.frag"), GL_FRAGMENT_SHADER);
        sor_program = link_program(sor_vs_obj, sor_fs_obj);
 
@@ -737,6 +787,7 @@ SOR::SOR()
        uniform_equation_tex = glGetUniformLocation(sor_program, "equation_tex");
        uniform_smoothness_x_tex = glGetUniformLocation(sor_program, "smoothness_x_tex");
        uniform_smoothness_y_tex = glGetUniformLocation(sor_program, "smoothness_y_tex");
+       uniform_phase = glGetUniformLocation(sor_program, "phase");
 }
 
 void SOR::exec(GLuint diff_flow_tex, GLuint equation_tex, GLuint smoothness_x_tex, GLuint smoothness_y_tex, int level_width, int level_height, int num_iterations)
@@ -744,20 +795,24 @@ void SOR::exec(GLuint diff_flow_tex, GLuint equation_tex, GLuint smoothness_x_te
        glUseProgram(sor_program);
 
        bind_sampler(sor_program, uniform_diff_flow_tex, 0, diff_flow_tex, nearest_sampler);
-       bind_sampler(sor_program, uniform_smoothness_x_tex, 1, smoothness_x_tex, smoothness_sampler);
-       bind_sampler(sor_program, uniform_smoothness_y_tex, 2, smoothness_y_tex, smoothness_sampler);
+       bind_sampler(sor_program, uniform_smoothness_x_tex, 1, smoothness_x_tex, zero_border_sampler);
+       bind_sampler(sor_program, uniform_smoothness_y_tex, 2, smoothness_y_tex, zero_border_sampler);
        bind_sampler(sor_program, uniform_equation_tex, 3, equation_tex, nearest_sampler);
 
-       GLuint sor_fbo;  // TODO: cleanup
-       glCreateFramebuffers(1, &sor_fbo);
-       glNamedFramebufferTexture(sor_fbo, GL_COLOR_ATTACHMENT0, diff_flow_tex, 0);  // NOTE: Bind to same as we render from!
-
+       // NOTE: We bind to the texture we are rendering from, but we never write any value
+       // that we read in the same shader pass (we call discard for red values when we compute
+       // black, and vice versa), and we have barriers between the passes, so we're fine
+       // as per the spec.
        glViewport(0, 0, level_width, level_height);
        glDisable(GL_BLEND);
        glBindVertexArray(sor_vao);
-       glBindFramebuffer(GL_FRAMEBUFFER, sor_fbo);
+       fbos.render_to(diff_flow_tex);
 
        for (int i = 0; i < num_iterations; ++i) {
+               glProgramUniform1i(sor_program, uniform_phase, 0);
+               glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+               glTextureBarrier();
+               glProgramUniform1i(sor_program, uniform_phase, 1);
                glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
                if (i != num_iterations - 1) {
                        glTextureBarrier();
@@ -773,6 +828,8 @@ public:
        void exec(GLuint base_flow_tex, GLuint diff_flow_tex, int level_width, int level_height);
 
 private:
+       PersistentFBOSet<1> fbos;
+
        GLuint add_flow_vs_obj;
        GLuint add_flow_fs_obj;
        GLuint add_flow_program;
@@ -805,48 +862,15 @@ void AddBaseFlow::exec(GLuint base_flow_tex, GLuint diff_flow_tex, int level_wid
 
        bind_sampler(add_flow_program, uniform_diff_flow_tex, 0, diff_flow_tex, nearest_sampler);
 
-       GLuint add_flow_fbo;  // TODO: cleanup
-       glCreateFramebuffers(1, &add_flow_fbo);
-       glNamedFramebufferTexture(add_flow_fbo, GL_COLOR_ATTACHMENT0, base_flow_tex, 0);
-
        glViewport(0, 0, level_width, level_height);
        glEnable(GL_BLEND);
        glBlendFunc(GL_ONE, GL_ONE);
        glBindVertexArray(add_flow_vao);
-       glBindFramebuffer(GL_FRAMEBUFFER, add_flow_fbo);
+       fbos.render_to(base_flow_tex);
 
        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:
@@ -854,6 +878,8 @@ public:
        void exec(GLuint in_tex, GLuint out_tex, int input_width, int input_height, int output_width, int output_height);
 
 private:
+       PersistentFBOSet<1> fbos;
+
        GLuint resize_flow_vs_obj;
        GLuint resize_flow_fs_obj;
        GLuint resize_flow_program;
@@ -890,18 +916,47 @@ void ResizeFlow::exec(GLuint flow_tex, GLuint out_tex, int input_width, int inpu
 
        glProgramUniform2f(resize_flow_program, uniform_scale_factor, float(output_width) / input_width, float(output_height) / input_height);
 
-       GLuint resize_flow_fbo;  // TODO: cleanup
-       glCreateFramebuffers(1, &resize_flow_fbo);
-       glNamedFramebufferTexture(resize_flow_fbo, GL_COLOR_ATTACHMENT0, out_tex, 0);
-
        glViewport(0, 0, output_width, output_height);
        glDisable(GL_BLEND);
        glBindVertexArray(resize_flow_vao);
-       glBindFramebuffer(GL_FRAMEBUFFER, resize_flow_fbo);
+       fbos.render_to(out_tex);
 
        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)
+{
+       if (!enable_timing) {
+               return make_pair(0, 0);
+       }
+
+       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) {
@@ -940,7 +995,7 @@ public:
 
        void end()
        {
-               if (!ended) {
+               if (enable_timing && !ended) {
                        glQueryCounter(query.second, GL_TIMESTAMP);
                        ended = true;
                }
@@ -953,40 +1008,45 @@ private:
        bool ended = false;
 };
 
-int main(int argc, char **argv)
-{
-       if (SDL_Init(SDL_INIT_EVERYTHING) == -1) {
-               fprintf(stderr, "SDL_Init failed: %s\n", SDL_GetError());
-               exit(1);
-       }
-       SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
-       SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 0);
-       SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 0);
-       SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+class DISComputeFlow {
+public:
+       DISComputeFlow(int width, int height);
 
-       SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
-       SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 4);
-       SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 5);
-       // SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_DEBUG_FLAG);
-       SDL_Window *window = SDL_CreateWindow("OpenGL window",
-                       SDL_WINDOWPOS_UNDEFINED,
-                       SDL_WINDOWPOS_UNDEFINED,
-                       64, 64,
-                       SDL_WINDOW_OPENGL);
-       SDL_GLContext context = SDL_GL_CreateContext(window);
-       assert(context != nullptr);
+       // Returns a texture that must be released with release_texture()
+       // after use.
+       GLuint exec(GLuint tex0, GLuint tex1);
+       void release_texture(GLuint tex);
 
-       // Load pictures.
-       unsigned width1, height1, width2, height2;
-       GLuint tex0 = load_texture(argc >= 2 ? argv[1] : "test1499.png", &width1, &height1);
-       GLuint tex1 = load_texture(argc >= 3 ? argv[2] : "test1500.png", &width2, &height2);
+private:
+       int width, height;
+       GLuint initial_flow_tex;
 
-       if (width1 != width2 || height1 != height2) {
-               fprintf(stderr, "Image dimensions don't match (%dx%d versus %dx%d)\n",
-                       width1, height1, width2, height2);
-               exit(1);
-       }
+       // The various passes.
+       Sobel sobel;
+       MotionSearch motion_search;
+       Densify densify;
+       Prewarp prewarp;
+       Derivatives derivatives;
+       ComputeSmoothness compute_smoothness;
+       SetupEquations setup_equations;
+       SOR sor;
+       AddBaseFlow add_base_flow;
+       ResizeFlow resize_flow;
+
+       struct Texture {
+               GLuint tex_num;
+               GLenum format;
+               GLuint width, height;
+               bool in_use = false;
+       };
+       vector<Texture> textures;
 
+       GLuint get_texture(GLenum format, GLuint width, GLuint height);
+};
+
+DISComputeFlow::DISComputeFlow(int width, int height)
+       : width(width), height(height)
+{
        // Make some samplers.
        glCreateSamplers(1, &nearest_sampler);
        glSamplerParameteri(nearest_sampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@@ -1002,47 +1062,30 @@ int main(int argc, char **argv)
 
        // The smoothness is sampled so that once we get to a smoothness involving
        // a value outside the border, the diffusivity between the two becomes zero.
-       glCreateSamplers(1, &smoothness_sampler);
-       glSamplerParameteri(smoothness_sampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-       glSamplerParameteri(smoothness_sampler, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-       glSamplerParameteri(smoothness_sampler, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
-       glSamplerParameteri(smoothness_sampler, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+       // Similarly, gradients are zero outside the border, since the edge is taken
+       // to be constant.
+       glCreateSamplers(1, &zero_border_sampler);
+       glSamplerParameteri(zero_border_sampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+       glSamplerParameteri(zero_border_sampler, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+       glSamplerParameteri(zero_border_sampler, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
+       glSamplerParameteri(zero_border_sampler, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
        float zero[] = { 0.0f, 0.0f, 0.0f, 0.0f };
-       glSamplerParameterfv(smoothness_sampler, GL_TEXTURE_BORDER_COLOR, zero);
-
-       float vertices[] = {
-               0.0f, 1.0f,
-               0.0f, 0.0f,
-               1.0f, 1.0f,
-               1.0f, 0.0f,
-       };
-       glCreateBuffers(1, &vertex_vbo);
-       glNamedBufferData(vertex_vbo, sizeof(vertices), vertices, GL_STATIC_DRAW);
-       glBindBuffer(GL_ARRAY_BUFFER, vertex_vbo);
+       glSamplerParameterfv(zero_border_sampler, GL_TEXTURE_BORDER_COLOR, zero);
 
        // Initial flow is zero, 1x1.
-       GLuint initial_flow_tex;
        glCreateTextures(GL_TEXTURE_2D, 1, &initial_flow_tex);
        glTextureStorage2D(initial_flow_tex, 1, GL_RG16F, 1, 1);
        glClearTexImage(initial_flow_tex, 0, GL_RG, GL_FLOAT, nullptr);
-       int prev_level_width = 1, prev_level_height = 1;
-
-       GLuint prev_level_flow_tex = initial_flow_tex;
+}
 
-       Sobel sobel;
-       MotionSearch motion_search;
-       Densify densify;
-       Prewarp prewarp;
-       Derivatives derivatives;
-       ComputeSmoothness compute_smoothness;
-       SetupEquations setup_equations;
-       SOR sor;
-       AddBaseFlow add_base_flow;
-       ResizeFlow resize_flow;
+GLuint DISComputeFlow::exec(GLuint tex0, GLuint tex1)
+{
+       for (const Texture &tex : textures) {
+               assert(!tex.in_use);
+       }
 
-       GLuint query;
-       glGenQueries(1, &query);
-       glBeginQuery(GL_TIME_ELAPSED, query);
+       int prev_level_width = 1, prev_level_height = 1;
+       GLuint prev_level_flow_tex = initial_flow_tex;
 
        GPUTimers timers;
 
@@ -1052,16 +1095,20 @@ int main(int argc, char **argv)
                snprintf(timer_name, sizeof(timer_name), "Level %d", level);
                ScopedTimer level_timer(timer_name, &total_timer);
 
-               int level_width = width1 >> level;
-               int level_height = height1 >> level;
+               int level_width = width >> level;
+               int level_height = height >> level;
                float patch_spacing_pixels = patch_size_pixels * (1.0f - patch_overlap_ratio);
-               int width_patches = 1 + lrintf((level_width - patch_size_pixels) / patch_spacing_pixels);
-               int height_patches = 1 + lrintf((level_height - patch_size_pixels) / patch_spacing_pixels);
+
+               // Make sure we have patches at least every Nth pixel, e.g. for width=9
+               // and patch_spacing=3 (the default), we put out patch centers in
+               // x=0, x=3, x=6, x=9, which is four patches. The fragment shader will
+               // lock all the centers to integer coordinates if needed.
+               int width_patches = 1 + ceil(level_width / patch_spacing_pixels);
+               int height_patches = 1 + ceil(level_height / patch_spacing_pixels);
 
                // Make sure we always read from the correct level; the chosen
                // mipmapping could otherwise be rather unpredictable, especially
                // during motion search.
-               // TODO: create these beforehand, and stop leaking them.
                GLuint tex0_view, tex1_view;
                glGenTextures(1, &tex0_view);
                glTextureView(tex0_view, GL_TEXTURE_2D, tex0, GL_R8, level, 1, 0, 1);
@@ -1070,9 +1117,7 @@ int main(int argc, char **argv)
 
                // Create a new texture; we could be fancy and render use a multi-level
                // texture, but meh.
-               GLuint grad0_tex;
-               glCreateTextures(GL_TEXTURE_2D, 1, &grad0_tex);
-               glTextureStorage2D(grad0_tex, 1, GL_RG16F, level_width, level_height);
+               GLuint grad0_tex = get_texture(GL_RG16F, level_width, level_height);
 
                // Find the derivative.
                {
@@ -1084,22 +1129,19 @@ int main(int argc, char **argv)
                // level (sampled bilinearly; no fancy tricks) as a guide, then search from there.
 
                // Create an output flow texture.
-               GLuint flow_out_tex;
-               glCreateTextures(GL_TEXTURE_2D, 1, &flow_out_tex);
-               glTextureStorage2D(flow_out_tex, 1, GL_RGB16F, width_patches, height_patches);
+               GLuint flow_out_tex = get_texture(GL_RGB16F, width_patches, height_patches);
 
                // And draw.
                {
                        ScopedTimer timer("Motion search", &level_timer);
                        motion_search.exec(tex0_view, tex1_view, grad0_tex, prev_level_flow_tex, flow_out_tex, level_width, level_height, prev_level_width, prev_level_height, width_patches, height_patches);
                }
+               release_texture(grad0_tex);
 
                // Densification.
 
                // Set up an output texture (initially zero).
-               GLuint dense_flow_tex;
-               glCreateTextures(GL_TEXTURE_2D, 1, &dense_flow_tex);
-               glTextureStorage2D(dense_flow_tex, 1, GL_RGB16F, level_width, level_height);
+               GLuint dense_flow_tex = get_texture(GL_RGB16F, level_width, level_height);
                glClearTexImage(dense_flow_tex, 0, GL_RGB, GL_FLOAT, nullptr);
 
                // And draw.
@@ -1107,6 +1149,7 @@ int main(int argc, char **argv)
                        ScopedTimer timer("Densification", &level_timer);
                        densify.exec(tex0_view, tex1_view, flow_out_tex, dense_flow_tex, level_width, level_height, width_patches, height_patches);
                }
+               release_texture(flow_out_tex);
 
                // Everything below here in the loop belongs to variational refinement.
                ScopedTimer varref_timer("Variational refinement", &level_timer);
@@ -1118,52 +1161,42 @@ int main(int argc, char **argv)
                // in pixels, not 0..1 normalized OpenGL texture coordinates.
                // This is because variational refinement depends so heavily on derivatives,
                // which are measured in intensity levels per pixel.
-               GLuint I_tex, I_t_tex, base_flow_tex;
-               glCreateTextures(GL_TEXTURE_2D, 1, &I_tex);
-               glCreateTextures(GL_TEXTURE_2D, 1, &I_t_tex);
-               glCreateTextures(GL_TEXTURE_2D, 1, &base_flow_tex);
-               glTextureStorage2D(I_tex, 1, GL_R16F, level_width, level_height);
-               glTextureStorage2D(I_t_tex, 1, GL_R16F, level_width, level_height);
-               glTextureStorage2D(base_flow_tex, 1, GL_RG16F, level_width, level_height);
+               GLuint I_tex = get_texture(GL_R16F, level_width, level_height);
+               GLuint I_t_tex = get_texture(GL_R16F, level_width, level_height);
+               GLuint base_flow_tex = get_texture(GL_RG16F, level_width, level_height);
                {
                        ScopedTimer timer("Prewarping", &varref_timer);
                        prewarp.exec(tex0_view, tex1_view, dense_flow_tex, I_tex, I_t_tex, base_flow_tex, level_width, level_height);
                }
+               release_texture(dense_flow_tex);
+               glDeleteTextures(1, &tex0_view);
+               glDeleteTextures(1, &tex1_view);
 
                // Calculate I_x and I_y. We're only calculating first derivatives;
                // the others will be taken on-the-fly in order to sample from fewer
                // textures overall, since sampling from the L1 cache is cheap.
                // (TODO: Verify that this is indeed faster than making separate
                // double-derivative textures.)
-               GLuint I_x_y_tex, beta_0_tex;
-               glCreateTextures(GL_TEXTURE_2D, 1, &I_x_y_tex);
-               glCreateTextures(GL_TEXTURE_2D, 1, &beta_0_tex);
-               glTextureStorage2D(I_x_y_tex, 1, GL_RG16F, level_width, level_height);
-               glTextureStorage2D(beta_0_tex, 1, GL_R16F, level_width, level_height);
+               GLuint I_x_y_tex = get_texture(GL_RG16F, level_width, level_height);
+               GLuint beta_0_tex = get_texture(GL_R16F, level_width, level_height);
                {
                        ScopedTimer timer("First derivatives", &varref_timer);
                        derivatives.exec(I_tex, I_x_y_tex, beta_0_tex, level_width, level_height);
                }
+               release_texture(I_tex);
 
                // We need somewhere to store du and dv (the flow increment, relative
                // to the non-refined base flow u0 and v0). It starts at zero.
-               GLuint du_dv_tex;
-               glCreateTextures(GL_TEXTURE_2D, 1, &du_dv_tex);
-               glTextureStorage2D(du_dv_tex, 1, GL_RG16F, level_width, level_height);
+               GLuint du_dv_tex = get_texture(GL_RG16F, level_width, level_height);
                glClearTexImage(du_dv_tex, 0, GL_RG, GL_FLOAT, nullptr);
 
                // And for smoothness.
-               GLuint smoothness_x_tex, smoothness_y_tex;
-               glCreateTextures(GL_TEXTURE_2D, 1, &smoothness_x_tex);
-               glCreateTextures(GL_TEXTURE_2D, 1, &smoothness_y_tex);
-               glTextureStorage2D(smoothness_x_tex, 1, GL_R16F, level_width, level_height);
-               glTextureStorage2D(smoothness_y_tex, 1, GL_R16F, level_width, level_height);
+               GLuint smoothness_x_tex = get_texture(GL_R16F, level_width, level_height);
+               GLuint smoothness_y_tex = get_texture(GL_R16F, level_width, level_height);
 
                // And finally for the equation set. See SetupEquations for
                // the storage format.
-               GLuint equation_tex;
-               glCreateTextures(GL_TEXTURE_2D, 1, &equation_tex);
-               glTextureStorage2D(equation_tex, 1, GL_RGBA32UI, level_width, level_height);
+               GLuint equation_tex = get_texture(GL_RGBA32UI, level_width, level_height);
 
                for (int outer_idx = 0; outer_idx < level + 1; ++outer_idx) {
                        // Calculate the smoothness terms between the neighboring pixels,
@@ -1187,15 +1220,28 @@ int main(int argc, char **argv)
                        }
                }
 
+               release_texture(I_t_tex);
+               release_texture(I_x_y_tex);
+               release_texture(beta_0_tex);
+               release_texture(smoothness_x_tex);
+               release_texture(smoothness_y_tex);
+               release_texture(equation_tex);
+
                // 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);
                }
+               release_texture(du_dv_tex);
 
+               if (prev_level_flow_tex != initial_flow_tex) {
+                       release_texture(prev_level_flow_tex);
+               }
                prev_level_flow_tex = base_flow_tex;
                prev_level_width = level_width;
                prev_level_height = level_height;
@@ -1205,34 +1251,79 @@ int main(int argc, char **argv)
        timers.print();
 
        // Scale up the flow to the final size (if needed).
-       GLuint final_tex;
        if (finest_level == 0) {
-               final_tex = prev_level_flow_tex;
+               return prev_level_flow_tex;
        } else {
-               glCreateTextures(GL_TEXTURE_2D, 1, &final_tex);
-               glTextureStorage2D(final_tex, 1, GL_RG16F, width1, height1);
-               resize_flow.exec(prev_level_flow_tex, final_tex, prev_level_width, prev_level_height, width1, height1);
+               GLuint final_tex = get_texture(GL_RG16F, width, height);
+               resize_flow.exec(prev_level_flow_tex, final_tex, prev_level_width, prev_level_height, width, height);
+               release_texture(prev_level_flow_tex);
+               return final_tex;
        }
+}
 
-       unique_ptr<float[]> dense_flow(new float[width1 * height1 * 2]);
-       glGetTextureImage(final_tex, 0, GL_RG, GL_FLOAT, width1 * height1 * 2 * sizeof(float), dense_flow.get());
+GLuint DISComputeFlow::get_texture(GLenum format, GLuint width, GLuint height)
+{
+       for (Texture &tex : textures) {
+               if (!tex.in_use && tex.format == format &&
+                   tex.width == width && tex.height == height) {
+                       tex.in_use = true;
+                       return tex.tex_num;
+               }
+       }
 
-       FILE *fp = fopen("flow.ppm", "wb");
-       FILE *flowfp = fopen("flow.flo", "wb");
-       fprintf(fp, "P6\n%d %d\n255\n", width1, height1);
-       fprintf(flowfp, "FEIH");
-       fwrite(&width1, 4, 1, flowfp);
-       fwrite(&height1, 4, 1, flowfp);
-       for (unsigned y = 0; y < unsigned(height1); ++y) {
-               int yy = height1 - y - 1;
-               for (unsigned x = 0; x < unsigned(width1); ++x) {
-                       float du = dense_flow[(yy * width1 + x) * 2 + 0];
-                       float dv = dense_flow[(yy * width1 + x) * 2 + 1];
+       Texture tex;
+       glCreateTextures(GL_TEXTURE_2D, 1, &tex.tex_num);
+       glTextureStorage2D(tex.tex_num, 1, format, width, height);
+       tex.format = format;
+       tex.width = width;
+       tex.height = height;
+       tex.in_use = true;
+       textures.push_back(tex);
+       return tex.tex_num;
+}
 
-                       dv = -dv;
+void DISComputeFlow::release_texture(GLuint tex_num)
+{
+       for (Texture &tex : textures) {
+               if (tex.tex_num == tex_num) {
+                       assert(tex.in_use);
+                       tex.in_use = false;
+                       return;
+               }
+       }
+       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");
+       fprintf(flowfp, "FEIH");
+       fwrite(&width, 4, 1, flowfp);
+       fwrite(&height, 4, 1, flowfp);
+       for (unsigned y = 0; y < height; ++y) {
+               int yy = height - y - 1;
+               fwrite(&dense_flow[yy * width * 2], width * 2 * sizeof(float), 1, flowfp);
+       }
+       fclose(flowfp);
+}
 
-                       fwrite(&du, 4, 1, flowfp);
-                       fwrite(&dv, 4, 1, flowfp);
+void write_ppm(const char *filename, const float *dense_flow, unsigned width, unsigned height)
+{
+       FILE *fp = fopen(filename, "wb");
+       fprintf(fp, "P6\n%d %d\n255\n", width, height);
+       for (unsigned y = 0; y < unsigned(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];
 
                        uint8_t r, g, b;
                        flow2rgb(du, dv, &r, &g, &b);
@@ -1242,7 +1333,172 @@ int main(int argc, char **argv)
                }
        }
        fclose(fp);
-       fclose(flowfp);
+}
+
+void finish_one_read(GLuint width, GLuint height)
+{
+       assert(!reads_in_progress.empty());
+       ReadInProgress read = reads_in_progress.front();
+       reads_in_progress.pop_front();
+
+       unique_ptr<float[]> flow(new float[width * height * 2]);
+       void *buf = glMapNamedBufferRange(read.pbo, 0, width * height * 2 * sizeof(float), GL_MAP_READ_BIT);  // Blocks if the read isn't done yet.
+       memcpy(flow.get(), buf, width * height * 2 * sizeof(float));
+       glUnmapNamedBuffer(read.pbo);
+       spare_pbos.push(read.pbo);
+
+       flip_coordinate_system(flow.get(), width, height);
+       if (!read.flow_filename.empty()) {
+               write_flow(read.flow_filename.c_str(), flow.get(), width, height);
+               fprintf(stderr, "%s %s -> %s\n", read.filename0.c_str(), read.filename1.c_str(), read.flow_filename.c_str());
+       }
+       if (!read.ppm_filename.empty()) {
+               write_ppm(read.ppm_filename.c_str(), flow.get(), width, height);
+       }
+}
+
+void schedule_read(GLuint tex, GLuint width, GLuint height, const char *filename0, const char *filename1, const char *flow_filename, const char *ppm_filename)
+{
+       if (spare_pbos.empty()) {
+               finish_one_read(width, height);
+       }
+       assert(!spare_pbos.empty());
+       reads_in_progress.emplace_back(ReadInProgress{ spare_pbos.top(), filename0, filename1, flow_filename, ppm_filename });
+       glBindBuffer(GL_PIXEL_PACK_BUFFER, spare_pbos.top());
+       spare_pbos.pop();
+       glGetTextureImage(tex, 0, GL_RG, GL_FLOAT, width * height * 2 * sizeof(float), nullptr);
+       glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
+}
+
+int main(int argc, char **argv)
+{
+        static const option long_options[] = {
+               { "smoothness-relative-weight", required_argument, 0, 's' },  // alpha.
+               { "intensity-relative-weight", required_argument, 0, 'i' },  // delta.
+               { "gradient-relative-weight", required_argument, 0, 'g' },  // gamma.
+               { "disable-timing", no_argument, 0, 1000 },
+               { "ignore-variational-refinement", no_argument, 0, 1001 }  // Still calculates it, just doesn't apply it.
+       };
+
+       for ( ;; ) {
+               int option_index = 0;
+               int c = getopt_long(argc, argv, "s:i:g:", long_options, &option_index);
 
-       fprintf(stderr, "err = %d\n", glGetError());
+               if (c == -1) {
+                       break;
+               }
+               switch (c) {
+               case 's':
+                       vr_alpha = atof(optarg);
+                       break;
+               case 'i':
+                       vr_delta = atof(optarg);
+                       break;
+               case 'g':
+                       vr_gamma = atof(optarg);
+                       break;
+               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);
+               };
+       }
+
+       if (SDL_Init(SDL_INIT_EVERYTHING) == -1) {
+               fprintf(stderr, "SDL_Init failed: %s\n", SDL_GetError());
+               exit(1);
+       }
+       SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
+       SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 0);
+       SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 0);
+       SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+
+       SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
+       SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 4);
+       SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 5);
+       // SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_DEBUG_FLAG);
+       SDL_Window *window = SDL_CreateWindow("OpenGL window",
+                       SDL_WINDOWPOS_UNDEFINED,
+                       SDL_WINDOWPOS_UNDEFINED,
+                       64, 64,
+                       SDL_WINDOW_OPENGL);
+       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";
+
+       // Load pictures.
+       unsigned width1, height1, 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",
+                       width1, height1, width2, height2);
+               exit(1);
+       }
+
+       // Set up some PBOs to do asynchronous readback.
+       GLuint pbos[5];
+        glCreateBuffers(5, pbos);
+       for (int i = 0; i < 5; ++i) {
+               glNamedBufferData(pbos[i], width1 * height1 * 2 * sizeof(float), nullptr, GL_STREAM_READ);
+               spare_pbos.push(pbos[i]);
+       }
+
+       // FIXME: Should be part of DISComputeFlow (but needs to be initialized
+       // before all the render passes).
+       float vertices[] = {
+               0.0f, 1.0f,
+               0.0f, 0.0f,
+               1.0f, 1.0f,
+               1.0f, 0.0f,
+       };
+       glCreateBuffers(1, &vertex_vbo);
+       glNamedBufferData(vertex_vbo, sizeof(vertices), vertices, GL_STATIC_DRAW);
+       glBindBuffer(GL_ARRAY_BUFFER, vertex_vbo);
+
+       DISComputeFlow compute_flow(width1, height1);
+       GLuint final_tex = compute_flow.exec(tex0, tex1);
+
+       schedule_read(final_tex, width1, height1, filename0, filename1, flow_filename, "flow.ppm");
+       compute_flow.release_texture(final_tex);
+
+       // See if there are more flows on the command line (ie., more than three arguments),
+       // and if so, process them.
+       int num_flows = (argc - optind) / 3;
+       for (int i = 1; i < num_flows; ++i) {
+               const char *filename0 = argv[optind + i * 3 + 0];
+               const char *filename1 = argv[optind + i * 3 + 1];
+               const char *flow_filename = argv[optind + i * 3 + 2];
+               GLuint width, height;
+               GLuint tex0 = load_texture(filename0, &width, &height);
+               if (width != width1 || height != height1) {
+                       fprintf(stderr, "%s: Image dimensions don't match (%dx%d versus %dx%d)\n",
+                               filename0, width, height, width1, height1);
+                       exit(1);
+               }
+
+               GLuint tex1 = load_texture(filename1, &width, &height);
+               if (width != width1 || height != height1) {
+                       fprintf(stderr, "%s: Image dimensions don't match (%dx%d versus %dx%d)\n",
+                               filename1, width, height, width1, height1);
+                       exit(1);
+               }
+
+               GLuint final_tex = compute_flow.exec(tex0, tex1);
+               schedule_read(final_tex, width1, height1, filename0, filename1, flow_filename, "");
+               compute_flow.release_texture(final_tex);
+       }
+
+       while (!reads_in_progress.empty()) {
+               finish_one_read(width1, height1);
+       }
 }