X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramsyntax.h;h=c502ba47a90f32701bc885e44006ff48a8d93c24;hb=48e37a09b49cd4148db390170cfd07eef92c9d02;hp=089683323c507b81573b0c908163f9b28337de7d;hpb=f1c6ef565577ac322693255d764eea1f2cab9e77;p=libs%2Fgl.git

diff --git a/source/programsyntax.h b/source/programsyntax.h
index 08968332..c502ba47 100644
--- a/source/programsyntax.h
+++ b/source/programsyntax.h
@@ -5,6 +5,7 @@
 #include <map>
 #include <string>
 #include <vector>
+#include "extension.h"
 
 namespace Msp {
 namespace GL {
@@ -181,12 +182,20 @@ struct Layout: Node
 	};
 
 	std::vector<Qualifier> qualifiers;
-	std::string interface;
 
 	virtual Layout *clone() const { return new Layout(*this); }
 	virtual void visit(NodeVisitor &);
 };
 
+struct InterfaceLayout: Node
+{
+	std::string interface;
+	Layout layout;
+
+	virtual InterfaceLayout *clone() const { return new InterfaceLayout(*this); }
+	virtual void visit(NodeVisitor &);
+};
+
 struct StructDeclaration: Node
 {
 	std::string name;
@@ -210,6 +219,7 @@ struct VariableDeclaration: Node
 	NodePtr<Expression> array_size;
 	NodePtr<Expression> init_expression;
 	VariableDeclaration *linked_declaration;
+	NodePtr<Layout> layout;
 
 	VariableDeclaration();
 
@@ -299,6 +309,7 @@ struct NodeVisitor
 	virtual void visit(ExpressionStatement &) { }
 	virtual void visit(Import &) { }
 	virtual void visit(Layout &) { }
+	virtual void visit(InterfaceLayout &) { }
 	virtual void visit(StructDeclaration &) { }
 	virtual void visit(VariableDeclaration &) { }
 	virtual void visit(InterfaceBlock &) { }
@@ -318,6 +329,7 @@ struct TraversingVisitor: NodeVisitor
 	virtual void visit(BinaryExpression &);
 	virtual void visit(FunctionCall &);
 	virtual void visit(ExpressionStatement &);
+	virtual void visit(InterfaceLayout &);
 	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(InterfaceBlock &);
@@ -343,6 +355,8 @@ struct Stage
 	ProgramSyntax::Block content;
 	std::map<std::string, VariableDeclaration *> in_variables;
 	std::map<std::string, VariableDeclaration *> out_variables;
+	std::map<std::string, unsigned> locations;
+	Version required_version;
 
 	Stage(StageType);
 };