Fix some test breakage.

[movit] / dither_effect.cpp

diff --git a/dither_effect.cpp b/dither_effect.cpp
index 62355b248fc406db1980e9ec76f9bde7afdd92ba..3fa6aebc3fa8f674674ca37e37ac6932be78c6fe 100644 (file)
--- a/dither_effect.cpp
+++ b/dither_effect.cpp
@@ -1,5 +1,6 @@
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <assert.h>
+#include <stdio.h>
 #include <algorithm>
 
 #include "dither_effect.h"
@@ -9,6 +10,8 @@
 
 using namespace std;
 
+namespace movit {
+
 namespace {
 
 // A simple LCG (linear congruental generator) random generator.
@@ -32,6 +35,10 @@ DitherEffect::DitherEffect()
        register_int("output_width", &width);
        register_int("output_height", &height);
        register_int("num_bits", &num_bits);
+       register_uniform_float("round_fac", &uniform_round_fac);
+       register_uniform_float("inv_round_fac", &uniform_inv_round_fac);
+       register_uniform_vec2("tc_scale", uniform_tc_scale);
+       register_uniform_sampler2d("dither_tex", &uniform_dither_tex);
 
        glGenTextures(1, &texnum);
 }
@@ -81,7 +88,7 @@ void DitherEffect::update_texture(GLuint glsl_program_num, const string &prefix,
        check_error();
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
        check_error();
-       glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE16F_ARB, texture_width, texture_height, 0, GL_LUMINANCE, GL_FLOAT, dither_noise);
+       glTexImage2D(GL_TEXTURE_2D, 0, GL_R16F, texture_width, texture_height, 0, GL_RED, GL_FLOAT, dither_noise);
        check_error();
 
        delete[] dither_noise;
@@ -107,17 +114,19 @@ void DitherEffect::set_gl_state(GLuint glsl_program_num, const string &prefix, u
        glBindTexture(GL_TEXTURE_2D, texnum);
        check_error();
 
-       set_uniform_int(glsl_program_num, prefix, "dither_tex", *sampler_num);
-       ++sampler_num;
+       uniform_dither_tex = *sampler_num;
+       ++*sampler_num;
 
        // In theory, we should adjust for the texel centers that have moved here as well,
        // but since we use GL_NEAREST and we don't really care a lot what texel we sample,
        // we don't have to worry about it.     
-       float tc_scale[] = { float(width) / float(texture_width), float(height) / float(texture_height) };
-       set_uniform_vec2(glsl_program_num, prefix, "tc_scale", tc_scale);
+       uniform_tc_scale[0] = float(width) / float(texture_width);
+       uniform_tc_scale[1] = float(height) / float(texture_height);
 
        // Used if the shader needs to do explicit rounding.
        int round_fac = (1 << num_bits) - 1;
-       set_uniform_float(glsl_program_num, prefix, "round_fac", round_fac);
-       set_uniform_float(glsl_program_num, prefix, "inv_round_fac", 1.0f / round_fac);
+       uniform_round_fac = round_fac;
+       uniform_inv_round_fac = 1.0f / round_fac;
 }
+
+}  // namespace movit