X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.h;h=951a672d89eb3d90bcc38aecdc3fd78b0febebbc;hb=0febee9a8fdf1f9b03d3f2e23e72f8194b3698c7;hp=dc90b6eb5d36dc9b363ff0acbd01ba364c3f6a00;hpb=f6dfd3e78fc8c4c4a14619f3fdece53600ab0db7;p=libs%2Fgl.git

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index dc90b6eb..951a672d 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -61,13 +61,12 @@ class VariableResolver: private TraversingVisitor
 {
 private:
 	Stage *stage;
-	Block *builtins;
-	std::map<std::string, VariableDeclaration *> *members;
-	RefPtr<InterfaceBlockReference> iface_ref;
+	std::map<std::string, VariableDeclaration *> *r_members;
+	RefPtr<InterfaceBlockReference> r_iface_ref;
 	std::string block_interface;
 	bool record_target;
-	VariableDeclaration *assignment_target;
-	bool self_referencing;
+	bool r_self_referencing;
+	VariableDeclaration *r_assignment_target;
 
 public:
 	VariableResolver();
@@ -75,14 +74,14 @@ public:
 	void apply(Stage &);
 
 private:
-	Block *next_block(Block &);
-
 	virtual void enter(Block &);
 	virtual void visit(VariableReference &);
 	virtual void visit(InterfaceBlockReference &);
 	virtual void visit(MemberAccess &);
+	virtual void visit(UnaryExpression &);
 	virtual void visit(BinaryExpression &);
 	virtual void visit(Assignment &);
+	virtual void visit(FunctionCall &);
 	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(InterfaceBlock &);
@@ -93,7 +92,7 @@ class FunctionResolver: private TraversingVisitor
 {
 private:
 	Stage *stage;
-	std::map<std::string, std::vector<FunctionDeclaration *> > functions;
+	std::map<std::string, std::vector<FunctionDeclaration *> > declarations;
 
 public:
 	void apply(Stage &);
@@ -134,8 +133,8 @@ private:
 	static std::string get_out_prefix(Stage::Type);
 	std::string change_prefix(const std::string &, const std::string &) const;
 	virtual void visit(Block &);
-	bool generate_interface(VariableDeclaration &, const std::string &, const std::string &);
-	bool generate_interface(InterfaceBlock &);
+	VariableDeclaration *generate_interface(VariableDeclaration &, const std::string &, const std::string &);
+	InterfaceBlock *generate_interface(InterfaceBlock &);
 	ExpressionStatement &insert_assignment(const std::string &, Expression *);
 	virtual void visit(VariableReference &);
 	virtual void visit(VariableDeclaration &);
@@ -144,39 +143,6 @@ private:
 	virtual void visit(Passthrough &);
 };
 
-/** Reorders declarations to ensure that declarations always appear before
-references. */
-class DeclarationReorderer: private TraversingVisitor
-{
-private:
-	enum DeclarationKind
-	{
-		NO_DECLARATION,
-		LAYOUT,
-		STRUCT,
-		VARIABLE,
-		FUNCTION
-	};
-
-	DeclarationKind kind;
-	std::set<Node *> ordered_funcs;
-	std::set<Node *> needed_funcs;
-
-public:
-	DeclarationReorderer();
-
-	void apply(Stage &s) { s.content.visit(*this); }
-
-private:
-	virtual void visit(Block &);
-	virtual void visit(FunctionCall &);
-	virtual void visit(InterfaceLayout &) { kind = LAYOUT; }
-	virtual void visit(StructDeclaration &) { kind = STRUCT; }
-	virtual void visit(VariableDeclaration &);
-	virtual void visit(InterfaceBlock &) { kind = VARIABLE; }
-	virtual void visit(FunctionDeclaration &);
-};
-
 } // namespace SL
 } // namespace GL
 } // namespace Msp