#include <set>
#include <string>
#include <vector>
-#include <msp/core/inttypes.h>
+#include <cstdint>
#include <msp/core/refptr.h>
#include <msp/core/variant.h>
#include "features.h"
char token[4];
char token2[2];
- UInt8 precedence;
+ std::uint8_t precedence;
Type type;
Associativity assoc;
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;
class NodePtr: public RefPtr<T>
{
public:
- NodePtr() { }
+ NodePtr() = default;
NodePtr(T *p): RefPtr<T>(p) { }
NodePtr(const NodePtr &p): RefPtr<T>(p ? p->clone() : 0) { }
- NodePtr &operator=(const NodePtr &p) { RefPtr<T>::operator=(p); return *this; }
+ NodePtr &operator=(const NodePtr &p) = default;
template<typename U>
NodePtr(const RefPtr<U> &p): RefPtr<T>(p) { }
class NodeContainer: public C
{
public:
- NodeContainer() { }
+ NodeContainer() = default;
NodeContainer(const NodeContainer &);
void push_back_nocopy(const typename C::value_type &v)
struct TypeDeclaration;
struct VariableDeclaration;
-struct InterfaceBlock;
struct FunctionDeclaration;
struct Statement: Node
struct Block: Node
{
NodeList<Statement> body;
- bool use_braces;
+ bool use_braces = false;
std::map<std::string, VariableDeclaration *> variables;
- Block *parent;
+ Block *parent = 0;
- Block();
+ Block() = default;
Block(const Block &);
virtual Block *clone() const { return new Block(*this); }
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;
};
{
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<Expression> left;
std::string member;
- VariableDeclaration *declaration;
- int index;
+ VariableDeclaration *declaration = 0;
+ int index = -1;
- MemberAccess();
+ MemberAccess() = default;
MemberAccess(const MemberAccess &);
virtual MemberAccess *clone() const { return new MemberAccess(*this); }
{
NodePtr<Expression> 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 &);
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); }
struct FunctionCall: Expression
{
std::string name;
- bool constructor;
+ bool constructor = false;
NodeArray<Expression> arguments;
- FunctionDeclaration *declaration;
+ FunctionDeclaration *declaration = 0;
- FunctionCall();
+ FunctionCall() = default;
FunctionCall(const FunctionCall &);
virtual FunctionCall *clone() const { return new FunctionCall(*this); }
bool has_value;
int value;
- Qualifier(): has_value(false), value(0) { }
+ 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<Qualifier> qualifiers;
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); }
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 &);
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 &);
struct VariableDeclaration: Statement
{
NodePtr<Layout> 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<Expression> array_size;
NodePtr<Expression> 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();
virtual void visit(NodeVisitor &);
};
-struct InterfaceBlock: Statement
-{
- NodePtr<Layout> layout;
- std::string interface;
- std::string block_name;
- NodePtr<Block> 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<VariableDeclaration> 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); }
{
SHARED,
VERTEX,
+ TESS_CONTROL,
+ TESS_EVAL,
GEOMETRY,
- FRAGMENT
+ FRAGMENT,
+ COMPUTE
};
Type type;
- Stage *previous;
+ Stage *previous = 0;
Block content;
std::map<std::string, TypeDeclaration *> types;
- std::map<std::string, InterfaceBlock *> interface_blocks;
+ std::map<std::string, VariableDeclaration *> interface_blocks;
std::map<std::string, FunctionDeclaration *> functions;
std::map<std::string, unsigned> locations;
std::map<std::string, unsigned> texture_bindings;
std::map<std::string, unsigned> uniform_block_bindings;
+ unsigned n_clip_distances = 0;
Features required_features;
std::vector<Diagnostic> diagnostics;
};
std::string get_unused_variable_name(const Block &, const std::string &);
-
-bool is_same_type(const TypeDeclaration &, const TypeDeclaration &);
-int get_layout_value(const Layout &, const std::string &, int = -1);
+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<Layout> &, 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
projects / libs / gl.git / blobdiff