Do some IEEE trickery to help the shader optimizer remove a sub or two in some YCbCr...

[movit] / dither_effect.cpp

diff --git a/dither_effect.cpp b/dither_effect.cpp
index 6e1ddd8d8ed4b7451698fd0b9d70382560bf0c52..41ea9b432b80d3c94bf093a184f2632721dcbbcd 100644 (file)
--- a/dither_effect.cpp
+++ b/dither_effect.cpp
@@ -1,4 +1,4 @@
-#include <GL/glew.h>
+#include <epoxy/gl.h>

 #include <assert.h>
 #include <stdio.h>
 #include <algorithm>
 #include <assert.h>
 #include <stdio.h>
 #include <algorithm>


@@ -10,6 +10,8 @@
 
 using namespace std;
 
 
 using namespace std;
 

+namespace movit {
+

 namespace {
 
 // A simple LCG (linear congruental generator) random generator.
 namespace {
 
 // A simple LCG (linear congruental generator) random generator.


@@ -82,7 +84,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();
        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;
        check_error();
 
        delete[] dither_noise;


@@ -109,7 +111,7 @@ void DitherEffect::set_gl_state(GLuint glsl_program_num, const string &prefix, u
        check_error();
 
        set_uniform_int(glsl_program_num, prefix, "dither_tex", *sampler_num);
        check_error();
 
        set_uniform_int(glsl_program_num, prefix, "dither_tex", *sampler_num);

-       ++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,
 
        // 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,


@@ -122,3 +124,5 @@ void DitherEffect::set_gl_state(GLuint glsl_program_num, const string &prefix, u
        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);
 }
        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);
 }

+
+}  // namespace movit