Take care of SPIR-V load IDs in ternary expressions

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

diff --git a/source/glsl/spirv.h b/source/glsl/spirv.h
index addf8970315c5fb68e6d05d31c55c9b467ebf6c5..23def508d719d6ba23296f4d50da59d730e0d264 100644 (file)
--- a/source/glsl/spirv.h
+++ b/source/glsl/spirv.h
@@ -124,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 &);
@@ -139,7 +139,6 @@ private:
        virtual void visit(Block &);
        virtual void visit(Literal &);
        virtual void visit(VariableReference &);
-       virtual void visit(InterfaceBlockReference &);
        void generate_composite_access(TypeDeclaration &);
        void visit_composite(Expression &, unsigned, TypeDeclaration &);
        void visit_isolated(Expression &);
@@ -164,7 +163,6 @@ private:
        virtual void visit(ImageTypeDeclaration &);
        virtual void visit(StructDeclaration &);
        virtual void visit(VariableDeclaration &);
-       virtual void visit(InterfaceBlock &);
        void visit_entry_point(FunctionDeclaration &, Id);
        virtual void visit(FunctionDeclaration &);
        virtual void visit(Conditional &);