X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fmodule.h;h=34553b44c0e239bfeccac39b873a61b4ea26333d;hb=acaefb4c669f01855252818ef0a2958cbdababc3;hp=3492a5ded49b795ca37a808a9c8a403fed353d60;hpb=9f6bb77743014e4321e783aae5e84af1c925e572;p=libs%2Fgl.git

diff --git a/source/core/module.h b/source/core/module.h
index 3492a5de..34553b44 100644
--- a/source/core/module.h
+++ b/source/core/module.h
@@ -1,10 +1,11 @@
 #ifndef MSP_GL_MODULE_H_
 #define MSP_GL_MODULE_H_
 
+#include <map>
 #include <string>
+#include <vector>
 #include <msp/io/base.h>
 #include "datatype.h"
-#include "gl.h"
 #include "glsl/compiler.h"
 #include "glsl/sourcemap.h"
 
@@ -78,6 +79,7 @@ public:
 		OUTPUT = 3
 	};
 
+	struct Constant;
 	struct Structure;
 	struct Variable;
 
@@ -97,6 +99,7 @@ public:
 		const Structure *struct_type;
 		unsigned offset;
 		unsigned array_size;
+		const Constant *array_size_spec;
 		unsigned array_stride;
 		unsigned matrix_stride;
 
@@ -116,6 +119,7 @@ public:
 		StorageClass storage;
 		DataType type;
 		const Structure *struct_type;
+		const Constant *array_size_spec;
 		unsigned array_size;
 		int location;
 		int descriptor_set;
@@ -126,11 +130,16 @@ public:
 		bool operator==(const Variable &) const;
 	};
 
-	struct SpecConstant
+	struct Constant
 	{
 		std::string name;
-		unsigned constant_id;
+		int constant_id;
 		DataType type;
+		union
+		{
+			int i_value;
+			float f_value;
+		};
 	};
 
 private:
@@ -138,6 +147,7 @@ private:
 	{
 		DataType type;
 		const Structure *struct_type;
+		const Constant *array_size_spec;
 		unsigned array_size;
 		unsigned array_stride;
 		StorageClass storage;
@@ -147,21 +157,20 @@ private:
 
 	struct Reflection
 	{
-		typedef std::vector<UInt32>::const_iterator CodeIterator;
+		typedef std::vector<std::uint32_t>::const_iterator CodeIterator;
 
 		std::map<unsigned, std::string> names;
-		std::map<unsigned, Variant> constants;
+		std::map<unsigned, Constant> constants;
 		std::map<unsigned, TypeInfo> types;
 		std::map<unsigned, EntryPoint> entry_points;
 		std::map<unsigned, Structure> structs;
 		std::map<unsigned, Variable> variables;
-		std::map<unsigned, SpecConstant> spec_constants;
 
-		static UInt32 get_opcode(UInt32);
+		static std::uint32_t get_opcode(std::uint32_t);
 		static CodeIterator get_op_end(const CodeIterator &);
 		static std::string read_string(CodeIterator &, const CodeIterator &);
 
-		void reflect_code(const std::vector<UInt32> &);
+		void reflect_code(const std::vector<std::uint32_t> &);
 		void reflect_name(CodeIterator);
 		void reflect_member_name(CodeIterator);
 		void reflect_entry_point(CodeIterator);
@@ -177,18 +186,16 @@ private:
 		void reflect_struct_type(CodeIterator);
 		void reflect_pointer_type(CodeIterator);
 		void reflect_constant(CodeIterator);
-		void reflect_spec_constant_bool(CodeIterator);
-		void reflect_spec_constant(CodeIterator);
 		void reflect_variable(CodeIterator);
 		void reflect_decorate(CodeIterator);
 		void reflect_member_decorate(CodeIterator);
 	};
 
-	std::vector<UInt32> code;
+	std::vector<std::uint32_t> code;
 	std::vector<EntryPoint> entry_points;
 	std::vector<Structure> structs;
 	std::vector<Variable> variables;
-	std::vector<SpecConstant> spec_constants;
+	std::vector<Constant> spec_constants;
 
 public:
 	SpirVModule() { }
@@ -206,10 +213,10 @@ private:
 	void reflect();
 
 public:
-	const std::vector<UInt32> &get_code() const { return code; }
+	const std::vector<std::uint32_t> &get_code() const { return code; }
 	const std::vector<EntryPoint> &get_entry_points() const { return entry_points; }
 	const std::vector<Variable> &get_variables() const { return variables; }
-	const std::vector<SpecConstant> &get_spec_constants() const { return spec_constants; }
+	const std::vector<Constant> &get_spec_constants() const { return spec_constants; }
 };
 
 } // namespace GL