Merge branch 'master' into epoxy

[movit] / sandbox_effect.cpp

diff --git a/sandbox_effect.cpp b/sandbox_effect.cpp
index 840611eb51f958efb269e4ad29096c5625fa8cbb..1ec093d43fbda2fd9bb370f076f9fbd6aadb9c1a 100644 (file)
--- a/sandbox_effect.cpp
+++ b/sandbox_effect.cpp
@@ -1,10 +1,12 @@
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 
 #include "sandbox_effect.h"
 #include "util.h"
 
 using namespace std;
 
+namespace movit {
+
 SandboxEffect::SandboxEffect()
        : parm(0.0f)
 {
@@ -22,3 +24,5 @@ void SandboxEffect::set_gl_state(GLuint glsl_program_num, const string &prefix,
 
        // Any OpenGL state you might want to set, goes here.
 }
+
+}  // namespace movit