X-Git-Url: http://git.mutantstargoat.com?p=demo;a=blobdiff_plain;f=src%2Fopengl%2Fshader-gl.cc;h=67aa0968cc2986b18185740feaec9f4fe07f1c1b;hp=c82a7d7e2cfa9e414a93d13ad3eef19bcadb3808;hb=31bab00bc3b476be9814c1ee06b9a2f0dc77d4e9;hpb=369d75c73bf926a6dbcf4d740c8664bbb401602a diff --git a/src/opengl/shader-gl.cc b/src/opengl/shader-gl.cc index c82a7d7..67aa096 100644 --- a/src/opengl/shader-gl.cc +++ b/src/opengl/shader-gl.cc @@ -32,6 +32,7 @@ bool ShaderGL::create(char *buf, unsigned int bsz, const char *fname) fprintf(stderr, "Unknown shader type.\n"); return false; } + name = std::string(fname); sdr = glCreateShader(stype); /* compile */ @@ -92,13 +93,6 @@ ShaderProgramGL::~ShaderProgramGL() destroy(); } -void ShaderProgramGL::delete_shaders() -{ - for(unsigned int i=0; i<(sizeof shaders) / (sizeof *shaders); ++i) { - delete shaders[i]; - } -} - bool ShaderProgramGL::create() { prog = glCreateProgram(); @@ -178,8 +172,6 @@ void ShaderProgramGL::destroy() glDeleteProgram(prog); prog = 0; is_linked = false; - - delete_shaders(); } void ShaderProgramGL::attach_shader(Shader *shader)