Merge branch 'master' into epoxy

[movit] / effect_util.h

diff --git a/effect_util.h b/effect_util.h
index 13a775401b88652149421717158e680071fdd088..a1588efd71da6203a3cb137e1e1c9c38b62409b6 100644 (file)
--- a/effect_util.h
+++ b/effect_util.h
@@ -1,10 +1,10 @@
-#ifndef _EFFECT_UTIL_H
-#define _EFFECT_UTIL_H 1
+#ifndef _MOVIT_EFFECT_UTIL_H
+#define _MOVIT_EFFECT_UTIL_H 1
 
 // Utilities that are often useful for implementing Effect instances,
 // but don't need to be included from effect.h.
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <assert.h>
 #include <stddef.h>
 #include <Eigen/Core>
@@ -14,6 +14,8 @@
 
 #include "util.h"
 
+namespace movit {
+
 class EffectChain;
 class Node;
 
@@ -24,7 +26,10 @@ void set_uniform_float(GLuint glsl_program_num, const std::string &prefix, const
 void set_uniform_vec2(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values);
 void set_uniform_vec3(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values);
 void set_uniform_vec4(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values);
+void set_uniform_vec2_array(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values, size_t num_values);
 void set_uniform_vec4_array(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values, size_t num_values);
 void set_uniform_mat3(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const Eigen::Matrix3d &matrix);
 
-#endif // !defined(_EFFECT_UTIL_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_EFFECT_UTIL_H)