X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect.cpp;fp=effect.cpp;h=060bf7dd35fca361c4c160c6b71cf242104019f8;hp=df73eeae2078b7834c7798a1afa9d30b83a26c4b;hb=c6c3847558f3724f2b8973aa503de0e6c3de5816;hpb=9c12e38b7cd88a77ef297d080b7c41e6bd6326fb

diff --git a/effect.cpp b/effect.cpp
index df73eea..060bf7d 100644
--- 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)