diff options
author | Vegard Storheil Eriksen <zyp@jvnv.net> | 2010-05-24 16:17:18 +0200 |
---|---|---|
committer | Vegard Storheil Eriksen <zyp@jvnv.net> | 2010-05-24 16:17:18 +0200 |
commit | 0de601984c8af1d88affe1ac88d47cc9fe12de75 (patch) | |
tree | e0cfabeced7de96ee4a77a7b541529dcb542fdaa /engine/shader.h | |
parent | 5c21b67a04bd847d7f04042a0ddc0bc4629d20e7 (diff) | |
parent | 42de6197a6b29ef1d922c82e5bab263f1348ec03 (diff) |
Merge branch 'master' of ssh://git.jvnv.net/srv/git/gardiner
Diffstat (limited to 'engine/shader.h')
-rw-r--r-- | engine/shader.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/engine/shader.h b/engine/shader.h index 012165a..d4ad263 100644 --- a/engine/shader.h +++ b/engine/shader.h @@ -16,11 +16,12 @@ class GLBaseShader { friend class GLShaderProgram; protected: - bool shader_source(const char *filename); - bool shader_source(std::string& filename); + void shader_source(const char *filename); + void shader_source(std::string& filename); unsigned int shader; public: GLBaseShader(GLenum); + ~GLBaseShader(); }; class GLVertexShader : public GLBaseShader { @@ -42,15 +43,12 @@ class GLShaderProgram { unsigned int program; public: GLShaderProgram(); + ~GLShaderProgram(); - bool attach(GLBaseShader&); - bool detach(GLBaseShader&); - bool link(); - bool use(); - void remove(); + void attach(GLBaseShader&); + void detach(GLBaseShader&); + void link(); + void use(); }; -void print_ogl_error(GLenum); -bool print_check_ogl_error(); - #endif |