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

diff --git a/source/core/program.h b/source/core/program.h
index 33413eb0..48c18d0f 100644
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -7,13 +7,12 @@
 #include "bindable.h"
 #include "datatype.h"
 #include "gl.h"
+#include "module.h"
 #include "vertexformat.h"
 
 namespace Msp {
 namespace GL {
 
-class GlslModule;
-class Module;
 class Shader;
 
 /**
@@ -64,11 +63,17 @@ public:
 	{
 		std::string name;
 		const UniformBlockInfo *block;
-		unsigned location;
+		union
+		{
+			int location;
+			unsigned offset;
+		};
 		unsigned array_size;
 		unsigned array_stride;
 		unsigned matrix_stride;
 		DataType type;
+
+		UniformInfo();
 	};
 
 	struct UniformBlockInfo
@@ -78,6 +83,8 @@ public:
 		int bind_point;
 		std::vector<const UniformInfo *> uniforms;
 		LayoutHash layout_hash;
+
+		UniformBlockInfo();
 	};
 
 	struct AttributeInfo
@@ -86,6 +93,8 @@ public:
 		unsigned location;
 		unsigned array_size;
 		DataType type;
+
+		AttributeInfo();
 	};
 
 	typedef std::map<std::string, UniformInfo> UniformMap;
@@ -125,6 +134,7 @@ 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);
@@ -141,6 +151,10 @@ private:
 	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: