X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.h;h=a3b217d40895f2d6e4ae790abec56082094b6e95;hp=2c832c149e2467ba346867eb453cc8850b7a11a6;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=50ab5ca2babc8d9592903da6072a13b381ed6656 diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h index 2c832c14..a3b217d4 100644 --- a/source/glsl/syntax.h +++ b/source/glsl/syntax.h @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include "features.h" @@ -26,7 +27,8 @@ struct Operator NO_OPERATOR, BINARY, PREFIX, - POSTFIX + POSTFIX, + TERNARY }; enum Associativity @@ -37,7 +39,8 @@ struct Operator }; char token[4]; - unsigned precedence; + char token2[2]; + std::uint8_t precedence; Type type; Associativity assoc; @@ -48,6 +51,7 @@ struct Operator enum { + INTERNAL_SOURCE = -2, BUILTIN_SOURCE = -1, GENERATED_SOURCE = 0 }; @@ -56,15 +60,15 @@ struct NodeVisitor; struct Node { - int source; - unsigned line; + int source = GENERATED_SOURCE; + unsigned line = 1; - Node(): source(GENERATED_SOURCE), line(1) { } - Node(const Node &n): source(n.source), line(n.line) { } + Node() = default; + Node(const Node &) = default; private: Node &operator=(const Node &); public: - virtual ~Node() { } + virtual ~Node() = default; virtual Node *clone() const = 0; virtual void visit(NodeVisitor &) = 0; @@ -74,10 +78,10 @@ template class NodePtr: public RefPtr { public: - NodePtr() { } + NodePtr() = default; NodePtr(T *p): RefPtr(p) { } NodePtr(const NodePtr &p): RefPtr(p ? p->clone() : 0) { } - NodePtr &operator=(const NodePtr &p) { RefPtr::operator=(p); return *this; } + NodePtr &operator=(const NodePtr &p) = default; template NodePtr(const RefPtr &p): RefPtr(p) { } @@ -90,8 +94,11 @@ template class NodeContainer: public C { public: - NodeContainer() { } + NodeContainer() = default; NodeContainer(const NodeContainer &); + + void push_back_nocopy(const typename C::value_type &v) + { C::push_back(0); C::back() = v; } }; template @@ -115,12 +122,12 @@ struct Statement: Node struct Block: Node { NodeList body; - bool use_braces; + bool use_braces = false; std::map variables; - Block *parent; + Block *parent = 0; - Block(); + Block() = default; Block(const Block &); virtual Block *clone() const { return new Block(*this); } @@ -129,12 +136,10 @@ struct Block: Node struct Expression: Node { - const Operator *oper; - - TypeDeclaration *type; - bool lvalue; + const Operator *oper = 0; - Expression(); + TypeDeclaration *type = 0; + bool lvalue = false; virtual Expression *clone() const = 0; }; @@ -148,21 +153,13 @@ struct Literal: Expression 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; - VariableDeclaration *declaration; + VariableDeclaration *declaration = 0; - VariableReference(); + VariableReference() = default; VariableReference(const VariableReference &); virtual VariableReference *clone() const { return new VariableReference(*this); } @@ -173,9 +170,9 @@ struct InterfaceBlockReference: Expression { std::string name; - InterfaceBlock *declaration; + InterfaceBlock *declaration = 0; - InterfaceBlockReference(); + InterfaceBlockReference() = default; InterfaceBlockReference(const InterfaceBlockReference &); virtual InterfaceBlockReference *clone() const { return new InterfaceBlockReference(*this); } @@ -187,15 +184,27 @@ struct MemberAccess: Expression NodePtr left; std::string member; - VariableDeclaration *declaration; + VariableDeclaration *declaration = 0; + int index = -1; - MemberAccess(); + MemberAccess() = default; MemberAccess(const MemberAccess &); virtual MemberAccess *clone() const { return new MemberAccess(*this); } virtual void visit(NodeVisitor &); }; +struct Swizzle: Expression +{ + NodePtr left; + std::string component_group; + unsigned count = 0; + std::uint8_t components[4] = { 0, 0, 0, 0 }; + + virtual Swizzle *clone() const { return new Swizzle(*this); } + virtual void visit(NodeVisitor &); +}; + struct UnaryExpression: Expression { NodePtr expression; @@ -215,26 +224,54 @@ struct BinaryExpression: Expression struct Assignment: BinaryExpression { - bool self_referencing; + struct Target + { + enum ChainType + { + MEMBER = 0x40, + SWIZZLE = 0x80, + ARRAY = 0xC0 + }; + + Statement *declaration = 0; + std::uint8_t chain_len = 0; + std::uint8_t chain[7] = { }; + + Target(Statement *d = 0): declaration(d) { } - VariableDeclaration *target_declaration; + bool operator<(const Target &) const; + }; + + bool self_referencing = false; + + Target target; - Assignment(); + Assignment() = default; Assignment(const Assignment &); virtual Assignment *clone() const { return new Assignment(*this); } 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; - bool constructor; + bool constructor = false; NodeArray arguments; - FunctionDeclaration *declaration; + FunctionDeclaration *declaration = 0; - FunctionCall(); + FunctionCall() = default; FunctionCall(const FunctionCall &); virtual FunctionCall *clone() const { return new FunctionCall(*this); } @@ -273,6 +310,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; @@ -311,13 +351,14 @@ struct BasicTypeDeclaration: TypeDeclaration ARRAY }; - Kind kind; - unsigned size; + Kind kind = ALIAS; + unsigned size = 0; + bool sign = true; std::string base; - TypeDeclaration *base_type; + TypeDeclaration *base_type = 0; - BasicTypeDeclaration(); + BasicTypeDeclaration() = default; BasicTypeDeclaration(const BasicTypeDeclaration &); virtual BasicTypeDeclaration *clone() const { return new BasicTypeDeclaration(*this); } @@ -334,15 +375,13 @@ struct ImageTypeDeclaration: TypeDeclaration CUBE }; - Dimensions dimensions; - bool array; - bool sampled; - bool shadow; + Dimensions dimensions = TWO; + bool array = false; + bool sampled = true; + bool shadow = false; std::string base; - TypeDeclaration *base_type; - - ImageTypeDeclaration(); + TypeDeclaration *base_type = 0; virtual ImageTypeDeclaration *clone() const { return new ImageTypeDeclaration(*this); } virtual void visit(NodeVisitor &); @@ -352,7 +391,11 @@ struct StructDeclaration: TypeDeclaration { Block members; + InterfaceBlock *interface_block = 0; + StructDeclaration(); + StructDeclaration(const StructDeclaration &); + ~StructDeclaration(); virtual StructDeclaration *clone() const { return new StructDeclaration(*this); } virtual void visit(NodeVisitor &); @@ -361,21 +404,21 @@ struct StructDeclaration: TypeDeclaration struct VariableDeclaration: Statement { NodePtr layout; - bool constant; + bool constant = false; std::string sampling; std::string interpolation; std::string interface; std::string precision; std::string type; std::string name; - bool array; + bool array = false; NodePtr array_size; NodePtr init_expression; - TypeDeclaration *type_declaration; - VariableDeclaration *linked_declaration; + TypeDeclaration *type_declaration = 0; + VariableDeclaration *linked_declaration = 0; - VariableDeclaration(); + VariableDeclaration() = default; VariableDeclaration(const VariableDeclaration &); ~VariableDeclaration(); @@ -385,15 +428,20 @@ 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; + bool array = false; - InterfaceBlock *linked_block; + /* 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 = 0; + StructDeclaration *struct_declaration = 0; + InterfaceBlock *linked_block = 0; - InterfaceBlock(); + InterfaceBlock() = default; InterfaceBlock(const InterfaceBlock &); ~InterfaceBlock(); @@ -406,12 +454,15 @@ struct FunctionDeclaration: Statement std::string return_type; std::string name; NodeArray parameters; + bool virtua = false; + bool overrd = false; Block body; - FunctionDeclaration *definition; - TypeDeclaration *return_type_declaration; + std::string signature; + FunctionDeclaration *definition = 0; + TypeDeclaration *return_type_declaration = 0; - FunctionDeclaration(); + FunctionDeclaration() = default; FunctionDeclaration(const FunctionDeclaration &); virtual FunctionDeclaration *clone() const { return new FunctionDeclaration(*this); } @@ -480,6 +531,8 @@ struct Stage 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; @@ -497,6 +550,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