Fix reflection of image types from Spir-V modules

[libs/gl.git] / source / core / module.h

diff --git a/source/core/module.h b/source/core/module.h
index 5067895de662e2a29676f07f988df3d9e7d1e371..c669af0506ab64d26b25bf504ec28533e7e1cf92 100644 (file)
--- 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"
 
@@ -91,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
@@ -157,7 +158,7 @@ public:
                const Structure *struct_type = 0;
                unsigned array_size = 0;
                int location = -1;
-               int descriptor_set = 0;
+               unsigned descriptor_set = 0;
                int binding = -1;
                BuiltinSemantic builtin = NOT_BUILTIN;
 
@@ -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; }