Merge branch 'master' into epoxy

[movit] / effect_util.cpp

diff --git a/effect_util.cpp b/effect_util.cpp
index f49b47707bde4920fbace424fca80113c979de59..b671620388719b4e7943698124f3fe175c40ab01 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;
@@ -97,3 +99,5 @@ void set_uniform_mat3(GLuint glsl_program_num, const string &prefix, const strin
        glUniformMatrix3fv(location, 1, GL_FALSE, matrixf);
        check_error();
 }
+
+}  // namespace movit