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

diff --git a/source/core/module.h b/source/core/module.h
index 9ac54d32..5067895d 100644
--- a/source/core/module.h
+++ b/source/core/module.h
@@ -21,6 +21,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 +45,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,6 +82,15 @@ public:
 	const SL::SourceMap &get_source_map() const { return source_map; }
 };
 
+/**
+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:
@@ -76,7 +106,8 @@ public:
 		UNIFORM_CONSTANT = 0,
 		INPUT = 1,
 		UNIFORM = 2,
-		OUTPUT = 3
+		OUTPUT = 3,
+		PUSH_CONSTANT = 9
 	};
 
 	enum BuiltinSemantic
@@ -106,7 +137,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 +155,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;
+		int descriptor_set = 0;
 		int binding = -1;
 		BuiltinSemantic builtin = NOT_BUILTIN;
 
@@ -152,7 +181,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);
@@ -210,6 +238,7 @@ private:
 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 &);