X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=lift_gamma_gain_effect.cpp;h=e9832f458a6cb83f07cbe86de93aefb2f0462043;hp=993525daa655cee80b9139e8c2b5825e3dbac1fa;hb=60e4852ff1b04c525a9e3f1c98a1017db28b27bd;hpb=d4542f76df5d26843c68b1467e76722cffd801a1

diff --git a/lift_gamma_gain_effect.cpp b/lift_gamma_gain_effect.cpp
index 993525d..e9832f4 100644
--- a/lift_gamma_gain_effect.cpp
+++ b/lift_gamma_gain_effect.cpp
@@ -1,12 +1,14 @@
-#define GL_GLEXT_PROTOTYPES 1
-
+#include <GL/glew.h>
 #include <math.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
 
+#include "effect_util.h"
 #include "lift_gamma_gain_effect.h"
 #include "util.h"
 
+using namespace std;
+
+namespace movit {
+
 LiftGammaGainEffect::LiftGammaGainEffect()
 	: lift(0.0f, 0.0f, 0.0f),
 	  gamma(1.0f, 1.0f, 1.0f),
@@ -17,14 +19,14 @@ LiftGammaGainEffect::LiftGammaGainEffect()
 	register_vec3("gain", (float *)&gain);
 }
 
-std::string LiftGammaGainEffect::output_fragment_shader()
+string LiftGammaGainEffect::output_fragment_shader()
 {
 	return read_file("lift_gamma_gain_effect.frag");
 }
 
-void LiftGammaGainEffect::set_uniforms(GLuint glsl_program_num, const std::string &prefix)
+void LiftGammaGainEffect::set_gl_state(GLuint glsl_program_num, const string &prefix, unsigned *sampler_num)
 {
-	Effect::set_uniforms(glsl_program_num, prefix);
+	Effect::set_gl_state(glsl_program_num, prefix, sampler_num);
 
 	RGBTriplet gain_pow_inv_gamma(
 		pow(gain.r, 1.0f / gamma.r),
@@ -38,3 +40,5 @@ void LiftGammaGainEffect::set_uniforms(GLuint glsl_program_num, const std::strin
 		2.2f / gamma.b);
 	set_uniform_vec3(glsl_program_num, prefix, "inv_gamma_22", (float *)&inv_gamma_22);
 }
+
+}  // namespace movit