X-Git-Url: http://git.mutantstargoat.com?p=demo;a=blobdiff_plain;f=src%2Fshader.cc;h=b8ca8ef4d6c0fa6453b1eca3c3567f7a1d46418c;hp=8fa50ae0080463f312931a629bb3f13f336c3d5d;hb=31bab00bc3b476be9814c1ee06b9a2f0dc77d4e9;hpb=4081e0e8f0f391aa25d67b73c45e73ccacff0f00 diff --git a/src/shader.cc b/src/shader.cc index 8fa50ae..b8ca8ef 100644 --- a/src/shader.cc +++ b/src/shader.cc @@ -2,6 +2,8 @@ #include #include "shader.h" +ShaderProgram *current_program; + Shader::Shader() {} Shader::~Shader() { @@ -56,6 +58,8 @@ bool Shader::load(const char *fname, SType type) ShaderProgram::ShaderProgram() { + current_program = 0; + int len = sizeof shaders / sizeof *shaders; for(int i=0; itype < sizeof shaders / sizeof *shaders); +// shaders[sdr->type] = sdr; +// } + +ShaderProgram *get_current_program() { - assert(sdr->type < sizeof shaders / sizeof *shaders); - shaders[sdr->type] = sdr; + return current_program; } \ No newline at end of file