Adapt to changes in mspmath

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

diff --git a/source/core/module.h b/source/core/module.h
index c669af0506ab64d26b25bf504ec28533e7e1cf92..26895ee0ba2fe9355e397026b5a068c3f7985fe4 100644 (file)
--- a/source/core/module.h
+++ b/source/core/module.h
@@ -61,6 +61,9 @@ private:
        virtual void compile(SL::Compiler &) = 0;
 
        SL::Features create_features() const;
+
+public:
+       virtual void set_debug_name(const std::string &) { }
 };
 
 /**
@@ -94,6 +97,8 @@ forming the module's interface.
 */
 class SpirVModule: public Module, public SpirVModuleBackend
 {
+       friend SpirVModuleBackend;
+
 public:
        enum Stage
        {
@@ -127,6 +132,7 @@ public:
        struct EntryPoint
        {
                std::string name;
+               unsigned id = 0;
                Stage stage = VERTEX;
                std::vector<const Variable *> globals;
        };
@@ -146,16 +152,18 @@ public:
        struct Structure
        {
                std::string name;
-               std::vector<StructMember> members;
+               unsigned id = 0;
                unsigned size = 0;
+               std::vector<StructMember> members;
        };
 
        struct Variable
        {
                std::string name;
-               StorageClass storage = static_cast<StorageClass>(-1);
+               unsigned id = 0;
                DataType type = VOID;
                const Structure *struct_type = 0;
+               StorageClass storage = static_cast<StorageClass>(-1);
                unsigned array_size = 0;
                int location = -1;
                unsigned descriptor_set = 0;
@@ -168,6 +176,7 @@ public:
        struct Constant
        {
                std::string name;
+               unsigned id = 0;
                int constant_id = -1;
                DataType type = VOID;
                union
@@ -177,6 +186,15 @@ public:
                };
        };
 
+       struct InstructionBlock
+       {
+               unsigned id = 0;
+               bool negate_condition = false;
+               const Constant *condition = 0;
+               std::vector<const Variable *> accessed_variables;
+               std::vector<const InstructionBlock *> successors;
+       };
+
 private:
        struct TypeInfo
        {
@@ -197,6 +215,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 &);
@@ -219,8 +241,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;
@@ -228,6 +255,8 @@ private:
        std::vector<Structure> structs;
        std::vector<Variable> variables;
        std::vector<Constant> spec_constants;
+       std::vector<InstructionBlock> blocks;
+       bool specializable = false;
 
 public:
        virtual Format get_format() const { return SPIR_V; }
@@ -243,6 +272,18 @@ 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; }
+       bool is_specializable() const { return specializable; }
+
+       /** Creates a new module which is a specialized version of this one. */
+       SpirVModule *specialize(const std::map<std::string, int> &) const;
+
+private:
+       std::vector<const InstructionBlock *> collect_visited_blocks(const std::map<unsigned, int> &) const;
+       void collect_visited_blocks(unsigned, std::vector<std::uint8_t> &) const;
+
+public:
+       void set_debug_name(const std::string &n) { SpirVModuleBackend::set_debug_name(n); }
 };
 
 } // namespace GL