X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fshader.h;h=86a70be0e10eb5716b2b296d17e7998c6a8c9e1a;hb=5172d32d67595ea0b70184fadcfcb8e023cccbc8;hp=43d03ce109cd61343099db8c5b9a11df6c27d398;hpb=3f285d3f4fd0a6790bf1efa780284dc7ba2287a2;p=libs%2Fgl.git

diff --git a/source/shader.h b/source/shader.h
index 43d03ce1..86a70be0 100644
--- a/source/shader.h
+++ b/source/shader.h
@@ -9,8 +9,7 @@ Distributed under the LGPL
 #define MSP_GL_SHADER_H_
 
 #include <string>
-#include <GL/gl.h>
-#include "types.h"
+#include "gl.h"
 
 namespace Msp {
 namespace GL {
@@ -26,18 +25,21 @@ class Shader
 public:
 	Shader(ShaderType t);
 	Shader(ShaderType t, const std::string &);
+private:
+	void init(ShaderType);
+public:
 	~Shader();
 
-	void source(sizei count, const char **str, const int *len);
+	void source(unsigned count, const char **str, const int *len);
 	void source(const std::string &str);
 	void source(const char *str, int len);
-	bool compile();
-	uint get_id() const { return id; }
+	void compile();
+	unsigned get_id() const { return id; }
 	bool get_compiled() const { return compiled; }
 	int get_param(GLenum param) const;
 	std::string get_info_log() const;
 private:
-	uint id;
+	unsigned id;
 	bool compiled;
 };