Merge branch 'master' of ssh://git.jvnv.net/srv/git/gardiner

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