Comment fixes

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

diff --git a/source/core/module.h b/source/core/module.h
index 16e07053ea4abd427fac950b0b09da2bb89c6ac9..15c07fb0366bd79b0e2ee737f4c21e42b3ed58f8 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
@@ -106,7 +107,8 @@ public:
                UNIFORM_CONSTANT = 0,
                INPUT = 1,
                UNIFORM = 2,
-               OUTPUT = 3
+               OUTPUT = 3,
+               PUSH_CONSTANT = 9
        };
 
        enum BuiltinSemantic
@@ -156,7 +158,7 @@ public:
                const Structure *struct_type = 0;
                unsigned array_size = 0;
                int location = -1;
-               int descriptor_set = -1;
+               unsigned descriptor_set = 0;
                int binding = -1;
                BuiltinSemantic builtin = NOT_BUILTIN;
 
@@ -175,6 +177,14 @@ 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
        {
@@ -195,6 +205,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 &);
@@ -217,8 +231,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;
@@ -226,13 +245,7 @@ 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; }
@@ -248,6 +261,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