X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=82fc78cc546e562b5c77ea096112ae2ec59fab38;hb=6997ed1c07c382c0f66c57c080934ad53e1d3713;hp=1eb0464e7daea97d654576c15792a13e764d8c27;hpb=24e4eea282917c3f6e4e16a2825372da64133e35;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 1eb0464e..82fc78cc 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;
@@ -161,6 +162,7 @@ private:
 	struct AggregateMember
 	{
 		const VariableDeclaration *declaration = 0;
+		unsigned index = 0;
 		RefPtr<Expression> initializer;
 		std::vector<RefPtr<Expression> *> references;
 	};
@@ -194,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
@@ -274,6 +277,7 @@ private:
 	virtual void visit(Iteration &);
 };
 
+/** Removes code which is never executed due to flow control statements. */
 class UnreachableCodeRemover: private TraversingVisitor
 {
 private:
@@ -326,7 +330,6 @@ private:
 
 	struct VariableInfo
 	{
-		InterfaceBlock *interface_block = 0;
 		std::vector<AssignmentInfo *> assignments;
 		bool initialized = false;
 		bool output = false;
@@ -338,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;