Reduce coupling between the GLSL compiler and the graphics engine

[libs/gl.git] / source / glsl / syntax.h

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 7764712498bb3106666f3e8bee98de72881516df..3fb848d2ceb81a91fdc07ab19f0e072b0b71010c 100644 (file)
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -6,9 +6,8 @@
 #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
@@ -107,10 +106,13 @@ struct Block: Node
 {
        NodeList<Statement> body;
        bool use_braces;
+       bool anonymous;
        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 &);
@@ -143,6 +145,7 @@ struct VariableReference: Expression
        VariableDeclaration *declaration;
 
        VariableReference();
+       VariableReference(const VariableReference &);
 
        virtual VariableReference *clone() const { return new VariableReference(*this); }
        virtual void visit(NodeVisitor &);
@@ -154,6 +157,9 @@ struct MemberAccess: Expression
        std::string member;
        VariableDeclaration *declaration;
 
+       MemberAccess();
+       MemberAccess(const MemberAccess &);
+
        virtual MemberAccess *clone() const { return new MemberAccess(*this); }
        virtual void visit(NodeVisitor &);
 };
@@ -187,6 +193,7 @@ struct Assignment: BinaryExpression
        VariableDeclaration *target_declaration;
 
        Assignment();
+       Assignment(const Assignment &);
 
        virtual Assignment *clone() const { return new Assignment(*this); }
        virtual void visit(NodeVisitor &);
@@ -200,6 +207,7 @@ struct FunctionCall: Expression
        NodeArray<Expression> arguments;
 
        FunctionCall();
+       FunctionCall(const FunctionCall &);
 
        virtual FunctionCall *clone() const { return new FunctionCall(*this); }
        virtual void visit(NodeVisitor &);
@@ -282,6 +290,7 @@ struct VariableDeclaration: Statement
        NodePtr<Layout> layout;
 
        VariableDeclaration();
+       VariableDeclaration(const VariableDeclaration &);
 
        virtual VariableDeclaration *clone() const { return new VariableDeclaration(*this); }
        virtual void visit(NodeVisitor &);
@@ -377,8 +386,7 @@ struct Stage
        std::map<std::string, VariableDeclaration *> in_variables;
        std::map<std::string, VariableDeclaration *> out_variables;
        std::map<std::string, unsigned> locations;
-       Version required_version;
-       std::vector<const Extension *> required_extensions;
+       Features required_features;
 
        Stage(Type);