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

diff --git a/source/core/module.h b/source/core/module.h
index 6ca522a5..9ac54d32 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"
 
@@ -30,9 +31,9 @@ public:
 	};
 
 protected:
-	Module() { }
+	Module() = default;
 public:
-	virtual ~Module() { }
+	virtual ~Module() = default;
 
 	virtual Format get_format() const = 0;
 
@@ -78,50 +79,58 @@ public:
 		OUTPUT = 3
 	};
 
+	enum BuiltinSemantic
+	{
+		NOT_BUILTIN = -1,
+		POSITION = 0,
+		CLIP_DISTANCE = 3,
+		LAYER = 9,
+		FRAG_DEPTH = 22
+	};
+
+	struct Constant;
 	struct Structure;
 	struct Variable;
 
 	struct EntryPoint
 	{
 		std::string name;
-		Stage stage;
+		Stage stage = VERTEX;
 		std::vector<const Variable *> globals;
-
-		EntryPoint();
 	};
 
 	struct StructMember
 	{
 		std::string name;
-		DataType type;
-		const Structure *struct_type;
-		unsigned offset;
-		unsigned array_size;
-		unsigned array_stride;
-		unsigned matrix_stride;
-
-		StructMember();
+		DataType type = VOID;
+		const Structure *struct_type = 0;
+		unsigned offset = 0;
+		unsigned array_size = 0;
+		const Constant *array_size_spec = 0;
+		unsigned array_stride = 0;
+		unsigned matrix_stride = 0;
+		BuiltinSemantic builtin = NOT_BUILTIN;
 	};
 
 	struct Structure
 	{
 		std::string name;
 		std::vector<StructMember> members;
-		unsigned size;
+		unsigned size = 0;
 	};
 
 	struct Variable
 	{
 		std::string name;
-		StorageClass storage;
-		DataType type;
-		const Structure *struct_type;
-		unsigned array_size;
-		int location;
-		int descriptor_set;
-		int binding;
-
-		Variable();
+		StorageClass storage = static_cast<StorageClass>(-1);
+		DataType type = VOID;
+		const Structure *struct_type = 0;
+		const Constant *array_size_spec = 0;
+		unsigned array_size = 0;
+		int location = -1;
+		int descriptor_set = -1;
+		int binding = -1;
+		BuiltinSemantic builtin = NOT_BUILTIN;
 
 		bool operator==(const Variable &) const;
 	};
@@ -129,11 +138,11 @@ public:
 	struct Constant
 	{
 		std::string name;
-		int constant_id;
-		DataType type;
+		int constant_id = -1;
+		DataType type = VOID;
 		union
 		{
-			int i_value;
+			int i_value = 0;
 			float f_value;
 		};
 	};
@@ -141,18 +150,17 @@ public:
 private:
 	struct TypeInfo
 	{
-		DataType type;
-		const Structure *struct_type;
-		unsigned array_size;
-		unsigned array_stride;
-		StorageClass storage;
-
-		TypeInfo();
+		DataType type = VOID;
+		const Structure *struct_type = 0;
+		const Constant *array_size_spec = 0;
+		unsigned array_size = 0;
+		unsigned array_stride = 0;
+		StorageClass storage = static_cast<StorageClass>(-1);
 	};
 
 	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 +169,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,14 +194,14 @@ 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;
 	std::vector<Constant> spec_constants;
 
 public:
-	SpirVModule() { }
+	SpirVModule() = default;
 	SpirVModule(const SpirVModule &);
 	SpirVModule &operator=(const SpirVModule &);
 private:
@@ -208,7 +216,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; }