Remove some unneeded conversions from ResampleEffect. Speeds up texture generation...

[movit] / effect_util.cpp

diff --git a/effect_util.cpp b/effect_util.cpp
index f49b47707bde4920fbace424fca80113c979de59..dbeb48b0381a12bd682c018c799199c5869f39cb 100644 (file)
--- 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,6 +6,8 @@
 
 using namespace std;
 
+namespace movit {
+
 GLint get_uniform_location(GLuint glsl_program_num, const string &prefix, const string &key)
 {
        string name = prefix + "_" + key;
@@ -67,6 +69,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 +110,5 @@ void set_uniform_mat3(GLuint glsl_program_num, const string &prefix, const strin
        glUniformMatrix3fv(location, 1, GL_FALSE, matrixf);
        check_error();
 }
+
+}  // namespace movit