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

diff --git a/source/core/module.h b/source/core/module.h
index 1ccbbf3d..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"
 
@@ -58,6 +59,8 @@ public:
 
 private:
 	virtual void compile(SL::Compiler &) = 0;
+
+	SL::Features create_features() const;
 };
 
 /**
@@ -89,7 +92,7 @@ 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
 {
 public:
 	enum Stage
@@ -104,7 +107,8 @@ public:
 		UNIFORM_CONSTANT = 0,
 		INPUT = 1,
 		UNIFORM = 2,
-		OUTPUT = 3
+		OUTPUT = 3,
+		PUSH_CONSTANT = 9
 	};
 
 	enum BuiltinSemantic
@@ -134,7 +138,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;
@@ -153,10 +156,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;
 
@@ -180,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);
@@ -228,13 +229,6 @@ 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; }