X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=dither_effect.cpp;h=41ea9b432b80d3c94bf093a184f2632721dcbbcd;hp=e9ea19f226006e8f30584b7dbc9c1ee95cfd350d;hb=9580d67514ec138e65496aa1170c63b53f657207;hpb=cfc161e0289c2169d4835c48751ff56b97355eb2 diff --git a/dither_effect.cpp b/dither_effect.cpp index e9ea19f..41ea9b4 100644 --- a/dither_effect.cpp +++ b/dither_effect.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -84,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(); - 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; @@ -111,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); - ++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,