projects
/
demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed shader manager, added it
[demo]
/
src
/
opengl
/
shader-gl.cc
diff --git
a/src/opengl/shader-gl.cc
b/src/opengl/shader-gl.cc
index
c82a7d7
..
67aa096
100644
(file)
--- 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;
}
fprintf(stderr, "Unknown shader type.\n");
return false;
}
+ name = std::string(fname);
sdr = glCreateShader(stype);
/* compile */
sdr = glCreateShader(stype);
/* compile */
@@
-92,13
+93,6
@@
ShaderProgramGL::~ShaderProgramGL()
destroy();
}
destroy();
}
-void ShaderProgramGL::delete_shaders()
-{
- for(unsigned int i=0; i<(sizeof shaders) / (sizeof *shaders); ++i) {
- delete shaders[i];
- }
-}
-
bool ShaderProgramGL::create()
{
prog = glCreateProgram();
bool ShaderProgramGL::create()
{
prog = glCreateProgram();
@@
-178,8
+172,6
@@
void ShaderProgramGL::destroy()
glDeleteProgram(prog);
prog = 0;
is_linked = false;
glDeleteProgram(prog);
prog = 0;
is_linked = false;
-
- delete_shaders();
}
void ShaderProgramGL::attach_shader(Shader *shader)
}
void ShaderProgramGL::attach_shader(Shader *shader)