X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fmodule.h;h=5ea0149d2074e498e11e58ec97cfdd072b1ab642;hp=6ca522a5563d8a79348563f4c6170cc8ba2efcb6;hb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;hpb=1f71ec73edacd6c1bd230abace3cb791eb2ca759

diff --git a/source/core/module.h b/source/core/module.h
index 6ca522a5..5ea0149d 100644
--- a/source/core/module.h
+++ b/source/core/module.h
@@ -78,6 +78,7 @@ public:
 		OUTPUT = 3
 	};
 
+	struct Constant;
 	struct Structure;
 	struct Variable;
 
@@ -97,6 +98,7 @@ public:
 		const Structure *struct_type;
 		unsigned offset;
 		unsigned array_size;
+		const Constant *array_size_spec;
 		unsigned array_stride;
 		unsigned matrix_stride;
 
@@ -116,6 +118,7 @@ public:
 		StorageClass storage;
 		DataType type;
 		const Structure *struct_type;
+		const Constant *array_size_spec;
 		unsigned array_size;
 		int location;
 		int descriptor_set;
@@ -143,6 +146,7 @@ private:
 	{
 		DataType type;
 		const Structure *struct_type;
+		const Constant *array_size_spec;
 		unsigned array_size;
 		unsigned array_stride;
 		StorageClass storage;
@@ -152,7 +156,7 @@ 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, Constant> constants;
@@ -161,11 +165,11 @@ private:
 		std::map<unsigned, Structure> structs;
 		std::map<unsigned, Variable> variables;
 
-		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);
@@ -186,7 +190,7 @@ private:
 		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;
@@ -208,7 +212,7 @@ 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<Constant> &get_spec_constants() const { return spec_constants; }