X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.h;h=49699f2ed3811880e5ecbfb0495549379ff41784;hb=b006be7a2eccaeff9647b5b403d7d0a4ff13da3b;hp=25b7e4a0450d8d89e940579a87af356a74ee5ac1;hpb=7a16308e72aef363727b21348779673edf8e5c07;p=libs%2Fgl.git

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 25b7e4a0..49699f2e 100644
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -3,11 +3,12 @@
 
 #include <list>
 #include <map>
+#include <set>
 #include <string>
 #include <vector>
 #include <msp/core/refptr.h>
-#include "extension.h"
-#include "uniform.h"
+#include "features.h"
+#include "sourcemap.h"
 
 #pragma push_macro("interface")
 #undef interface
@@ -90,6 +91,7 @@ class NodeArray: public NodeContainer<std::vector<RefPtr<T> > >
 
 struct StructDeclaration;
 struct VariableDeclaration;
+struct InterfaceBlock;
 struct FunctionDeclaration;
 
 struct Statement: Node
@@ -106,10 +108,11 @@ struct Block: Node
 {
 	NodeList<Statement> body;
 	bool use_braces;
-	std::map<std::string, StructDeclaration *> types;
 	std::map<std::string, VariableDeclaration *> variables;
+	Block *parent;
 
 	Block();
+	Block(const Block &);
 
 	virtual Block *clone() const { return new Block(*this); }
 	virtual void visit(NodeVisitor &);
@@ -142,17 +145,33 @@ struct VariableReference: Expression
 	VariableDeclaration *declaration;
 
 	VariableReference();
+	VariableReference(const VariableReference &);
 
 	virtual VariableReference *clone() const { return new VariableReference(*this); }
 	virtual void visit(NodeVisitor &);
 };
 
+struct InterfaceBlockReference: Expression
+{
+	std::string name;
+	InterfaceBlock *declaration;
+
+	InterfaceBlockReference();
+	InterfaceBlockReference(const InterfaceBlockReference &);
+
+	virtual InterfaceBlockReference *clone() const { return new InterfaceBlockReference(*this); }
+	virtual void visit(NodeVisitor &);
+};
+
 struct MemberAccess: Expression
 {
 	NodePtr<Expression> left;
 	std::string member;
 	VariableDeclaration *declaration;
 
+	MemberAccess();
+	MemberAccess(const MemberAccess &);
+
 	virtual MemberAccess *clone() const { return new MemberAccess(*this); }
 	virtual void visit(NodeVisitor &);
 };
@@ -186,6 +205,7 @@ struct Assignment: BinaryExpression
 	VariableDeclaration *target_declaration;
 
 	Assignment();
+	Assignment(const Assignment &);
 
 	virtual Assignment *clone() const { return new Assignment(*this); }
 	virtual void visit(NodeVisitor &);
@@ -199,6 +219,7 @@ struct FunctionCall: Expression
 	NodeArray<Expression> arguments;
 
 	FunctionCall();
+	FunctionCall(const FunctionCall &);
 
 	virtual FunctionCall *clone() const { return new FunctionCall(*this); }
 	virtual void visit(NodeVisitor &);
@@ -233,9 +254,9 @@ struct Layout: Node
 {
 	struct Qualifier
 	{
-		// TODO the standard calls this name, not identifier
-		std::string identifier;
-		std::string value;
+		std::string name;
+		bool has_value;
+		int value;
 	};
 
 	std::vector<Qualifier> qualifiers;
@@ -281,6 +302,8 @@ struct VariableDeclaration: Statement
 	NodePtr<Layout> layout;
 
 	VariableDeclaration();
+	VariableDeclaration(const VariableDeclaration &);
+	~VariableDeclaration();
 
 	virtual VariableDeclaration *clone() const { return new VariableDeclaration(*this); }
 	virtual void visit(NodeVisitor &);
@@ -293,8 +316,11 @@ struct InterfaceBlock: Statement
 	Block members;
 	std::string instance_name;
 	bool array;
+	InterfaceBlock *linked_block;
 
 	InterfaceBlock();
+	InterfaceBlock(const InterfaceBlock &);
+	~InterfaceBlock();
 
 	virtual InterfaceBlock *clone() const { return new InterfaceBlock(*this); }
 	virtual void visit(NodeVisitor &);
@@ -373,17 +399,19 @@ struct Stage
 	Type type;
 	Stage *previous;
 	Block content;
-	std::map<std::string, VariableDeclaration *> in_variables;
-	std::map<std::string, VariableDeclaration *> out_variables;
+	std::map<std::string, StructDeclaration *> types;
+	std::map<std::string, InterfaceBlock *> interface_blocks;
 	std::map<std::string, unsigned> locations;
-	Version required_version;
-	std::vector<const Extension *> required_extensions;
+	Features required_features;
 
 	Stage(Type);
+
+	static const char *get_stage_name(Type);
 };
 
 struct Module
 {
+	SourceMap source_map;
 	Stage shared;
 	std::list<Stage> stages;