X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.h;h=95347e1bbb5831deaf9ffceb58cc1e196df25cde;hp=f7c8ed29cedc09229be11f5ce774d78f67107ee3;hb=HEAD;hpb=d8bdf61007978e2c3670a22a58e2f105e8347537 diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h index f7c8ed29..ebe188e1 100644 --- a/source/glsl/syntax.h +++ b/source/glsl/syntax.h @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include "features.h" @@ -40,7 +40,7 @@ struct Operator char token[4]; char token2[2]; - UInt8 precedence; + std::uint8_t precedence; Type type; Associativity assoc; @@ -60,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; @@ -78,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) { } @@ -94,7 +94,7 @@ template class NodeContainer: public C { public: - NodeContainer() { } + NodeContainer() = default; NodeContainer(const NodeContainer &); void push_back_nocopy(const typename C::value_type &v) @@ -111,7 +111,6 @@ class NodeArray: public NodeContainer > > struct TypeDeclaration; struct VariableDeclaration; -struct InterfaceBlock; struct FunctionDeclaration; struct Statement: Node @@ -122,12 +121,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); } @@ -136,12 +135,10 @@ struct Block: Node struct Expression: Node { - const Operator *oper; + const Operator *oper = 0; - TypeDeclaration *type; - bool lvalue; - - Expression(); + TypeDeclaration *type = 0; + bool lvalue = false; virtual Expression *clone() const = 0; }; @@ -159,36 +156,24 @@ 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); } 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 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); } @@ -199,10 +184,8 @@ struct Swizzle: Expression { NodePtr left; std::string component_group; - unsigned count; - UInt8 components[4]; - - Swizzle(); + unsigned count = 0; + std::uint8_t components[4] = { 0, 0, 0, 0 }; virtual Swizzle *clone() const { return new Swizzle(*this); } virtual void visit(NodeVisitor &); @@ -236,20 +219,20 @@ struct Assignment: BinaryExpression ARRAY = 0xC0 }; - Statement *declaration; - Msp::UInt8 chain_len; - Msp::UInt8 chain[7]; + VariableDeclaration *declaration = 0; + std::uint8_t chain_len = 0; + std::uint8_t chain[7] = { }; - Target(Statement * = 0); + Target(VariableDeclaration *d = 0): declaration(d) { } bool operator<(const Target &) const; }; - bool self_referencing; + bool self_referencing = false; Target target; - Assignment(); + Assignment() = default; Assignment(const Assignment &); virtual Assignment *clone() const { return new Assignment(*this); } @@ -269,12 +252,12 @@ struct TernaryExpression: Expression 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); } @@ -313,6 +296,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; @@ -351,13 +337,15 @@ struct BasicTypeDeclaration: TypeDeclaration ARRAY }; - Kind kind; - unsigned size; + Kind kind = ALIAS; + unsigned size = 0; + bool sign = true; + bool extended_alignment = false; std::string base; - TypeDeclaration *base_type; + TypeDeclaration *base_type = 0; - BasicTypeDeclaration(); + BasicTypeDeclaration() = default; BasicTypeDeclaration(const BasicTypeDeclaration &); virtual BasicTypeDeclaration *clone() const { return new BasicTypeDeclaration(*this); } @@ -374,15 +362,16 @@ struct ImageTypeDeclaration: TypeDeclaration CUBE }; - Dimensions dimensions; - bool array; - bool sampled; - bool shadow; + Dimensions dimensions = TWO; + bool array = false; + bool sampled = false; + bool shadow = false; + bool multisample = false; std::string base; + std::string format; - TypeDeclaration *base_type; - - ImageTypeDeclaration(); + TypeDeclaration *base_type = 0; + ImageTypeDeclaration *base_image = 0; virtual ImageTypeDeclaration *clone() const { return new ImageTypeDeclaration(*this); } virtual void visit(NodeVisitor &); @@ -391,12 +380,13 @@ struct ImageTypeDeclaration: TypeDeclaration struct StructDeclaration: TypeDeclaration { Block members; + std::string block_name; + bool extended_alignment = false; - InterfaceBlock *interface_block; + VariableDeclaration *block_declaration = 0; StructDeclaration(); StructDeclaration(const StructDeclaration &); - ~StructDeclaration(); virtual StructDeclaration *clone() const { return new StructDeclaration(*this); } virtual void visit(NodeVisitor &); @@ -405,21 +395,22 @@ 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; + StructDeclaration *block_declaration = 0; + VariableDeclaration *linked_declaration = 0; - VariableDeclaration(); + VariableDeclaration() = default; VariableDeclaration(const VariableDeclaration &); ~VariableDeclaration(); @@ -427,42 +418,20 @@ struct VariableDeclaration: Statement virtual void visit(NodeVisitor &); }; -struct InterfaceBlock: Statement -{ - std::string interface; - 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(); - InterfaceBlock(const InterfaceBlock &); - ~InterfaceBlock(); - - virtual InterfaceBlock *clone() const { return new InterfaceBlock(*this); } - virtual void visit(NodeVisitor &); -}; - struct FunctionDeclaration: Statement { std::string return_type; std::string name; NodeArray parameters; - bool virtua; - bool overrd; + bool virtua = false; + bool overrd = false; Block body; std::string signature; - FunctionDeclaration *definition; - TypeDeclaration *return_type_declaration; + FunctionDeclaration *definition = 0; + TypeDeclaration *return_type_declaration = 0; - FunctionDeclaration(); + FunctionDeclaration() = default; FunctionDeclaration(const FunctionDeclaration &); virtual FunctionDeclaration *clone() const { return new FunctionDeclaration(*this); } @@ -520,17 +489,23 @@ struct Stage { SHARED, VERTEX, + TESS_CONTROL, + TESS_EVAL, GEOMETRY, - FRAGMENT + FRAGMENT, + COMPUTE }; Type type; - Stage *previous; + Stage *previous = 0; Block content; std::map types; - std::map interface_blocks; + std::map interface_blocks; std::map functions; std::map locations; + std::map texture_bindings; + std::map uniform_block_bindings; + unsigned n_clip_distances = 0; Features required_features; std::vector diagnostics; @@ -549,6 +524,12 @@ struct Module }; std::string get_unused_variable_name(const Block &, const std::string &); +TypeDeclaration *get_ultimate_base_type(TypeDeclaration *); +bool has_layout_qualifier(const Layout *, const std::string &); +int get_layout_value(const Layout *, const std::string &, int = -1); +void add_layout_qualifier(RefPtr &, const Layout::Qualifier &); +void add_to_chain(Assignment::Target &, Assignment::Target::ChainType, unsigned); +bool targets_overlap(const Assignment::Target &, const Assignment::Target &); } // namespace SL } // namespace GL