X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fspirv.h;h=23def508d719d6ba23296f4d50da59d730e0d264;hb=77f6973f58167d94059d3f324c29ab2ca8de4544;hp=59c7b50b0cc45fede654eff5d3580840c5eecf1a;hpb=f7682c3c2e9f028cef6945ffbada66cff33585c0;p=libs%2Fgl.git

diff --git a/source/glsl/spirv.h b/source/glsl/spirv.h
index 59c7b50b..23def508 100644
--- a/source/glsl/spirv.h
+++ b/source/glsl/spirv.h
@@ -70,6 +70,7 @@ private:
 		bool operator<(const ConstantKey &) const;
 	};
 
+	Features features;
 	Stage *stage = 0;
 	FunctionDeclaration *current_function = 0;
 	std::vector<const InterfaceLayout *> interface_layouts;
@@ -106,7 +107,7 @@ private:
 public:
 	SpirVGenerator();
 
-	void apply(Module &);
+	void apply(Module &, const Features &);
 	const std::vector<Word> &get_code() const { return content.code; }
 
 private:
@@ -123,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 &);
@@ -138,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 &);
@@ -163,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 &);