X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect.cpp;h=4f2bfd616a3400f1ea3a6929ff5d755f3d9b0f2f;hp=02fc1f729cd5bec757860fe3039624a145392176;hb=c5ec91799b647b647c57da323acbf5076f9518de;hpb=2ced784c6599cb0b21427481ee17f4c8f6afdada

diff --git a/effect.cpp b/effect.cpp
index 02fc1f7..4f2bfd6 100644
--- a/effect.cpp
+++ b/effect.cpp
@@ -9,51 +9,75 @@
 #include <GL/gl.h>
 #include <GL/glext.h>
 
-void set_uniform_int(GLuint glsl_program_num, const std::string &prefix, const std::string &key, int value)
+GLint get_uniform_location(GLuint glsl_program_num, const std::string &prefix, const std::string &key)
 {
 	std::string name = prefix + "_" + key;
-	GLint l = glGetUniformLocation(glsl_program_num, name.c_str());
-	if (l == -1) {
+	return glGetUniformLocation(glsl_program_num, name.c_str());
+}
+
+void set_uniform_int(GLuint glsl_program_num, const std::string &prefix, const std::string &key, int value)
+{
+	GLint location = get_uniform_location(glsl_program_num, prefix, key);
+	if (location == -1) {
 		return;
 	}
 	check_error();
-	glUniform1i(l, value);
+	glUniform1i(location, value);
 	check_error();
 }
 
 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());
-	if (l == -1) {
+	GLint location = get_uniform_location(glsl_program_num, prefix, key);
+	if (location == -1) {
+		return;
+	}
+	check_error();
+	glUniform1f(location, value);
+	check_error();
+}
+
+void set_uniform_float_array(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values, size_t num_values)
+{
+	GLint location = get_uniform_location(glsl_program_num, prefix, key);
+	if (location == -1) {
 		return;
 	}
 	check_error();
-	glUniform1f(l, value);
+	glUniform1fv(location, num_values, values);
 	check_error();
 }
 
 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());
-	if (l == -1) {
+	GLint location = get_uniform_location(glsl_program_num, prefix, key);
+	if (location == -1) {
 		return;
 	}
 	check_error();
-	glUniform2fv(l, 1, values);
+	glUniform2fv(location, 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) {
+	GLint location = get_uniform_location(glsl_program_num, prefix, key);
+	if (location == -1) {
+		return;
+	}
+	check_error();
+	glUniform3fv(location, 1, values);
+	check_error();
+}
+
+void set_uniform_vec4_array(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values, size_t num_values)
+{
+	GLint location = get_uniform_location(glsl_program_num, prefix, key);
+	if (location == -1) {
 		return;
 	}
 	check_error();
-	glUniform3fv(l, 1, values);
+	glUniform4fv(location, num_values, values);
 	check_error();
 }
 
@@ -147,7 +171,7 @@ void Effect::invalidate_1d_texture(const std::string &key)
 
 // 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();