Actually set all the right uniforms, so we have a picture on screen.

diff --git a/effect.cpp b/effect.cpp
index 927acd52e7934774ba0b43eea4b61202f7b9bf4e..c17ad3f14310f5ef6e06fa586babf1af7d9441f2 100644 (file)
--- a/effect.cpp
+++ b/effect.cpp
@@ -1,7 +1,37 @@
+#define GL_GLEXT_PROTOTYPES 1
+
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 #include "effect.h"
+#include "util.h"
+
+#include <GL/gl.h>
+#include <GL/glext.h>
+
+void set_uniform_float(GLhandleARB glsl_program_num, const std::string &prefix, const std::string &key, float value)
+{
+       std::string name = prefix + "_" + key;
+       GLuint l = glGetUniformLocation(glsl_program_num, name.c_str());
+       if (l == -1) {
+               return;
+       }
+       check_error();
+       glUniform1f(l, value);
+       check_error();
+}
+
+void set_uniform_vec3(GLhandleARB glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
+{
+       std::string name = prefix + "_" + key;
+       GLuint l = glGetUniformLocation(glsl_program_num, name.c_str());
+       if (l == -1) {
+               return;
+       }
+       check_error();
+       glUniform3fv(l, 1, values);
+       check_error();
+}
 
 bool Effect::set_int(const std::string &key, int value)
 {
@@ -69,3 +99,17 @@ std::string Effect::output_convenience_uniforms()
        }
        return output;
 }
+
+void Effect::set_uniforms(GLhandleARB glsl_program_num, const std::string& prefix)
+{
+       for (std::map<std::string, float*>::const_iterator it = params_float.begin();
+            it != params_float.end();
+            ++it) {
+               set_uniform_float(glsl_program_num, prefix, it->first, *it->second);
+       }
+       for (std::map<std::string, float*>::const_iterator it = params_vec3.begin();
+            it != params_vec3.end();
+            ++it) {
+               set_uniform_vec3(glsl_program_num, prefix, it->first, it->second);
+       }
+}

diff --git a/effect.h b/effect.h
index c53a1556b28e500396387344f2dd6fd8aab28d27..3585e2df9a168a0439d7da808471dd0871dee102 100644 (file)
--- a/effect.h
+++ b/effect.h
@@ -4,6 +4,8 @@
 #include <map>
 #include <string>
 
+#include <GL/gl.h>
+
 // Can alias on a float[3].
 struct RGBTriplet {
        RGBTriplet(float r, float g, float b)
@@ -12,6 +14,10 @@ struct RGBTriplet {
        float r, g, b;
 };
 
+// Convenience functions that deal with prepending the prefix..
+void set_uniform_float(GLhandleARB glsl_program_num, const std::string &prefix, const std::string &key, float value);
+void set_uniform_vec3(GLhandleARB glsl_program_num, const std::string &prefix, const std::string &key, const float *values);
+
 class Effect {
 public: 
        virtual bool needs_linear_light() { return true; }
@@ -22,6 +28,8 @@ public:
        virtual std::string output_convenience_uniforms();
        virtual std::string output_glsl() = 0;
 
+       virtual void set_uniforms(GLhandleARB glsl_program_num, const std::string& prefix);
+
        // Neither of these take ownership.
        bool set_int(const std::string&, int value);
        bool set_float(const std::string &key, float value);

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 56d470fb572e7764e0c78d02bf8d8a0e0a08f506..1ff57d75672b3769121f7c0956941c6538415620 100644 (file)
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -191,9 +191,11 @@ void EffectChain::render_to_screen(unsigned char *src)
        check_error();
        glUniform1i(glGetUniformLocation(glsl_program_num, "input_tex"), 0);
 
-       //for (unsigned i = 0; i < effects.size(); ++i) {
-       //      effects[i]->set_uniforms();
-       //}
+       for (unsigned i = 0; i < effects.size(); ++i) {
+               char effect_id[256];
+               sprintf(effect_id, "eff%d", i);
+               effects[i]->set_uniforms(glsl_program_num, effect_id);
+       }
 
        glDisable(GL_BLEND);
        check_error();

diff --git a/lift_gamma_gain_effect.cpp b/lift_gamma_gain_effect.cpp
index 149cb4463931dc9836df4360dd35a2480ea3d0fd..acfeb86875a8841aabbc91a8602186713371087e 100644 (file)
--- a/lift_gamma_gain_effect.cpp
+++ b/lift_gamma_gain_effect.cpp
@@ -1,3 +1,9 @@
+#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"
 
@@ -17,3 +23,20 @@ std::string LiftGammaGainEffect::output_glsl()
 {
        return read_file("lift_gamma_gain_effect.glsl");
 }
+
+void LiftGammaGainEffect::set_uniforms(GLhandleARB glsl_program_num, const std::string &prefix)
+{
+       Effect::set_uniforms(glsl_program_num, prefix);
+
+       RGBTriplet gain_pow_inv_gamma(
+               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(
+               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);
+}

diff --git a/lift_gamma_gain_effect.h b/lift_gamma_gain_effect.h
index 26eb583f3489f0c1101db3dec461bc37a4cfe9a4..097195583264764189283efda1bbc5d3cdf73f81 100644 (file)
--- a/lift_gamma_gain_effect.h
+++ b/lift_gamma_gain_effect.h
@@ -8,6 +8,8 @@ public:
        LiftGammaGainEffect();
        std::string output_glsl();
 
+       void set_uniforms(GLhandleARB glsl_program_num, const std::string &prefix);
+
 private:
        RGBTriplet lift, gamma, gain;
        float saturation;

diff --git a/main.cpp b/main.cpp
index 3b4645071da51d3604e919dd60f455452f763216..d82369447b69ac8986bb4c55e34d69e9352a57cc 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -44,9 +44,10 @@ void update_hsv(Effect *lift_gamma_gain_effect)
        hsv2rgb(gamma_theta, gamma_rad, gamma_v * 2.0f, &gamma.r, &gamma.g, &gamma.b);
        hsv2rgb(gain_theta, gain_rad, gain_v * 4.0f, &gain.r, &gain.g, &gain.b);
 
-       lift_gamma_gain_effect->set_vec3("lift", (float *)&lift);
-       lift_gamma_gain_effect->set_vec3("gamma", (float *)&gamma);
-       lift_gamma_gain_effect->set_vec3("gain", (float *)&gain);
+       bool ok = lift_gamma_gain_effect->set_vec3("lift", (float *)&lift);
+       ok = ok && lift_gamma_gain_effect->set_vec3("gamma", (float *)&gamma);
+       ok = ok && lift_gamma_gain_effect->set_vec3("gain", (float *)&gain);
+       assert(ok);
 
        if (saturation < 0.0) {
                saturation = 0.0;