X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=sandbox_effect.cpp;h=3f24a42503c9fec5190e9f72b2a3c6d8b683929f;hp=85fa9001589a7356855acfcfdbc3d3fcadecd870;hb=5fea9e6cd7aba98acc8b026801d268a3111eba63;hpb=0b4a4101426130d2b7037cdb219d5c05b8d4c3d3 diff --git a/sandbox_effect.cpp b/sandbox_effect.cpp index 85fa900..3f24a42 100644 --- a/sandbox_effect.cpp +++ b/sandbox_effect.cpp @@ -1,9 +1,6 @@ -#define GL_GLEXT_PROTOTYPES 1 - #include -#include -#include #include +#include #include "sandbox_effect.h" #include "util.h" @@ -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. }