X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect.cpp;h=3a4f8c8c3b30c8bbe3b2d4e423015e40b2af2825;hp=c17ad3f14310f5ef6e06fa586babf1af7d9441f2;hb=aa72f1070c44ed0217ce1ffde599d5c40864ac4a;hpb=bfa58911af9e945f3532a2c48306b4e9e293e0f7

diff --git a/effect.cpp b/effect.cpp
index c17ad3f..3a4f8c8 100644
--- a/effect.cpp
+++ b/effect.cpp
@@ -9,10 +9,10 @@
 #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;
-	GLuint l = glGetUniformLocation(glsl_program_num, name.c_str());
+	GLint l = glGetUniformLocation(glsl_program_num, name.c_str());
 	if (l == -1) {
 		return;
 	}
@@ -21,10 +21,22 @@ void set_uniform_float(GLhandleARB glsl_program_num, const std::string &prefix,
 	check_error();
 }
 
-void set_uniform_vec3(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;
-	GLuint l = glGetUniformLocation(glsl_program_num, name.c_str());
+	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(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());
 	if (l == -1) {
 		return;
 	}
@@ -51,6 +63,15 @@ bool Effect::set_float(const std::string &key, float value)
 	return true;
 }
 
+bool Effect::set_vec2(const std::string &key, const float *values)
+{
+	if (params_vec2.count(key) == 0) {
+		return false;
+	}
+	memcpy(params_vec2[key], values, sizeof(float) * 2);
+	return true;
+}
+
 bool Effect::set_vec3(const std::string &key, const float *values)
 {
 	if (params_vec3.count(key) == 0) {
@@ -72,6 +93,12 @@ void Effect::register_float(const std::string &key, float *value)
 	params_float[key] = value;
 }
 
+void Effect::register_vec2(const std::string &key, float *values)
+{
+	assert(params_vec2.count(key) == 0);
+	params_vec2[key] = values;
+}
+
 void Effect::register_vec3(const std::string &key, float *values)
 {
 	assert(params_vec3.count(key) == 0);
@@ -90,6 +117,13 @@ std::string Effect::output_convenience_uniforms()
 		sprintf(buf, "uniform float PREFIX(%s);\n", it->first.c_str());
 		output.append(buf);
 	}
+	for (std::map<std::string, float*>::const_iterator it = params_vec2.begin();
+	     it != params_vec2.end();
+	     ++it) {
+		char buf[256];
+		sprintf(buf, "uniform vec2 PREFIX(%s);\n", it->first.c_str());
+		output.append(buf);
+	}
 	for (std::map<std::string, float*>::const_iterator it = params_vec3.begin();
 	     it != params_vec3.end();
 	     ++it) {
@@ -100,13 +134,18 @@ 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();
 	     ++it) {
 		set_uniform_float(glsl_program_num, prefix, it->first, *it->second);
 	}
+	for (std::map<std::string, float*>::const_iterator it = params_vec2.begin();
+	     it != params_vec2.end();
+	     ++it) {
+		set_uniform_vec2(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) {