X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=lift_gamma_gain_effect.cpp;h=c26386c644ffa5cc2756646b825975fb4a29168e;hp=acfeb86875a8841aabbc91a8602186713371087e;hb=3d1f6c11c53cd9d3d5c1fb60f4accf050b7f135e;hpb=bfa58911af9e945f3532a2c48306b4e9e293e0f7

diff --git a/lift_gamma_gain_effect.cpp b/lift_gamma_gain_effect.cpp
index acfeb86..c26386c 100644
--- a/lift_gamma_gain_effect.cpp
+++ b/lift_gamma_gain_effect.cpp
@@ -1,32 +1,27 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <math.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
 
 #include "lift_gamma_gain_effect.h"
 #include "util.h"
+#include "opengl.h"
 
 LiftGammaGainEffect::LiftGammaGainEffect()
 	: lift(0.0f, 0.0f, 0.0f),
 	  gamma(1.0f, 1.0f, 1.0f),
-	  gain(1.0f, 1.0f, 1.0f),
-	  saturation(1.0f)
+	  gain(1.0f, 1.0f, 1.0f)
 {
 	register_vec3("lift", (float *)&lift);
 	register_vec3("gamma", (float *)&gamma);
 	register_vec3("gain", (float *)&gain);
-	register_float("saturation", &saturation);
 }
 
-std::string LiftGammaGainEffect::output_glsl()
+std::string LiftGammaGainEffect::output_fragment_shader()
 {
-	return read_file("lift_gamma_gain_effect.glsl");
+	return read_file("lift_gamma_gain_effect.frag");
 }
 
-void LiftGammaGainEffect::set_uniforms(GLhandleARB glsl_program_num, const std::string &prefix)
+void LiftGammaGainEffect::set_gl_state(GLuint glsl_program_num, const std::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,5 +33,5 @@ void LiftGammaGainEffect::set_uniforms(GLhandleARB glsl_program_num, const std::
 		2.2f / gamma.r,
 		2.2f / gamma.g,
 		2.2f / gamma.b);
-	set_uniform_vec3(glsl_program_num, prefix, "inv_gamma_22", (float *)&gain_pow_inv_gamma);
+	set_uniform_vec3(glsl_program_num, prefix, "inv_gamma_22", (float *)&inv_gamma_22);
 }