X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=807b7a89ac90feb4c8f2d57afbeb2e2f5bb17596;hb=abcd1fa06f9fab27c5934b4069523dd009862b18;hp=75fffa13bb4fcaf6527d56ab676a7b88553cb8c5;hpb=1420854eb3827b8229bae2c2c6cebdd34a320f13;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 75fffa13..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 &);
@@ -195,7 +194,6 @@ private:
 	virtual void visit(BinaryExpression &);
 	virtual void visit(StructDeclaration &) { }
 	virtual void visit(VariableDeclaration &);
-	virtual void visit(InterfaceBlock &) { }
 	virtual void visit(FunctionDeclaration &);
 };
 
@@ -311,7 +309,6 @@ private:
 	virtual void visit(ImageTypeDeclaration &);
 	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
-	virtual void visit(InterfaceBlock &);
 	virtual void visit(FunctionDeclaration &);
 };
 
@@ -336,7 +333,7 @@ private:
 		bool referenced = false;
 	};
 
-	typedef std::map<Statement *, VariableInfo> BlockVariableMap;
+	typedef std::map<VariableDeclaration *, VariableInfo> BlockVariableMap;
 
 	Stage *stage = 0;
 	BlockVariableMap variables;
@@ -357,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 &);
@@ -370,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 &);