X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=75fffa13bb4fcaf6527d56ab676a7b88553cb8c5;hb=4d292eadc135b07e8e0996deb539b1984d7d38d3;hp=aebe080c585206b14d533a4c09ef3c926878392d;hpb=49e89e55692ecdbccd98b93578d29f89669a9fc0;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index aebe080c..75fffa13 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -122,6 +122,7 @@ private:
 		Block *assign_scope = 0;
 		std::vector<ExpressionUse> uses;
 		bool trivial = false;
+		bool blocked = false;
 	};
 
 	std::list<ExpressionInfo> expressions;
@@ -195,6 +196,7 @@ private:
 	virtual void visit(StructDeclaration &) { }
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(InterfaceBlock &) { }
+	virtual void visit(FunctionDeclaration &);
 };
 
 /** Replaces expressions consisting entirely of literals with the results of
@@ -260,7 +262,7 @@ private:
 	bool r_external_side_effects = false;
 
 public:
-	void apply(Stage &);
+	bool apply(Stage &);
 
 private:
 	ConstantStatus check_constant_condition(const Expression &);
@@ -275,6 +277,7 @@ private:
 	virtual void visit(Iteration &);
 };
 
+/** Removes code which is never executed due to flow control statements. */
 class UnreachableCodeRemover: private TraversingVisitor
 {
 private:
@@ -327,7 +330,6 @@ private:
 
 	struct VariableInfo
 	{
-		InterfaceBlock *interface_block = 0;
 		std::vector<AssignmentInfo *> assignments;
 		bool initialized = false;
 		bool output = false;
@@ -339,7 +341,6 @@ private:
 	Stage *stage = 0;
 	BlockVariableMap variables;
 	std::list<AssignmentInfo> assignments;
-	InterfaceBlock *interface_block = 0;
 	Assignment *r_assignment = 0;
 	bool assignment_target = false;
 	bool r_side_effects = false;