X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.h;h=40c1d320f861e81d662ec2aa8e118e3191a5c602;hb=096481bcb88844ec28fd33147ed5010bfe2e15d9;hp=052236270d4b54b3d0ca2b29ebecc908f8f82ea5;hpb=0912a8d73043961ab7a4d66cd2fbb13187483ffd;p=libs%2Fgl.git

diff --git a/source/core/program.h b/source/core/program.h
index 05223627..40c1d320 100644
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -5,12 +5,14 @@
 #include <vector>
 #include <msp/datafile/objectloader.h>
 #include "bindable.h"
+#include "datatype.h"
 #include "gl.h"
 #include "vertexformat.h"
 
 namespace Msp {
 namespace GL {
 
+class GlslModule;
 class Module;
 class Shader;
 
@@ -66,7 +68,7 @@ public:
 		unsigned size;
 		unsigned array_stride;
 		unsigned matrix_stride;
-		GLenum type;
+		DataType type;
 	};
 
 	struct UniformBlockInfo
@@ -83,7 +85,7 @@ public:
 		std::string name;
 		unsigned location;
 		unsigned size;
-		GLenum type;
+		DataType type;
 	};
 
 	typedef std::map<std::string, UniformInfo> UniformMap;
@@ -92,7 +94,7 @@ public:
 
 private:
 	unsigned id;
-	std::vector<unsigned> shader_ids;
+	std::vector<unsigned> stage_ids;
 	const Module *module;
 	bool linked;
 	UniformBlockMap uniform_blocks;
@@ -119,19 +121,23 @@ public:
 	virtual ~Program();
 
 	void add_stages(const Module &, const std::map<std::string, int> & = std::map<std::string, int>());
+private:
+	unsigned add_stage(GLenum);
+	void add_glsl_stages(const GlslModule &, const std::map<std::string, int> &);
+	void compile_glsl_stage(unsigned);
 
+public:
 	DEPRECATED void attach_shader(Shader &shader);
 	DEPRECATED void attach_shader_owned(Shader *shader);
 	DEPRECATED void detach_shader(Shader &shader);
 	DEPRECATED const std::vector<Shader *> &get_attached_shaders() const;
 
 	DEPRECATED void bind_attribute(unsigned, const std::string &);
-	DEPRECATED void bind_attribute(VertexComponent, const std::string &);
+	DEPRECATED void bind_attribute(VertexAttribute, const std::string &);
 	DEPRECATED void bind_fragment_data(unsigned, const std::string &);
 
 	void link();
 private:
-	static void require_type(GLenum);
 	void query_uniforms();
 	void query_uniform_blocks(const std::vector<UniformInfo *> &);
 	void query_attributes();