X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=effect.cpp;h=4f2bfd616a3400f1ea3a6929ff5d755f3d9b0f2f;hb=dfc674ba521d6c596399deff06afc2eb1b7b49d7;hp=4cc1775d75587305e4504fdf0a534c78d73ec817;hpb=c0461658ca2abaa10aae42f40ffee7e5128bc7ab;p=movit

diff --git a/effect.cpp b/effect.cpp
index 4cc1775..4f2bfd6 100644
--- a/effect.cpp
+++ b/effect.cpp
@@ -9,63 +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(l, value);
+	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)
 {
-	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();
-	glUniform1fv(l, num_values, values);
+	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();
 }