Unify handling of constants in SpirVModule

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

diff --git a/source/core/module.h b/source/core/module.h
index 3492a5ded49b795ca37a808a9c8a403fed353d60..6ca522a5563d8a79348563f4c6170cc8ba2efcb6 100644 (file)
--- a/source/core/module.h
+++ b/source/core/module.h
@@ -126,11 +126,16 @@ public:
                bool operator==(const Variable &) const;
        };
 
-       struct SpecConstant
+       struct Constant
        {
                std::string name;
-               unsigned constant_id;
+               int constant_id;
                DataType type;
+               union
+               {
+                       int i_value;
+                       float f_value;
+               };
        };
 
 private:
@@ -150,12 +155,11 @@ private:
                typedef std::vector<UInt32>::const_iterator CodeIterator;
 
                std::map<unsigned, std::string> names;
-               std::map<unsigned, Variant> constants;
+               std::map<unsigned, Constant> constants;
                std::map<unsigned, TypeInfo> types;
                std::map<unsigned, EntryPoint> entry_points;
                std::map<unsigned, Structure> structs;
                std::map<unsigned, Variable> variables;
-               std::map<unsigned, SpecConstant> spec_constants;
 
                static UInt32 get_opcode(UInt32);
                static CodeIterator get_op_end(const CodeIterator &);
@@ -177,8 +181,6 @@ private:
                void reflect_struct_type(CodeIterator);
                void reflect_pointer_type(CodeIterator);
                void reflect_constant(CodeIterator);
-               void reflect_spec_constant_bool(CodeIterator);
-               void reflect_spec_constant(CodeIterator);
                void reflect_variable(CodeIterator);
                void reflect_decorate(CodeIterator);
                void reflect_member_decorate(CodeIterator);
@@ -188,7 +190,7 @@ private:
        std::vector<EntryPoint> entry_points;
        std::vector<Structure> structs;
        std::vector<Variable> variables;
-       std::vector<SpecConstant> spec_constants;
+       std::vector<Constant> spec_constants;
 
 public:
        SpirVModule() { }
@@ -209,7 +211,7 @@ public:
        const std::vector<UInt32> &get_code() const { return code; }
        const std::vector<EntryPoint> &get_entry_points() const { return entry_points; }
        const std::vector<Variable> &get_variables() const { return variables; }
-       const std::vector<SpecConstant> &get_spec_constants() const { return spec_constants; }
+       const std::vector<Constant> &get_spec_constants() const { return spec_constants; }
 };
 
 } // namespace GL