X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=sandbox_effect.cpp;h=561048d416fd0241af4e4bac1c9edc34e9a4c1e3;hp=85fa9001589a7356855acfcfdbc3d3fcadecd870;hb=3d1f6c11c53cd9d3d5c1fb60f4accf050b7f135e;hpb=0b4a4101426130d2b7037cdb219d5c05b8d4c3d3

diff --git a/sandbox_effect.cpp b/sandbox_effect.cpp
index 85fa900..561048d 100644
--- a/sandbox_effect.cpp
+++ b/sandbox_effect.cpp
@@ -1,12 +1,9 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <math.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
 #include <assert.h>
 
 #include "sandbox_effect.h"
 #include "util.h"
+#include "opengl.h"
 
 SandboxEffect::SandboxEffect()
 	: parm(0.0f)
@@ -19,9 +16,9 @@ std::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 std::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.
 }