Merge branch 'master' into epoxy

[movit] / sandbox_effect.cpp

diff --git a/sandbox_effect.cpp b/sandbox_effect.cpp
index 85fa9001589a7356855acfcfdbc3d3fcadecd870..1ec093d43fbda2fd9bb370f076f9fbd6aadb9c1a 100644 (file)
--- a/sandbox_effect.cpp
+++ b/sandbox_effect.cpp
@@ -1,27 +1,28 @@
-#define GL_GLEXT_PROTOTYPES 1
-
-#include <math.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
-#include <assert.h>
+#include <epoxy/gl.h>
 
 #include "sandbox_effect.h"
 #include "util.h"
 
+using namespace std;
+
+namespace movit {
+
 SandboxEffect::SandboxEffect()
        : parm(0.0f)
 {
        register_float("parm", &parm);
 }
 
-std::string SandboxEffect::output_fragment_shader()
+string SandboxEffect::output_fragment_shader()
 {
        return read_file("sandbox_effect.frag");
 }
 
-void SandboxEffect::set_uniforms(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num)
+void SandboxEffect::set_gl_state(GLuint glsl_program_num, const string &prefix, unsigned *sampler_num)
 {
-       Effect::set_uniforms(glsl_program_num, prefix, sampler_num);
+       Effect::set_gl_state(glsl_program_num, prefix, sampler_num);
 
        // Any OpenGL state you might want to set, goes here.
 }
+
+}  // namespace movit