X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=33998e5e7408197b696203f1d6143e9f85f759cf;hp=9b7b7affecf58035f19c2457cbd08c8c4adddf3d;hb=HEAD;hpb=190a7e11237351f6b730c28f7b16f183e8adc69c

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 9b7b7aff..807b7a89 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -71,7 +71,6 @@ public:
 
 private:
 	virtual void visit(VariableReference &);
-	virtual void visit(InterfaceBlockReference &);
 	virtual void visit(FunctionCall &);
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(Return &);
@@ -122,6 +121,7 @@ private:
 		Block *assign_scope = 0;
 		std::vector<ExpressionUse> uses;
 		bool trivial = false;
+		bool blocked = false;
 	};
 
 	std::list<ExpressionInfo> expressions;
@@ -194,7 +194,6 @@ private:
 	virtual void visit(BinaryExpression &);
 	virtual void visit(StructDeclaration &) { }
 	virtual void visit(VariableDeclaration &);
-	virtual void visit(InterfaceBlock &) { }
 	virtual void visit(FunctionDeclaration &);
 };
 
@@ -261,7 +260,7 @@ private:
 	bool r_external_side_effects = false;
 
 public:
-	void apply(Stage &);
+	bool apply(Stage &);
 
 private:
 	ConstantStatus check_constant_condition(const Expression &);
@@ -310,7 +309,6 @@ private:
 	virtual void visit(ImageTypeDeclaration &);
 	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
-	virtual void visit(InterfaceBlock &);
 	virtual void visit(FunctionDeclaration &);
 };
 
@@ -335,7 +333,7 @@ private:
 		bool referenced = false;
 	};
 
-	typedef std::map<Statement *, VariableInfo> BlockVariableMap;
+	typedef std::map<VariableDeclaration *, VariableInfo> BlockVariableMap;
 
 	Stage *stage = 0;
 	BlockVariableMap variables;
@@ -356,7 +354,6 @@ public:
 private:
 	void referenced(const Assignment::Target &, Node &);
 	virtual void visit(VariableReference &);
-	virtual void visit(InterfaceBlockReference &);
 	void visit_composite(Expression &);
 	virtual void visit(MemberAccess &);
 	virtual void visit(Swizzle &);
@@ -369,7 +366,6 @@ private:
 	virtual void visit(ExpressionStatement &);
 	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
-	virtual void visit(InterfaceBlock &);
 	void merge_variables(const BlockVariableMap &);
 	virtual void visit(FunctionDeclaration &);
 	virtual void visit(Conditional &);