X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fmodule.h;h=c669af0506ab64d26b25bf504ec28533e7e1cf92;hb=5cbd8664a7300d0c0076862572adeda9955b1c97;hp=7713d3ce0a77a79af54b61298868a31b24c77d1a;hpb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;p=libs%2Fgl.git

diff --git a/source/core/module.h b/source/core/module.h
index 7713d3ce..c669af05 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,7 +83,16 @@ 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
 {
 public:
 	enum Stage
@@ -76,7 +107,17 @@ public:
 		UNIFORM_CONSTANT = 0,
 		INPUT = 1,
 		UNIFORM = 2,
-		OUTPUT = 3
+		OUTPUT = 3,
+		PUSH_CONSTANT = 9
+	};
+
+	enum BuiltinSemantic
+	{
+		NOT_BUILTIN = -1,
+		POSITION = 0,
+		CLIP_DISTANCE = 3,
+		LAYER = 9,
+		FRAG_DEPTH = 22
 	};
 
 	struct Constant;
@@ -97,9 +138,9 @@ 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;
 	};
 
 	struct Structure
@@ -115,11 +156,11 @@ 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;
 
 		bool operator==(const Variable &) const;
 	};
@@ -141,7 +182,6 @@ private:
 	{
 		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);
@@ -189,16 +229,10 @@ private:
 	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 &);
-
 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 &);