Revert "Move calculation of normalized position for the vignette into the vertex...

[movit] / effect.cpp

diff --git a/effect.cpp b/effect.cpp
index 08e9c3af2dea5ffb3d95751d194c71f6b00e7598..6f9d4c55edb032f130c92d2fe678b8ff079dc0b2 100644 (file)
--- a/effect.cpp
+++ b/effect.cpp
@@ -9,7 +9,7 @@
 #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)
+void set_uniform_float(GLuint glsl_program_num, const std::string &prefix, const std::string &key, float value)
 {
        std::string name = prefix + "_" + key;
        GLint l = glGetUniformLocation(glsl_program_num, name.c_str());
@@ -21,7 +21,7 @@ void set_uniform_float(GLhandleARB glsl_program_num, const std::string &prefix,
        check_error();
 }
 
-void set_uniform_vec2(GLhandleARB glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
+void set_uniform_vec2(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
 {
        std::string name = prefix + "_" + key;
        GLint l = glGetUniformLocation(glsl_program_num, name.c_str());
@@ -33,7 +33,7 @@ void set_uniform_vec2(GLhandleARB glsl_program_num, const std::string &prefix, c
        check_error();
 }
 
-void set_uniform_vec3(GLhandleARB glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
+void set_uniform_vec3(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
 {
        std::string name = prefix + "_" + key;
        GLint l = glGetUniformLocation(glsl_program_num, name.c_str());
@@ -134,7 +134,7 @@ std::string Effect::output_convenience_uniforms()
        return output;
 }
 
-void Effect::set_uniforms(GLhandleARB glsl_program_num, const std::string& prefix)
+void Effect::set_uniforms(GLuint glsl_program_num, const std::string& prefix)
 {
        for (std::map<std::string, float*>::const_iterator it = params_float.begin();
             it != params_float.end();
@@ -152,3 +152,8 @@ void Effect::set_uniforms(GLhandleARB glsl_program_num, const std::string& prefi
                set_uniform_vec3(glsl_program_num, prefix, it->first, it->second);
        }
 }
+
+std::string Effect::output_vertex_shader()
+{
+       return read_file("identity.vert");
+}