#include <stdio.h>
#include <unistd.h>
+#include "gpu_timers.h"
#include "util.h"
#include <algorithm>
float vr_alpha = 1.0f, vr_delta = 0.25f, vr_gamma = 0.25f;
bool enable_timing = true;
+bool detailed_timing = false;
bool enable_variational_refinement = true; // Just for debugging.
bool enable_interpolation = false;
void render_to(const array<GLuint, num_elements> &textures);
// Convenience wrappers.
- void render_to(GLuint texture0, enable_if<num_elements == 1> * = nullptr) {
+ void render_to(GLuint texture0) {
render_to({{texture0}});
}
- void render_to(GLuint texture0, GLuint texture1, enable_if<num_elements == 2> * = nullptr) {
+ void render_to(GLuint texture0, GLuint texture1) {
render_to({{texture0, texture1}});
}
- void render_to(GLuint texture0, GLuint texture1, GLuint texture2, enable_if<num_elements == 3> * = nullptr) {
+ void render_to(GLuint texture0, GLuint texture1, GLuint texture2) {
render_to({{texture0, texture1, texture2}});
}
- void render_to(GLuint texture0, GLuint texture1, GLuint texture2, GLuint texture3, enable_if<num_elements == 4> * = nullptr) {
+ void render_to(GLuint texture0, GLuint texture1, GLuint texture2, GLuint texture3) {
render_to({{texture0, texture1, texture2, texture3}});
}
glBindFramebuffer(GL_FRAMEBUFFER, fbo);
}
+// Same, but with a depth texture.
+template<size_t num_elements>
+class PersistentFBOSetWithDepth {
+public:
+ void render_to(GLuint depth_tex, const array<GLuint, num_elements> &textures);
+
+ // Convenience wrappers.
+ void render_to(GLuint depth_tex, GLuint texture0) {
+ render_to(depth_tex, {{texture0}});
+ }
+
+ void render_to(GLuint depth_tex, GLuint texture0, GLuint texture1) {
+ render_to(depth_tex, {{texture0, texture1}});
+ }
+
+ void render_to(GLuint depth_tex, GLuint texture0, GLuint texture1, GLuint texture2) {
+ render_to(depth_tex, {{texture0, texture1, texture2}});
+ }
+
+ void render_to(GLuint depth_tex, GLuint texture0, GLuint texture1, GLuint texture2, GLuint texture3) {
+ render_to(depth_tex, {{texture0, texture1, texture2, texture3}});
+ }
+
+private:
+ // TODO: Delete these on destruction.
+ map<pair<GLuint, array<GLuint, num_elements>>, GLuint> fbos;
+};
+
+template<size_t num_elements>
+void PersistentFBOSetWithDepth<num_elements>::render_to(GLuint depth_tex, const array<GLuint, num_elements> &textures)
+{
+ auto key = make_pair(depth_tex, textures);
+
+ auto it = fbos.find(key);
+ if (it != fbos.end()) {
+ glBindFramebuffer(GL_FRAMEBUFFER, it->second);
+ return;
+ }
+
+ GLuint fbo;
+ glCreateFramebuffers(1, &fbo);
+ GLenum bufs[num_elements];
+ glNamedFramebufferTexture(fbo, GL_DEPTH_ATTACHMENT, depth_tex, 0);
+ 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[key] = fbo;
+ glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+}
+
// Convert RGB to grayscale, using Rec. 709 coefficients.
class GrayscaleConversion {
public:
GLuint densify_program;
GLuint densify_vao;
- GLuint uniform_patch_size, uniform_patch_spacing;
+ GLuint uniform_patch_size;
GLuint uniform_image0_tex, uniform_image1_tex, uniform_flow_tex;
};
glVertexAttribPointer(position_attrib, 2, GL_FLOAT, GL_FALSE, 0, BUFFER_OFFSET(0));
uniform_patch_size = glGetUniformLocation(densify_program, "patch_size");
- uniform_patch_spacing = glGetUniformLocation(densify_program, "patch_spacing");
uniform_image0_tex = glGetUniformLocation(densify_program, "image0_tex");
uniform_image1_tex = glGetUniformLocation(densify_program, "image1_tex");
uniform_flow_tex = glGetUniformLocation(densify_program, "flow_tex");
float(patch_size_pixels) / level_width,
float(patch_size_pixels) / level_height);
- float patch_spacing_x = float(level_width - patch_size_pixels) / (width_patches - 1);
- float patch_spacing_y = float(level_height - patch_size_pixels) / (height_patches - 1);
- if (width_patches == 1) patch_spacing_x = 0.0f; // Avoid infinities.
- if (height_patches == 1) patch_spacing_y = 0.0f;
- glProgramUniform2f(densify_program, uniform_patch_spacing,
- patch_spacing_x / level_width,
- patch_spacing_y / level_height);
-
glViewport(0, 0, level_width, level_height);
glEnable(GL_BLEND);
glBlendFunc(GL_ONE, GL_ONE);
glBindVertexArray(densify_vao);
fbos.render_to(dense_flow_tex);
+ glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+ glClear(GL_COLOR_BUFFER_BIT);
glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, width_patches * height_patches);
}
class ComputeSmoothness {
public:
ComputeSmoothness();
- void exec(GLuint flow_tex, GLuint diff_flow_tex, GLuint smoothness_x_tex, GLuint smoothness_y_tex, int level_width, int level_height);
+ void exec(GLuint flow_tex, GLuint diff_flow_tex, GLuint smoothness_x_tex, GLuint smoothness_y_tex, int level_width, int level_height, bool zero_diff_flow);
private:
PersistentFBOSet<2> fbos;
GLuint smoothness_vao;
GLuint uniform_flow_tex, uniform_diff_flow_tex;
- GLuint uniform_alpha;
+ GLuint uniform_alpha, uniform_zero_diff_flow;
};
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");
+ uniform_zero_diff_flow = glGetUniformLocation(smoothness_program, "zero_diff_flow");
}
-void ComputeSmoothness::exec(GLuint flow_tex, GLuint diff_flow_tex, GLuint smoothness_x_tex, GLuint smoothness_y_tex, int level_width, int level_height)
+void ComputeSmoothness::exec(GLuint flow_tex, GLuint diff_flow_tex, GLuint smoothness_x_tex, GLuint smoothness_y_tex, int level_width, int level_height, bool zero_diff_flow)
{
glUseProgram(smoothness_program);
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);
glProgramUniform1f(smoothness_program, uniform_alpha, vr_alpha);
+ glProgramUniform1i(smoothness_program, uniform_zero_diff_flow, zero_diff_flow);
glViewport(0, 0, level_width, level_height);
class SetupEquations {
public:
SetupEquations();
- 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);
+ 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, bool zero_diff_flow);
private:
PersistentFBOSet<1> fbos;
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;
+ GLuint uniform_gamma, uniform_delta, uniform_zero_diff_flow;
};
SetupEquations::SetupEquations()
uniform_smoothness_y_tex = glGetUniformLocation(equations_program, "smoothness_y_tex");
uniform_gamma = glGetUniformLocation(equations_program, "gamma");
uniform_delta = glGetUniformLocation(equations_program, "delta");
+ uniform_zero_diff_flow = glGetUniformLocation(equations_program, "zero_diff_flow");
}
-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)
+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, bool zero_diff_flow)
{
glUseProgram(equations_program);
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);
+ glProgramUniform1i(equations_program, uniform_zero_diff_flow, zero_diff_flow);
glViewport(0, 0, level_width, level_height);
glDisable(GL_BLEND);
class SOR {
public:
SOR();
- 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);
+ 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, bool zero_diff_flow, ScopedTimer *sor_timer);
private:
PersistentFBOSet<1> fbos;
GLuint uniform_diff_flow_tex;
GLuint uniform_equation_tex;
GLuint uniform_smoothness_x_tex, uniform_smoothness_y_tex;
- GLuint uniform_phase;
+ GLuint uniform_phase, uniform_zero_diff_flow;
};
SOR::SOR()
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");
+ uniform_zero_diff_flow = glGetUniformLocation(sor_program, "zero_diff_flow");
}
-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)
+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, bool zero_diff_flow, ScopedTimer *sor_timer)
{
glUseProgram(sor_program);
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);
+ glProgramUniform1i(sor_program, uniform_zero_diff_flow, zero_diff_flow);
+
// 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
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) {
+ {
+ ScopedTimer timer("Red pass", sor_timer);
+ glProgramUniform1i(sor_program, uniform_phase, 0);
+ glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
glTextureBarrier();
}
+ {
+ ScopedTimer timer("Black pass", sor_timer);
+ if (zero_diff_flow && i == 0) {
+ // Not zero anymore.
+ glProgramUniform1i(sor_program, uniform_zero_diff_flow, 0);
+ }
+ glProgramUniform1i(sor_program, uniform_phase, 1);
+ glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+ if (i != num_iterations - 1) {
+ glTextureBarrier();
+ }
+ }
}
}
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) {
- // NOTE: This makes the CPU wait for the GPU.
- GLuint64 time_start, time_end;
- glGetQueryObjectui64v(timer.query.first, GL_QUERY_RESULT, &time_start);
- glGetQueryObjectui64v(timer.query.second, GL_QUERY_RESULT, &time_end);
- //fprintf(stderr, "GPU time used = %.1f ms\n", time_elapsed / 1e6);
- for (int i = 0; i < timer.level * 2; ++i) {
- fprintf(stderr, " ");
- }
- fprintf(stderr, "%-30s %4.1f ms\n", timer.name.c_str(), GLint64(time_end - time_start) / 1e6);
- }
-}
-
-// A simple RAII class for timing until the end of the scope.
-class ScopedTimer {
-public:
- ScopedTimer(const string &name, GPUTimers *timers)
- : timers(timers), level(0)
- {
- query = timers->begin_timer(name, level);
- }
-
- ScopedTimer(const string &name, ScopedTimer *parent_timer)
- : timers(parent_timer->timers),
- level(parent_timer->level + 1)
- {
- query = timers->begin_timer(name, level);
- }
-
- ~ScopedTimer()
- {
- end();
- }
-
- void end()
- {
- if (enable_timing && !ended) {
- glQueryCounter(query.second, GL_TIMESTAMP);
- ended = true;
- }
- }
-
-private:
- GPUTimers *timers;
- int level;
- pair<GLuint, GLuint> query;
- bool ended = false;
-};
-
class TexturePool {
public:
GLuint get_texture(GLenum format, GLuint width, GLuint height);
ScopedTimer total_timer("Total", &timers);
for (int level = coarsest_level; level >= int(finest_level); --level) {
char timer_name[256];
- snprintf(timer_name, sizeof(timer_name), "Level %d", level);
+ snprintf(timer_name, sizeof(timer_name), "Level %d (%d x %d)", level, width >> level, height >> level);
ScopedTimer level_timer(timer_name, &total_timer);
int level_width = width >> level;
// Densification.
- // Set up an output texture (initially zero).
+ // Set up an output texture (cleared in Densify).
GLuint dense_flow_tex = pool.get_texture(GL_RGB16F, level_width, level_height);
- glClearTexImage(dense_flow_tex, 0, GL_RGB, GL_FLOAT, nullptr);
// And draw.
{
pool.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.
+ // to the non-refined base flow u0 and v0). It's initially garbage,
+ // but not read until we've written something sane to it.
GLuint du_dv_tex = pool.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 = pool.get_texture(GL_R16F, level_width, level_height);
// both in x and y direction.
{
ScopedTimer timer("Compute smoothness", &varref_timer);
- compute_smoothness.exec(base_flow_tex, du_dv_tex, smoothness_x_tex, smoothness_y_tex, level_width, level_height);
+ compute_smoothness.exec(base_flow_tex, du_dv_tex, smoothness_x_tex, smoothness_y_tex, level_width, level_height, outer_idx == 0);
}
// Set up the 2x2 equation system for each pixel.
{
ScopedTimer timer("Set up equations", &varref_timer);
- setup_equations.exec(I_x_y_tex, I_t_tex, du_dv_tex, base_flow_tex, beta_0_tex, smoothness_x_tex, smoothness_y_tex, equation_tex, level_width, level_height);
+ setup_equations.exec(I_x_y_tex, I_t_tex, du_dv_tex, base_flow_tex, beta_0_tex, smoothness_x_tex, smoothness_y_tex, equation_tex, level_width, level_height, outer_idx == 0);
}
// Run a few SOR (or quasi-SOR, since we're not really Jacobi) iterations.
// Note that these are to/from the same texture.
{
ScopedTimer timer("SOR", &varref_timer);
- sor.exec(du_dv_tex, equation_tex, smoothness_x_tex, smoothness_y_tex, level_width, level_height, 5);
+ sor.exec(du_dv_tex, equation_tex, smoothness_x_tex, smoothness_y_tex, level_width, level_height, 5, outer_idx == 0, &timer);
}
}
void exec(GLuint tex0, GLuint tex1, GLuint forward_flow_tex, GLuint backward_flow_tex, GLuint flow_tex, GLuint depth_tex, int width, int height, float alpha);
private:
- PersistentFBOSet<2> fbos;
+ PersistentFBOSetWithDepth<1> fbos;
GLuint splat_vs_obj;
GLuint splat_fs_obj;
glDepthFunc(GL_LESS); // We store the difference between I_0 and I_1, where less difference is good. (Default 1.0 is effectively +inf, which always loses.)
glBindVertexArray(splat_vao);
- // FIXME: Get this into FBOSet, so we can reuse FBOs across frames.
- GLuint fbo;
- glCreateFramebuffers(1, &fbo);
- glNamedFramebufferTexture(fbo, GL_COLOR_ATTACHMENT0, flow_tex, 0);
- glNamedFramebufferTexture(fbo, GL_DEPTH_ATTACHMENT, depth_tex, 0);
- glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+ fbos.render_to(depth_tex, flow_tex);
+
+ // Evidently NVIDIA doesn't use fast clears for glClearTexImage, so clear now that
+ // we've got it bound.
+ glClearColor(1000.0f, 1000.0f, 0.0f, 1.0f); // Invalid flow.
+ glClearDepth(1.0f); // Effectively infinity.
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
// Do forward splatting.
bind_sampler(splat_program, uniform_flow_tex, 2, forward_flow_tex, nearest_sampler);
glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, width * height);
glDisable(GL_DEPTH_TEST);
-
- glDeleteFramebuffers(1, &fbo);
}
// Doing good and fast hole-filling on a GPU is nontrivial. We choose an option
void exec(GLuint flow_tex, GLuint depth_tex, GLuint temp_tex[3], int width, int height);
private:
- PersistentFBOSet<2> fbos;
+ PersistentFBOSetWithDepth<1> fbos;
GLuint fill_vs_obj;
GLuint fill_fs_obj;
glDepthFunc(GL_LESS); // Only update the values > 0.999f (ie., only invalid pixels).
glBindVertexArray(fill_vao);
- // FIXME: Get this into FBOSet, so we can reuse FBOs across frames.
- GLuint fbo;
- glCreateFramebuffers(1, &fbo);
- glNamedFramebufferTexture(fbo, GL_COLOR_ATTACHMENT0, flow_tex, 0); // NOTE: Reading and writing to the same texture.
- glNamedFramebufferTexture(fbo, GL_DEPTH_ATTACHMENT, depth_tex, 0);
- glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+ fbos.render_to(depth_tex, flow_tex); // NOTE: Reading and writing to the same texture.
// Fill holes from the left, by shifting 1, 2, 4, 8, etc. pixels to the right.
for (int offs = 1; offs < width; offs *= 2) {
}
glDisable(GL_DEPTH_TEST);
-
- glDeleteFramebuffers(1, &fbo);
}
// Blend the four directions from HoleFill into one pixel, so that single-pixel
void exec(GLuint flow_tex, GLuint depth_tex, GLuint temp_tex[3], int width, int height);
private:
- PersistentFBOSet<2> fbos;
+ PersistentFBOSetWithDepth<1> fbos;
GLuint blend_vs_obj;
GLuint blend_fs_obj;
glDepthFunc(GL_LEQUAL); // Skip over all of the pixels that were never holes to begin with.
glBindVertexArray(blend_vao);
- // FIXME: Get this into FBOSet, so we can reuse FBOs across frames.
- GLuint fbo;
- glCreateFramebuffers(1, &fbo);
- glNamedFramebufferTexture(fbo, GL_COLOR_ATTACHMENT0, flow_tex, 0); // NOTE: Reading and writing to the same texture.
- glNamedFramebufferTexture(fbo, GL_DEPTH_ATTACHMENT, depth_tex, 0);
- glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+ fbos.render_to(depth_tex, flow_tex); // NOTE: Reading and writing to the same texture.
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
glDisable(GL_DEPTH_TEST);
-
- glDeleteFramebuffers(1, &fbo);
}
class Blend {
GLuint flow_tex = pool.get_texture(GL_RG16F, flow_width, flow_height);
GLuint depth_tex = pool.get_texture(GL_DEPTH_COMPONENT32F, flow_width, flow_height); // Used for ranking flows.
- {
- ScopedTimer timer("Clear", &total_timer);
- float invalid_flow[] = { 1000.0f, 1000.0f };
- glClearTexImage(flow_tex, 0, GL_RG, GL_FLOAT, invalid_flow);
- float infinity = 1.0f;
- glClearTexImage(depth_tex, 0, GL_DEPTH_COMPONENT, GL_FLOAT, &infinity);
- }
{
ScopedTimer timer("Splat", &total_timer);
pool.release_texture(temp_tex[2]);
pool.release_texture(depth_tex);
- GLuint output_tex = pool.get_texture(GL_RGB8, width, height);
+ GLuint output_tex = pool.get_texture(GL_RGBA8, width, height);
{
ScopedTimer timer("Blend", &total_timer);
blend.exec(tex0, tex1, flow_tex, output_tex, width, height, alpha);
}
}
+// Not relevant for RGB.
+void flip_coordinate_system(uint8_t *dense_flow, unsigned width, unsigned height)
+{
+}
+
void write_flow(const char *filename, const float *dense_flow, unsigned width, unsigned height)
{
FILE *flowfp = fopen(filename, "wb");
fclose(flowfp);
}
+// Not relevant for RGB.
+void write_flow(const char *filename, const uint8_t *dense_flow, unsigned width, unsigned height)
+{
+ assert(false);
+}
+
void write_ppm(const char *filename, const float *dense_flow, unsigned width, unsigned height)
{
FILE *fp = fopen(filename, "wb");
fclose(fp);
}
+void write_ppm(const char *filename, const uint8_t *rgba, unsigned width, unsigned height)
+{
+ unique_ptr<uint8_t[]> rgb_line(new uint8_t[width * 3 + 1]);
+
+ FILE *fp = fopen(filename, "wb");
+ fprintf(fp, "P6\n%d %d\n255\n", width, height);
+ for (unsigned y = 0; y < height; ++y) {
+ unsigned y2 = height - 1 - y;
+ for (size_t x = 0; x < width; ++x) {
+ memcpy(&rgb_line[x * 3], &rgba[(y2 * width + x) * 4], 4);
+ }
+ fwrite(rgb_line.get(), width * 3, 1, fp);
+ }
+ fclose(fp);
+}
+
+struct FlowType {
+ using type = float;
+ static constexpr GLenum gl_format = GL_RG;
+ static constexpr GLenum gl_type = GL_FLOAT;
+ static constexpr int num_channels = 2;
+};
+
+struct RGBAType {
+ using type = uint8_t;
+ static constexpr GLenum gl_format = GL_RGBA;
+ static constexpr GLenum gl_type = GL_UNSIGNED_BYTE;
+ static constexpr int num_channels = 4;
+};
+
+template <class Type>
void finish_one_read(GLuint width, GLuint height)
{
+ using T = typename Type::type;
+ constexpr int bytes_per_pixel = Type::num_channels * sizeof(T);
+
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));
+ unique_ptr<T[]> flow(new typename Type::type[width * height * Type::num_channels]);
+ void *buf = glMapNamedBufferRange(read.pbo, 0, width * height * bytes_per_pixel, GL_MAP_READ_BIT); // Blocks if the read isn't done yet.
+ memcpy(flow.get(), buf, width * height * bytes_per_pixel); // TODO: Unneeded for RGBType, since flip_coordinate_system() does nothing.:
glUnmapNamedBuffer(read.pbo);
spare_pbos.push(read.pbo);
}
}
+template <class Type>
void schedule_read(GLuint tex, GLuint width, GLuint height, const char *filename0, const char *filename1, const char *flow_filename, const char *ppm_filename)
{
+ using T = typename Type::type;
+ constexpr int bytes_per_pixel = Type::num_channels * sizeof(T);
+
if (spare_pbos.empty()) {
- finish_one_read(width, height);
+ finish_one_read<Type>(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);
+ glGetTextureImage(tex, 0, Type::gl_format, Type::gl_type, width * height * bytes_per_pixel, nullptr);
glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
}
DISComputeFlow compute_flow(width1, height1);
GLuint final_tex = compute_flow.exec(tex0_gray, tex1_gray, DISComputeFlow::RESIZE_FLOW_TO_FULL_SIZE);
- schedule_read(final_tex, width1, height1, filename0, filename1, flow_filename, "flow.ppm");
+ schedule_read<FlowType>(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),
GLuint final_tex = compute_flow.exec(tex0_gray, tex1_gray, DISComputeFlow::RESIZE_FLOW_TO_FULL_SIZE);
- schedule_read(final_tex, width1, height1, filename0, filename1, flow_filename, "");
+ schedule_read<FlowType>(final_tex, width1, height1, filename0, filename1, flow_filename, "");
compute_flow.release_texture(final_tex);
}
glDeleteTextures(1, &tex0_gray);
glDeleteTextures(1, &tex1_gray);
while (!reads_in_progress.empty()) {
- finish_one_read(width1, height1);
+ finish_one_read<FlowType>(width1, height1);
}
}
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);
+ glNamedBufferData(pbos[i], width1 * height1 * 4 * sizeof(uint8_t), nullptr, GL_STREAM_READ);
spare_pbos.push(pbos[i]);
}
DISComputeFlow compute_flow(width1, height1);
GrayscaleConversion gray;
Interpolate interpolate(width1, height1, finest_level);
- //Interpolate interpolate(width1, height1, 0);
int levels = find_num_levels(width1, height1);
GLuint tex0_gray, tex1_gray;
GLuint backward_flow_tex = compute_flow.exec(tex1_gray, tex0_gray, DISComputeFlow::DO_NOT_RESIZE_FLOW);
for (int frameno = 1; frameno < 60; ++frameno) {
+ char ppm_filename[256];
+ snprintf(ppm_filename, sizeof(ppm_filename), "interp%04d.ppm", frameno);
+
float alpha = frameno / 60.0f;
GLuint interpolated_tex = interpolate.exec(tex0, tex1, forward_flow_tex, backward_flow_tex, width1, height1, alpha);
- unique_ptr<uint8_t[]> rgb(new uint8_t[width1 * height1 * 3]);
- glGetTextureImage(interpolated_tex, 0, GL_RGB, GL_UNSIGNED_BYTE, width1 * height1 * 3, rgb.get());
-
- char buf[256];
- snprintf(buf, sizeof(buf), "interp%04d.ppm", frameno);
- FILE *fp = fopen(buf, "wb");
- fprintf(fp, "P6\n%d %d\n255\n", width1, height1);
- for (unsigned y = 0; y < height1; ++y) {
- unsigned y2 = height1 - 1 - y;
- fwrite(rgb.get() + y2 * width1 * 3, width1 * 3, 1, fp);
- }
- fclose(fp);
+ schedule_read<RGBAType>(interpolated_tex, width1, height1, filename0, filename1, "", ppm_filename);
+ interpolate.release_texture(interpolated_tex);
}
- //schedule_read(interpolated_tex, width1, height1, filename0, filename1, "", "halfflow.ppm");
- //interpolate.release_texture(interpolated_tex);
- //finish_one_read(width1, height1);
+ while (!reads_in_progress.empty()) {
+ finish_one_read<RGBAType>(width1, height1);
+ }
}
int main(int argc, char **argv)
{ "intensity-relative-weight", required_argument, 0, 'i' }, // delta.
{ "gradient-relative-weight", required_argument, 0, 'g' }, // gamma.
{ "disable-timing", no_argument, 0, 1000 },
+ { "detailed-timing", no_argument, 0, 1003 },
{ "ignore-variational-refinement", no_argument, 0, 1001 }, // Still calculates it, just doesn't apply it.
{ "interpolate", no_argument, 0, 1002 }
};
case 1002:
enable_interpolation = true;
break;
+ case 1003:
+ detailed_timing = true;
+ break;
default:
fprintf(stderr, "Unknown option '%s'\n", argv[option_index]);
exit(1);
SDL_GLContext context = SDL_GL_CreateContext(window);
assert(context != nullptr);
+ glDisable(GL_DITHER);
+
// FIXME: Should be part of DISComputeFlow (but needs to be initialized
// before all the render passes).
float vertices[] = {
projects / nageru / blobdiff