Retire the GL_GENERATE_MIPMAP hack for FlatInput.

[movit] / effect.cpp

diff --git a/effect.cpp b/effect.cpp
index 08e9c3af2dea5ffb3d95751d194c71f6b00e7598..b17c0d62c6d524aa8909ad619c03f228f5b322d4 100644 (file)
--- a/effect.cpp
+++ b/effect.cpp
@@ -1,50 +1,13 @@
-#define GL_GLEXT_PROTOTYPES 1
-
+#include <GL/glew.h>
+#include <assert.h>
 #include <stdio.h>
 #include <string.h>
-#include <assert.h>
+#include <utility>
+
 #include "effect.h"
+#include "effect_util.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;
-       GLint l = glGetUniformLocation(glsl_program_num, name.c_str());
-       if (l == -1) {
-               return;
-       }
-       check_error();
-       glUniform1f(l, value);
-       check_error();
-}
-
-void set_uniform_vec2(GLhandleARB 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());
-       if (l == -1) {
-               return;
-       }
-       check_error();
-       glUniform2fv(l, 1, values);
-       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;
-       GLint 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)
 {
        if (params_int.count(key) == 0) {
@@ -81,6 +44,15 @@ bool Effect::set_vec3(const std::string &key, const float *values)
        return true;
 }
 
+bool Effect::set_vec4(const std::string &key, const float *values)
+{
+       if (params_vec4.count(key) == 0) {
+               return false;
+       }
+       memcpy(params_vec4[key], values, sizeof(float) * 4);
+       return true;
+}
+
 void Effect::register_int(const std::string &key, int *value)
 {
        assert(params_int.count(key) == 0);
@@ -105,9 +77,15 @@ void Effect::register_vec3(const std::string &key, float *values)
        params_vec3[key] = values;
 }
 
+void Effect::register_vec4(const std::string &key, float *values)
+{
+       assert(params_vec4.count(key) == 0);
+       params_vec4[key] = values;
+}
+
 // Output convenience uniforms for each parameter.
 // These will be filled in per-frame.
-std::string Effect::output_convenience_uniforms()
+std::string Effect::output_convenience_uniforms() const
 {
        std::string output = "";
        for (std::map<std::string, float*>::const_iterator it = params_float.begin();
@@ -131,10 +109,17 @@ std::string Effect::output_convenience_uniforms()
                sprintf(buf, "uniform vec3 PREFIX(%s);\n", it->first.c_str());
                output.append(buf);
        }
+       for (std::map<std::string, float*>::const_iterator it = params_vec4.begin();
+            it != params_vec4.end();
+            ++it) {
+               char buf[256];
+               sprintf(buf, "uniform vec4 PREFIX(%s);\n", it->first.c_str());
+               output.append(buf);
+       }
        return output;
 }
 
-void Effect::set_uniforms(GLhandleARB glsl_program_num, const std::string& prefix)
+void Effect::set_gl_state(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num)
 {
        for (std::map<std::string, float*>::const_iterator it = params_float.begin();
             it != params_float.end();
@@ -151,4 +136,11 @@ void Effect::set_uniforms(GLhandleARB glsl_program_num, const std::string& prefi
             ++it) {
                set_uniform_vec3(glsl_program_num, prefix, it->first, it->second);
        }
+       for (std::map<std::string, float*>::const_iterator it = params_vec4.begin();
+            it != params_vec4.end();
+            ++it) {
+               set_uniform_vec4(glsl_program_num, prefix, it->first, it->second);
+       }
 }
+
+void Effect::clear_gl_state() {}