X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=lift_gamma_gain_effect.cpp;h=ac8ccb6347b3ae9f7e9f574854551a271f26518e;hp=5bc989aba08fbb5e2a5291cfcbf142469705f57f;hb=90ac46cdc5845432df13385f946c63b5496c685e;hpb=85f9719bf3519b1f1942738d11601584f5d38725

diff --git a/lift_gamma_gain_effect.cpp b/lift_gamma_gain_effect.cpp
index 5bc989a..ac8ccb6 100644
--- a/lift_gamma_gain_effect.cpp
+++ b/lift_gamma_gain_effect.cpp
@@ -1,4 +1,4 @@
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <math.h>
 
 #include "effect_util.h"
@@ -7,6 +7,8 @@
 
 using namespace std;
 
+namespace movit {
+
 LiftGammaGainEffect::LiftGammaGainEffect()
 	: lift(0.0f, 0.0f, 0.0f),
 	  gamma(1.0f, 1.0f, 1.0f),
@@ -15,6 +17,8 @@ LiftGammaGainEffect::LiftGammaGainEffect()
 	register_vec3("lift", (float *)&lift);
 	register_vec3("gamma", (float *)&gamma);
 	register_vec3("gain", (float *)&gain);
+	register_uniform_vec3("gain_pow_inv_gamma", (float *)&uniform_gain_pow_inv_gamma);
+	register_uniform_vec3("inv_gamma_22", (float *)&uniform_inv_gamma22);
 }
 
 string LiftGammaGainEffect::output_fragment_shader()
@@ -26,15 +30,15 @@ void LiftGammaGainEffect::set_gl_state(GLuint glsl_program_num, const string &pr
 {
 	Effect::set_gl_state(glsl_program_num, prefix, sampler_num);
 
-	RGBTriplet gain_pow_inv_gamma(
+	uniform_gain_pow_inv_gamma = RGBTriplet(
 		pow(gain.r, 1.0f / gamma.r),
 		pow(gain.g, 1.0f / gamma.g),
 		pow(gain.b, 1.0f / gamma.b));
-	set_uniform_vec3(glsl_program_num, prefix, "gain_pow_inv_gamma", (float *)&gain_pow_inv_gamma);
 
-	RGBTriplet inv_gamma_22(
+	uniform_inv_gamma22 = RGBTriplet(
 		2.2f / gamma.r,
 		2.2f / gamma.g,
 		2.2f / gamma.b);
-	set_uniform_vec3(glsl_program_num, prefix, "inv_gamma_22", (float *)&inv_gamma_22);
 }
+
+}  // namespace movit