Handle sampler2D uniforms specially.

[movit] / effect.cpp

diff --git a/effect.cpp b/effect.cpp
index df73eeae2078b7834c7798a1afa9d30b83a26c4b..060bf7dd35fca361c4c160c6b71cf242104019f8 100644 (file)
--- a/effect.cpp
+++ b/effect.cpp
@@ -95,34 +95,34 @@ void Effect::set_gl_state(GLuint glsl_program_num, const string& prefix, unsigne
 
 void Effect::clear_gl_state() {}
 
-void Effect::register_uniform_bool(const std::string &key, const bool *value)
+void Effect::register_uniform_sampler2d(const std::string &key, const GLint *value)
 {
-       Uniform<bool> uniform;
+       Uniform<int> uniform;
        uniform.name = key;
        uniform.value = value;
        uniform.num_values = 1;
        uniform.location = -1;
-       uniforms_bool.push_back(uniform);
+       uniforms_sampler2d.push_back(uniform);
 }
 
-void Effect::register_uniform_int(const std::string &key, const int *value)
+void Effect::register_uniform_bool(const std::string &key, const bool *value)
 {
-       Uniform<int> uniform;
+       Uniform<bool> uniform;
        uniform.name = key;
        uniform.value = value;
        uniform.num_values = 1;
        uniform.location = -1;
-       uniforms_int.push_back(uniform);
+       uniforms_bool.push_back(uniform);
 }
 
-void Effect::register_uniform_sampler2d(const std::string &key, const GLint *value)
+void Effect::register_uniform_int(const std::string &key, const int *value)
 {
        Uniform<int> uniform;
        uniform.name = key;
        uniform.value = value;
        uniform.num_values = 1;
        uniform.location = -1;
-       uniforms_sampler2d.push_back(uniform);
+       uniforms_int.push_back(uniform);
 }
 
 void Effect::register_uniform_float(const std::string &key, const float *value)