X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.h;h=55f47402f514538b959a459a07b3532e2a0d5efd;hb=7f29c6d2a4eee36538d7ccf24980e749592e2444;hp=7764712498bb3106666f3e8bee98de72881516df;hpb=9d798ac368bfd236a7632a3a15e51bd1112ea63d;p=libs%2Fgl.git

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 77647124..55f47402 100644
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -3,12 +3,12 @@
 
 #include <list>
 #include <map>
+#include <set>
 #include <string>
 #include <vector>
 #include <msp/core/refptr.h>
-#include "extension.h"
+#include "features.h"
 #include "sourcemap.h"
-#include "uniform.h"
 
 #pragma push_macro("interface")
 #undef interface
@@ -91,6 +91,7 @@ class NodeArray: public NodeContainer<std::vector<RefPtr<T> > >
 
 struct StructDeclaration;
 struct VariableDeclaration;
+struct InterfaceBlock;
 struct FunctionDeclaration;
 
 struct Statement: Node
@@ -107,10 +108,12 @@ 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 &);
@@ -140,20 +143,39 @@ struct ParenthesizedExpression: Expression
 struct VariableReference: Expression
 {
 	std::string name;
+
 	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 &);
 };
@@ -184,9 +206,11 @@ struct BinaryExpression: Expression
 struct Assignment: BinaryExpression
 {
 	bool self_referencing;
+
 	VariableDeclaration *target_declaration;
 
 	Assignment();
+	Assignment(const Assignment &);
 
 	virtual Assignment *clone() const { return new Assignment(*this); }
 	virtual void visit(NodeVisitor &);
@@ -195,11 +219,13 @@ struct Assignment: BinaryExpression
 struct FunctionCall: Expression
 {
 	std::string name;
-	FunctionDeclaration *declaration;
 	bool constructor;
 	NodeArray<Expression> arguments;
 
+	FunctionDeclaration *declaration;
+
 	FunctionCall();
+	FunctionCall(const FunctionCall &);
 
 	virtual FunctionCall *clone() const { return new FunctionCall(*this); }
 	virtual void visit(NodeVisitor &);
@@ -234,9 +260,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;
@@ -267,21 +293,24 @@ struct StructDeclaration: Statement
 
 struct VariableDeclaration: Statement
 {
+	NodePtr<Layout> layout;
 	bool constant;
 	std::string sampling;
 	std::string interpolation;
 	std::string interface;
 	std::string precision;
 	std::string type;
-	StructDeclaration *type_declaration;
 	std::string name;
 	bool array;
 	NodePtr<Expression> array_size;
 	NodePtr<Expression> init_expression;
+
+	StructDeclaration *type_declaration;
 	VariableDeclaration *linked_declaration;
-	NodePtr<Layout> layout;
 
 	VariableDeclaration();
+	VariableDeclaration(const VariableDeclaration &);
+	~VariableDeclaration();
 
 	virtual VariableDeclaration *clone() const { return new VariableDeclaration(*this); }
 	virtual void visit(NodeVisitor &);
@@ -295,7 +324,11 @@ struct InterfaceBlock: Statement
 	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 &);
@@ -306,9 +339,10 @@ struct FunctionDeclaration: Statement
 	std::string return_type;
 	std::string name;
 	NodeArray<VariableDeclaration> parameters;
-	FunctionDeclaration *definition;
 	Block body;
 
+	FunctionDeclaration *definition;
+
 	FunctionDeclaration();
 	FunctionDeclaration(const FunctionDeclaration &);
 
@@ -374,11 +408,10 @@ 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);