X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fspirv.h;h=98aa673ed8d963ba23aa89cedd90d3433d00f619;hb=49080e2c9359a3929e77817707ad7e8bf3f8a36d;hp=21f0ed5331c531c40455cdc5ae7d279f92ef1755;hpb=cc5483cc709fdf7b6966a3e69dabfcafebaaffa0;p=libs%2Fgl.git

diff --git a/source/glsl/spirv.h b/source/glsl/spirv.h
index 21f0ed53..98aa673e 100644
--- a/source/glsl/spirv.h
+++ b/source/glsl/spirv.h
@@ -84,6 +84,7 @@ private:
 	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;
@@ -127,7 +128,6 @@ private:
 	Id write_expression(Opcode, Id, Id, Id);
 	void write_deconstruct(Id, Id, Id *, unsigned);
 	Id write_construct(Id, const Id *, unsigned);
-	static BasicTypeDeclaration &get_element_type(BasicTypeDeclaration &);
 
 	virtual void visit(Block &);
 	virtual void visit(Literal &);
@@ -143,7 +143,7 @@ private:
 	virtual void visit(Assignment &);
 	virtual void visit(TernaryExpression &);
 	virtual void visit(FunctionCall &);
-	void visit_constructor(FunctionCall &, const std::vector<Id> &);
+	void visit_constructor(FunctionCall &, const std::vector<Id> &, bool);
 	void visit_builtin_matrix_comp_mult(FunctionCall &, const std::vector<Id> &);
 	void visit_builtin_texture(FunctionCall &, const std::vector<Id> &);
 	void visit_builtin_texel_fetch(FunctionCall &, const std::vector<Id> &);