X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.h;h=33413eb01da23eb035fa0fc04e1fc5c488d7c323;hb=7c069241318b7133ac2df65ee13cb1d2968c5974;hp=f318c60639012ea66f9da3c43139003cae519202;hpb=ea7832c7c1ffab00cc1168bc8c41375fdd0eae86;p=libs%2Fgl.git

diff --git a/source/core/program.h b/source/core/program.h
index f318c606..33413eb0 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;
 
@@ -63,10 +65,10 @@ public:
 		std::string name;
 		const UniformBlockInfo *block;
 		unsigned location;
-		unsigned size;
+		unsigned array_size;
 		unsigned array_stride;
 		unsigned matrix_stride;
-		GLenum type;
+		DataType type;
 	};
 
 	struct UniformBlockInfo
@@ -82,8 +84,8 @@ public:
 	{
 		std::string name;
 		unsigned location;
-		unsigned size;
-		GLenum type;
+		unsigned array_size;
+		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,7 +121,12 @@ 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);
@@ -131,7 +138,6 @@ public:
 
 	void link();
 private:
-	static void require_type(GLenum);
 	void query_uniforms();
 	void query_uniform_blocks(const std::vector<UniformInfo *> &);
 	void query_attributes();