X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.h;h=7fa116b717dd388e5a2acba6001dc34c74226bab;hp=f275eab8c4ae454ee369ac10e40d3c0e4499190a;hb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;hpb=a82fcc462550d63a101aca4313807b1320789a5a diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h index f275eab8..7fa116b7 100644 --- a/source/glsl/syntax.h +++ b/source/glsl/syntax.h @@ -6,7 +6,9 @@ #include #include #include +#include #include +#include #include "features.h" #include "glsl_error.h" #include "sourcemap.h" @@ -25,7 +27,8 @@ struct Operator NO_OPERATOR, BINARY, PREFIX, - POSTFIX + POSTFIX, + TERNARY }; enum Associativity @@ -36,7 +39,8 @@ struct Operator }; char token[4]; - unsigned precedence; + char token2[2]; + std::uint8_t precedence; Type type; Associativity assoc; @@ -47,6 +51,7 @@ struct Operator enum { + INTERNAL_SOURCE = -2, BUILTIN_SOURCE = -1, GENERATED_SOURCE = 0 }; @@ -91,6 +96,9 @@ class NodeContainer: public C public: NodeContainer() { } NodeContainer(const NodeContainer &); + + void push_back_nocopy(const typename C::value_type &v) + { C::push_back(0); C::back() = v; } }; template @@ -101,7 +109,7 @@ template class NodeArray: public NodeContainer > > { }; -struct StructDeclaration; +struct TypeDeclaration; struct VariableDeclaration; struct InterfaceBlock; struct FunctionDeclaration; @@ -130,6 +138,9 @@ struct Expression: Node { const Operator *oper; + TypeDeclaration *type; + bool lvalue; + Expression(); virtual Expression *clone() const = 0; @@ -138,19 +149,12 @@ struct Expression: Node struct Literal: Expression { std::string token; + Variant value; virtual Literal *clone() const { return new Literal(*this); } virtual void visit(NodeVisitor &); }; -struct ParenthesizedExpression: Expression -{ - NodePtr expression; - - virtual ParenthesizedExpression *clone() const { return new ParenthesizedExpression(*this); } - virtual void visit(NodeVisitor &); -}; - struct VariableReference: Expression { std::string name; @@ -183,6 +187,7 @@ struct MemberAccess: Expression std::string member; VariableDeclaration *declaration; + int index; MemberAccess(); MemberAccess(const MemberAccess &); @@ -191,6 +196,19 @@ struct MemberAccess: Expression virtual void visit(NodeVisitor &); }; +struct Swizzle: Expression +{ + NodePtr left; + std::string component_group; + unsigned count; + std::uint8_t components[4]; + + Swizzle(); + + virtual Swizzle *clone() const { return new Swizzle(*this); } + virtual void visit(NodeVisitor &); +}; + struct UnaryExpression: Expression { NodePtr expression; @@ -210,9 +228,27 @@ struct BinaryExpression: Expression struct Assignment: BinaryExpression { + struct Target + { + enum ChainType + { + MEMBER = 0x40, + SWIZZLE = 0x80, + ARRAY = 0xC0 + }; + + Statement *declaration; + std::uint8_t chain_len; + std::uint8_t chain[7]; + + Target(Statement * = 0); + + bool operator<(const Target &) const; + }; + bool self_referencing; - VariableDeclaration *target_declaration; + Target target; Assignment(); Assignment(const Assignment &); @@ -221,6 +257,16 @@ struct Assignment: BinaryExpression virtual void visit(NodeVisitor &); }; +struct TernaryExpression: Expression +{ + NodePtr condition; + NodePtr true_expr; + NodePtr false_expr; + + virtual TernaryExpression *clone() const { return new TernaryExpression(*this); } + virtual void visit(NodeVisitor &); +}; + struct FunctionCall: Expression { std::string name; @@ -268,6 +314,9 @@ struct Layout: Node std::string name; bool has_value; int value; + + Qualifier(const std::string &n = std::string()): name(n), has_value(false), value(0) { } + Qualifier(const std::string &n, int v): name(n), has_value(true), value(v) { } }; std::vector qualifiers; @@ -285,12 +334,74 @@ struct InterfaceLayout: Statement virtual void visit(NodeVisitor &); }; -struct StructDeclaration: Statement +struct TypeDeclaration: Statement { std::string name; + + virtual TypeDeclaration *clone() const = 0; +}; + +struct BasicTypeDeclaration: TypeDeclaration +{ + enum Kind + { + ALIAS, + VOID, + BOOL, + INT, + FLOAT, + VECTOR, + MATRIX, + ARRAY + }; + + Kind kind; + unsigned size; + bool sign; + std::string base; + + TypeDeclaration *base_type; + + BasicTypeDeclaration(); + BasicTypeDeclaration(const BasicTypeDeclaration &); + + virtual BasicTypeDeclaration *clone() const { return new BasicTypeDeclaration(*this); } + virtual void visit(NodeVisitor &); +}; + +struct ImageTypeDeclaration: TypeDeclaration +{ + enum Dimensions + { + ONE = 1, + TWO, + THREE, + CUBE + }; + + Dimensions dimensions; + bool array; + bool sampled; + bool shadow; + std::string base; + + TypeDeclaration *base_type; + + ImageTypeDeclaration(); + + virtual ImageTypeDeclaration *clone() const { return new ImageTypeDeclaration(*this); } + virtual void visit(NodeVisitor &); +}; + +struct StructDeclaration: TypeDeclaration +{ Block members; + InterfaceBlock *interface_block; + StructDeclaration(); + StructDeclaration(const StructDeclaration &); + ~StructDeclaration(); virtual StructDeclaration *clone() const { return new StructDeclaration(*this); } virtual void visit(NodeVisitor &); @@ -310,7 +421,7 @@ struct VariableDeclaration: Statement NodePtr array_size; NodePtr init_expression; - StructDeclaration *type_declaration; + TypeDeclaration *type_declaration; VariableDeclaration *linked_declaration; VariableDeclaration(); @@ -323,12 +434,17 @@ struct VariableDeclaration: Statement struct InterfaceBlock: Statement { + NodePtr layout; std::string interface; - std::string name; - Block members; + std::string block_name; + NodePtr members; std::string instance_name; bool array; + /* An interface block's ultimate base type is always a struct. The + immediate type may be either that same struct or an array of it. */ + TypeDeclaration *type_declaration; + StructDeclaration *struct_declaration; InterfaceBlock *linked_block; InterfaceBlock(); @@ -344,9 +460,13 @@ struct FunctionDeclaration: Statement std::string return_type; std::string name; NodeArray parameters; + bool virtua; + bool overrd; Block body; + std::string signature; FunctionDeclaration *definition; + TypeDeclaration *return_type_declaration; FunctionDeclaration(); FunctionDeclaration(const FunctionDeclaration &); @@ -413,10 +533,12 @@ struct Stage Type type; Stage *previous; Block content; - std::map types; + std::map types; std::map interface_blocks; std::map functions; std::map locations; + std::map texture_bindings; + std::map uniform_block_bindings; Features required_features; std::vector diagnostics; @@ -434,6 +556,11 @@ struct Module Module(); }; +std::string get_unused_variable_name(const Block &, const std::string &); + +int get_layout_value(const Layout &, const std::string &, int = -1); +void add_to_chain(Assignment::Target &, Assignment::Target::ChainType, unsigned); + } // namespace SL } // namespace GL } // namespace Msp