X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=33998e5e7408197b696203f1d6143e9f85f759cf;hb=1a5dafe20e47c764f2914c341fb7b8f1fba59fb8;hp=d9fc2d6a7a074367262dc890967ac632b9d22682;hpb=c43203c52410ee8a734e775e7ee7368a12f82ff7;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index d9fc2d6a..33998e5e 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 &);
@@ -276,6 +275,7 @@ private:
 	virtual void visit(Iteration &);
 };
 
+/** Removes code which is never executed due to flow control statements. */
 class UnreachableCodeRemover: private TraversingVisitor
 {
 private:
@@ -309,7 +309,6 @@ private:
 	virtual void visit(ImageTypeDeclaration &);
 	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
-	virtual void visit(InterfaceBlock &);
 	virtual void visit(FunctionDeclaration &);
 };
 
@@ -355,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 &);
@@ -368,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 &);