X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fmodule.h;h=480a0669ffbb6275324a7ab2b3c5bb660fdba2eb;hp=1ccbbf3d5c0d03fb3ca144d9f9def0231112fbf0;hb=cebf1330ef6773b7b4496dc279ec02a7ca4351bb;hpb=190a7e11237351f6b730c28f7b16f183e8adc69c

diff --git a/source/core/module.h b/source/core/module.h
index 1ccbbf3d..480a0669 100644
--- a/source/core/module.h
+++ b/source/core/module.h
@@ -6,6 +6,7 @@
 #include <vector>
 #include <msp/io/base.h>
 #include "datatype.h"
+#include "module_backend.h"
 #include "glsl/compiler.h"
 #include "glsl/sourcemap.h"
 
@@ -58,6 +59,11 @@ public:
 
 private:
 	virtual void compile(SL::Compiler &) = 0;
+
+	SL::Features create_features() const;
+
+public:
+	virtual void set_debug_name(const std::string &) { }
 };
 
 /**
@@ -89,14 +95,17 @@ compiled to SPIR-V.  Pre-compiled SPIR-V modules can also be loaded.
 Afterwards reflection data is available, providing information about variables
 forming the module's interface.
 */
-class SpirVModule: public Module
+class SpirVModule: public Module, public SpirVModuleBackend
 {
+	friend SpirVModuleBackend;
+
 public:
 	enum Stage
 	{
 		VERTEX = 0,
 		GEOMETRY = 3,
-		FRAGMENT = 4
+		FRAGMENT = 4,
+		COMPUTE = 5
 	};
 
 	enum StorageClass
@@ -104,7 +113,8 @@ public:
 		UNIFORM_CONSTANT = 0,
 		INPUT = 1,
 		UNIFORM = 2,
-		OUTPUT = 3
+		OUTPUT = 3,
+		PUSH_CONSTANT = 9
 	};
 
 	enum BuiltinSemantic
@@ -123,8 +133,10 @@ public:
 	struct EntryPoint
 	{
 		std::string name;
+		unsigned id = 0;
 		Stage stage = VERTEX;
 		std::vector<const Variable *> globals;
+		LinAl::Vector<unsigned, 3> compute_local_size;
 	};
 
 	struct StructMember
@@ -134,7 +146,6 @@ public:
 		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;
@@ -143,20 +154,21 @@ public:
 	struct Structure
 	{
 		std::string name;
-		std::vector<StructMember> members;
+		unsigned id = 0;
 		unsigned size = 0;
+		std::vector<StructMember> members;
 	};
 
 	struct Variable
 	{
 		std::string name;
-		StorageClass storage = static_cast<StorageClass>(-1);
+		unsigned id = 0;
 		DataType type = VOID;
 		const Structure *struct_type = 0;
-		const Constant *array_size_spec = 0;
+		StorageClass storage = static_cast<StorageClass>(-1);
 		unsigned array_size = 0;
 		int location = -1;
-		int descriptor_set = -1;
+		unsigned descriptor_set = 0;
 		int binding = -1;
 		BuiltinSemantic builtin = NOT_BUILTIN;
 
@@ -166,6 +178,7 @@ public:
 	struct Constant
 	{
 		std::string name;
+		unsigned id = 0;
 		int constant_id = -1;
 		DataType type = VOID;
 		union
@@ -175,12 +188,20 @@ public:
 		};
 	};
 
+	struct InstructionBlock
+	{
+		unsigned id = 0;
+		bool negate_condition = false;
+		const Constant *condition = 0;
+		std::vector<const Variable *> accessed_variables;
+		std::vector<const InstructionBlock *> successors;
+	};
+
 private:
 	struct 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);
@@ -196,6 +217,10 @@ private:
 		std::map<unsigned, EntryPoint> entry_points;
 		std::map<unsigned, Structure> structs;
 		std::map<unsigned, Variable> variables;
+		std::map<unsigned, InstructionBlock> blocks;
+		std::map<unsigned, unsigned> access_chain_bases;
+		Constant true_condition;
+		InstructionBlock *current_block = 0;
 
 		static std::uint32_t get_opcode(std::uint32_t);
 		static CodeIterator get_op_end(const CodeIterator &);
@@ -205,6 +230,7 @@ private:
 		void reflect_name(CodeIterator);
 		void reflect_member_name(CodeIterator);
 		void reflect_entry_point(CodeIterator);
+		void reflect_execution_mode(CodeIterator);
 		void reflect_void_type(CodeIterator);
 		void reflect_bool_type(CodeIterator);
 		void reflect_int_type(CodeIterator);
@@ -218,8 +244,13 @@ private:
 		void reflect_pointer_type(CodeIterator);
 		void reflect_constant(CodeIterator);
 		void reflect_variable(CodeIterator);
+		void reflect_access(CodeIterator);
+		void reflect_access_chain(CodeIterator);
 		void reflect_decorate(CodeIterator);
 		void reflect_member_decorate(CodeIterator);
+		void reflect_label(CodeIterator);
+		void reflect_branch(CodeIterator);
+		void reflect_branch_conditional(CodeIterator);
 	};
 
 	std::vector<std::uint32_t> code;
@@ -227,13 +258,8 @@ private:
 	std::vector<Structure> structs;
 	std::vector<Variable> variables;
 	std::vector<Constant> spec_constants;
-
-public:
-	SpirVModule() = default;
-	SpirVModule(const SpirVModule &);
-	SpirVModule &operator=(const SpirVModule &);
-private:
-	void remap_pointers_from(const SpirVModule &);
+	std::vector<InstructionBlock> blocks;
+	bool specializable = false;
 
 public:
 	virtual Format get_format() const { return SPIR_V; }
@@ -249,6 +275,18 @@ public:
 	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; }
+	const std::vector<InstructionBlock> &get_blocks() const { return blocks; }
+	bool is_specializable() const { return specializable; }
+
+	/** Creates a new module which is a specialized version of this one. */
+	SpirVModule *specialize(const std::map<std::string, int> &) const;
+
+private:
+	std::vector<const InstructionBlock *> collect_visited_blocks(const std::map<unsigned, int> &) const;
+	void collect_visited_blocks(unsigned, std::vector<std::uint8_t> &) const;
+
+public:
+	void set_debug_name(const std::string &n) { SpirVModuleBackend::set_debug_name(n); }
 };
 
 } // namespace GL