X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramsyntax.h;h=86cb6b906181e7686d4230dbbe1b6fbeb9cb1556;hb=fd103d76d7546f7e22aefc18c090a844fc67409f;hp=11a67430926849adee88a32cb636bcde544d1736;hpb=a36992487d018d8801ead6980b362b00a2f5f5c5;p=libs%2Fgl.git

diff --git a/source/programsyntax.h b/source/programsyntax.h
index 11a67430..86cb6b90 100644
--- a/source/programsyntax.h
+++ b/source/programsyntax.h
@@ -187,6 +187,7 @@ struct VariableDeclaration: Node
 	bool array;
 	NodePtr<Expression> array_size;
 	NodePtr<Expression> init_expression;
+	VariableDeclaration *linked_declaration;
 
 	VariableDeclaration();
 
@@ -241,6 +242,14 @@ struct Iteration: Node
 	virtual void visit(NodeVisitor &);
 };
 
+struct Passthrough: Node
+{
+	NodePtr<Expression> subscript;
+
+	virtual Passthrough *clone() const { return new Passthrough(*this); }
+	virtual void visit(NodeVisitor &);
+};
+
 struct Return: Node
 {
 	NodePtr<Expression> expression;
@@ -269,6 +278,7 @@ struct NodeVisitor
 	virtual void visit(FunctionDeclaration &) { }
 	virtual void visit(Conditional &) { }
 	virtual void visit(Iteration &) { }
+	virtual void visit(Passthrough &) { }
 	virtual void visit(Return &) { }
 };
 
@@ -287,32 +297,36 @@ struct TraversingVisitor: NodeVisitor
 	virtual void visit(FunctionDeclaration &);
 	virtual void visit(Conditional &);
 	virtual void visit(Iteration &);
+	virtual void visit(Passthrough &);
 	virtual void visit(Return &);
 };
 
-enum ContextType
+enum StageType
 {
-	GLOBAL,
+	SHARED,
 	VERTEX,
 	GEOMETRY,
 	FRAGMENT
 };
 
-struct Context
+struct Stage
 {
-	ContextType type;
+	StageType type;
 	bool present;
+	Stage *previous;
 	ProgramSyntax::Block content;
+	std::map<std::string, VariableDeclaration *> in_variables;
+	std::map<std::string, VariableDeclaration *> out_variables;
 
-	Context(ContextType);
+	Stage(StageType);
 };
 
 struct Module
 {
-	Context global_context;
-	Context vertex_context;
-	Context geometry_context;
-	Context fragment_context;
+	Stage shared;
+	Stage vertex_stage;
+	Stage geometry_stage;
+	Stage fragment_stage;
 
 	Module();
 };