Use extended alignment in SPIR-V struct layout when necessary

[libs/gl.git] / source / glsl / spirv.h

diff --git a/source/glsl/spirv.h b/source/glsl/spirv.h
index d680ee3c8a76e01d8e244aadc1307fbccd457aa9..a83478b0fb6d370d621864aa300ed8fcf4c8f1bd 100644 (file)
--- a/source/glsl/spirv.h
+++ b/source/glsl/spirv.h
@@ -30,7 +30,7 @@ private:
                char arg_types[5];
                char extension[13];
                Word opcode;
-               UInt8 arg_order[4];
+               std::uint8_t arg_order[4];
                Word capability;
                void (SpirVGenerator::*handler)(FunctionCall &, const std::vector<Id> &);
        };
@@ -70,8 +70,9 @@ private:
                bool operator<(const ConstantKey &) const;
        };
 
-       Stage *stage;
-       FunctionDeclaration *current_function;
+       Features features;
+       Stage *stage = 0;
+       FunctionDeclaration *current_function = 0;
        std::vector<const InterfaceLayout *> interface_layouts;
        SpirVContent content;
        SpirVWriter writer;
@@ -79,6 +80,7 @@ private:
        std::map<std::string, Id> imported_extension_ids;
        std::map<Node *, Declaration> declared_ids;
        std::map<std::string, Id> declared_uniform_ids;
+       std::map<unsigned, Id> declared_spec_ids;
        std::map<TypeKey, Id> standard_type_ids;
        std::map<Id, Id> image_type_ids;
        std::map<TypeKey, Id> array_type_ids;
@@ -86,26 +88,26 @@ private:
        std::map<std::string, Id> function_type_ids;
        std::map<ConstantKey, Id> constant_ids;
        std::map<const VariableDeclaration *, Id> variable_load_ids;
-       Id next_id;
-       Id r_expression_result_id;
-       bool r_constant_result;
-       bool constant_expression;
-       bool spec_constant;
-       bool reachable;
-       bool composite_access;
-       Id r_composite_base_id;
-       Node *r_composite_base;
+       Id next_id = 1;
+       Id r_expression_result_id = 0;
+       bool r_constant_result = false;
+       bool constant_expression = false;
+       bool spec_constant = false;
+       bool reachable = false;
+       bool composite_access = false;
+       Id r_composite_base_id = 0;
+       Node *r_composite_base = 0;
        std::vector<unsigned> r_composite_chain;
-       Id assignment_source_id;
-       Id loop_merge_block_id;
-       Id loop_continue_target_id;
+       Id assignment_source_id = 0;
+       Id loop_merge_block_id = 0;
+       Id loop_continue_target_id = 0;
 
        static const BuiltinFunctionInfo builtin_functions[];
 
 public:
        SpirVGenerator();
 
-       void apply(Module &);
+       void apply(Module &, const Features &);
        const std::vector<Word> &get_code() const { return content.code; }
 
 private:
@@ -122,7 +124,7 @@ private:
        Id get_vector_constant_id(Id, unsigned, Id);
        Id get_standard_type_id(BasicTypeDeclaration::Kind, unsigned, bool = true);
        bool is_scalar_type(Id, BasicTypeDeclaration::Kind) const;
-       Id get_array_type_id(TypeDeclaration &, unsigned);
+       Id get_array_type_id(TypeDeclaration &, Id, bool);
        Id get_pointer_type_id(Id, StorageClass);
        Id get_variable_type_id(const VariableDeclaration &);
        Id get_load_id(VariableDeclaration &);