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

diff --git a/source/core/module.h b/source/core/module.h
index 9ac54d32..855d5195 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"
 
@@ -21,6 +22,14 @@ public:
 
 class Resources;
 
+/**
+Base class for shader modules.  Internal representation depends on the
+concrete type.
+
+Modules can be loaded from files.
+
+Applications normally use the Program class to access shaders.
+*/
 class Module
 {
 public:
@@ -37,13 +46,26 @@ public:
 
 	virtual Format get_format() const = 0;
 
+	/** Sets the module's content from GLSL source code. */
 	void set_source(const std::string &);
-	void load_source(IO::Base &, Resources *, const std::string &);
+
+	/** Loads GLSL source from a file or other I/O object.  Any import
+	statements are resolved using res. */
+	void load_source(IO::Base &, Resources *res, const std::string &name);
+
+	/** Loads GLSL source from a file or other I/O object.  Only builtin
+	shader fragments can be imported. */
 	void load_source(IO::Base &, const std::string &);
+
 private:
 	virtual void compile(SL::Compiler &) = 0;
+
+	SL::Features create_features() const;
 };
 
+/**
+A shader module in GLSL source code format.
+*/
 class GlslModule: public Module
 {
 private:
@@ -61,8 +83,19 @@ public:
 	const SL::SourceMap &get_source_map() const { return source_map; }
 };
 
-class SpirVModule: public Module
+/**
+A shader module in SPIR-V binary format.
+
+When the module's contents are set from GLSL source, it will be automatically
+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, public SpirVModuleBackend
 {
+	friend SpirVModuleBackend;
+
 public:
 	enum Stage
 	{
@@ -76,7 +109,8 @@ public:
 		UNIFORM_CONSTANT = 0,
 		INPUT = 1,
 		UNIFORM = 2,
-		OUTPUT = 3
+		OUTPUT = 3,
+		PUSH_CONSTANT = 9
 	};
 
 	enum BuiltinSemantic
@@ -106,7 +140,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;
@@ -125,10 +158,9 @@ public:
 		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;
+		unsigned descriptor_set = 0;
 		int binding = -1;
 		BuiltinSemantic builtin = NOT_BUILTIN;
 
@@ -147,12 +179,19 @@ public:
 		};
 	};
 
+	struct InstructionBlock
+	{
+		const Constant *condition = 0;
+		bool negate_condition = false;
+		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);
@@ -168,6 +207,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 &);
@@ -190,8 +233,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;
@@ -199,17 +247,12 @@ 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;
 
 public:
 	virtual Format get_format() const { return SPIR_V; }
 
+	/** Loads a SPIR-V binary from a file or other I/O object. */
 	void load_code(IO::Base &);
 private:
 	virtual void compile(SL::Compiler &);
@@ -220,6 +263,7 @@ 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; }
 };
 
 } // namespace GL