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

diff --git a/source/core/program.h b/source/core/program.h
index 05223627..6f84cfd2 100644
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -5,13 +5,14 @@
 #include <vector>
 #include <msp/datafile/objectloader.h>
 #include "bindable.h"
+#include "datatype.h"
 #include "gl.h"
+#include "module.h"
 #include "vertexformat.h"
 
 namespace Msp {
 namespace GL {
 
-class Module;
 class Shader;
 
 /**
@@ -63,10 +64,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 +83,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 +93,7 @@ public:
 
 private:
 	unsigned id;
-	std::vector<unsigned> shader_ids;
+	std::vector<unsigned> stage_ids;
 	const Module *module;
 	bool linked;
 	UniformBlockMap uniform_blocks;
@@ -119,22 +120,31 @@ 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);
+	void add_spirv_stages(const SpirVModule &, const std::map<std::string, int> &);
 
+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();
+	void collect_uniforms();
+	void collect_block_uniforms(UniformBlockInfo &, const SpirVModule::Structure &, const std::string &, unsigned);
+	void collect_attributes();
+	void update_layout_hash();
 	static LayoutHash compute_layout_hash(const std::vector<const UniformInfo *> &);
 	static bool uniform_location_compare(const UniformInfo *, const UniformInfo *);
 public: