X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_util.cpp;h=4036caf6a49ecb684a4af50a509de1bb3413b674;hp=f49b47707bde4920fbace424fca80113c979de59;hb=abd6d031918db487e0724218dc604d4a51e5f650;hpb=85f9719bf3519b1f1942738d11601584f5d38725

diff --git a/effect_util.cpp b/effect_util.cpp
index f49b477..4036caf 100644
--- a/effect_util.cpp
+++ b/effect_util.cpp
@@ -1,4 +1,4 @@
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <Eigen/Core>
 #include <stddef.h>
 #include <string>
@@ -6,12 +6,32 @@
 
 using namespace std;
 
+namespace movit {
+
 GLint get_uniform_location(GLuint glsl_program_num, const string &prefix, const string &key)
 {
 	string name = prefix + "_" + key;
 	return glGetUniformLocation(glsl_program_num, name.c_str());
 }
 
+void get_uniform_offset_and_size(GLuint glsl_program_num, const string &prefix, const string &key, GLint *offset, GLint *size)
+{
+	string name = prefix + "_" + key;
+	GLuint index;
+	const GLchar *name_cstr = name.c_str();
+	glGetUniformIndices(glsl_program_num, 1, &name_cstr, &index);
+	check_error();
+	if (index == GL_INVALID_INDEX) {
+		*offset = -1;
+		*size = 0;
+		return;
+	}
+	glGetActiveUniformsiv(glsl_program_num, 1, &index, GL_UNIFORM_OFFSET, offset);
+	check_error();
+	glGetActiveUniformsiv(glsl_program_num, 1, &index, GL_UNIFORM_SIZE, size);
+	check_error();
+}
+
 void set_uniform_int(GLuint glsl_program_num, const string &prefix, const string &key, int value)
 {
 	GLint location = get_uniform_location(glsl_program_num, prefix, key);
@@ -67,6 +87,17 @@ void set_uniform_vec4(GLuint glsl_program_num, const string &prefix, const strin
 	check_error();
 }
 
+void set_uniform_vec2_array(GLuint glsl_program_num, const string &prefix, const 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();
+	glUniform2fv(location, num_values, values);
+	check_error();
+}
+
 void set_uniform_vec4_array(GLuint glsl_program_num, const string &prefix, const string &key, const float *values, size_t num_values)
 {
 	GLint location = get_uniform_location(glsl_program_num, prefix, key);
@@ -97,3 +128,5 @@ void set_uniform_mat3(GLuint glsl_program_num, const string &prefix, const strin
 	glUniformMatrix3fv(location, 1, GL_FALSE, matrixf);
 	check_error();
 }
+
+}  // namespace movit