X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.cpp;h=dff52639b0e2c835d43a4f622f4d4b590d8b13cf;hp=d0273909d68db900e0d95e79c08f1d2cf9f140cd;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=8f5f54a9e165dae424e5b0bb8e488c3d01849bf6 diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp index d0273909..dff52639 100644 --- a/source/glsl/syntax.cpp +++ b/source/glsl/syntax.cpp @@ -1,3 +1,4 @@ +#include #include #include "syntax.h" #include "visitor.h" @@ -69,16 +70,11 @@ template NodeContainer::NodeContainer(const NodeContainer &c): C(c) { - for(typename C::iterator i=this->begin(); i!=this->end(); ++i) - *i = (*i)->clone(); + for(auto &i: *this) + i = i->clone(); } -Block::Block(): - use_braces(false), - parent(0) -{ } - Block::Block(const Block &other): Node(other), body(other.body), @@ -92,27 +88,15 @@ void Block::visit(NodeVisitor &visitor) } -Expression::Expression(): - oper(0), - type(0), - lvalue(false) -{ } - - void Literal::visit(NodeVisitor &visitor) { visitor.visit(*this); } -VariableReference::VariableReference(): - declaration(0) -{ } - VariableReference::VariableReference(const VariableReference &other): Expression(other), - name(other.name), - declaration(0) + name(other.name) { } void VariableReference::visit(NodeVisitor &visitor) @@ -121,14 +105,9 @@ void VariableReference::visit(NodeVisitor &visitor) } -InterfaceBlockReference::InterfaceBlockReference(): - declaration(0) -{ } - InterfaceBlockReference::InterfaceBlockReference(const InterfaceBlockReference &other): Expression(other), - name(other.name), - declaration(0) + name(other.name) { } void InterfaceBlockReference::visit(NodeVisitor &visitor) @@ -137,15 +116,11 @@ void InterfaceBlockReference::visit(NodeVisitor &visitor) } -MemberAccess::MemberAccess(): - declaration(0) -{ } - MemberAccess::MemberAccess(const MemberAccess &other): Expression(other), left(other.left), - member(other.member), - declaration(0) + member(other.member) + // Do not copy declaration { } void MemberAccess::visit(NodeVisitor &visitor) @@ -154,12 +129,6 @@ void MemberAccess::visit(NodeVisitor &visitor) } -Swizzle::Swizzle(): - count(0) -{ - fill(components, components+4, 0); -} - void Swizzle::visit(NodeVisitor &visitor) { visitor.visit(*this); @@ -178,13 +147,10 @@ void BinaryExpression::visit(NodeVisitor &visitor) } -Assignment::Assignment(): - self_referencing(false) -{ } - Assignment::Assignment(const Assignment &other): BinaryExpression(other), self_referencing(other.self_referencing) + // Do not copy target { } void Assignment::visit(NodeVisitor &visitor) @@ -193,13 +159,6 @@ void Assignment::visit(NodeVisitor &visitor) } -Assignment::Target::Target(Statement *d): - declaration(d), - chain_len(0) -{ - fill(chain, chain+7, 0); -} - bool Assignment::Target::operator<(const Target &other) const { if(declaration!=other.declaration) @@ -217,17 +176,12 @@ void TernaryExpression::visit(NodeVisitor &visitor) } -FunctionCall::FunctionCall(): - constructor(false), - declaration(0) -{ } - FunctionCall::FunctionCall(const FunctionCall &other): Expression(other), name(other.name), constructor(other.constructor), - arguments(other.arguments), - declaration(0) + arguments(other.arguments) + // Do not copy declaration { } void FunctionCall::visit(NodeVisitor &visitor) @@ -266,18 +220,13 @@ void InterfaceLayout::visit(NodeVisitor &visitor) } -BasicTypeDeclaration::BasicTypeDeclaration(): - kind(ALIAS), - size(0), - base_type(0) -{ } - BasicTypeDeclaration::BasicTypeDeclaration(const BasicTypeDeclaration &other): TypeDeclaration(other), kind(other.kind), size(other.size), - base(other.base), - base_type(0) + sign(other.sign), + base(other.base) + // Do not copy base type { } void BasicTypeDeclaration::visit(NodeVisitor &visitor) @@ -286,29 +235,21 @@ void BasicTypeDeclaration::visit(NodeVisitor &visitor) } -ImageTypeDeclaration::ImageTypeDeclaration(): - dimensions(TWO), - array(false), - sampled(true), - shadow(false) -{ } - void ImageTypeDeclaration::visit(NodeVisitor &visitor) { visitor.visit(*this); } -StructDeclaration::StructDeclaration(): - interface_block(0) +StructDeclaration::StructDeclaration() { members.use_braces = true; } StructDeclaration::StructDeclaration(const StructDeclaration &other): TypeDeclaration(other), - members(other.members), - interface_block(0) + members(other.members) + // Do not copy interface block { } StructDeclaration::~StructDeclaration() @@ -323,13 +264,6 @@ void StructDeclaration::visit(NodeVisitor &visitor) } -VariableDeclaration::VariableDeclaration(): - constant(false), - array(false), - type_declaration(0), - linked_declaration(0) -{ } - VariableDeclaration::VariableDeclaration(const VariableDeclaration &other): Statement(other), layout(other.layout), @@ -342,9 +276,8 @@ VariableDeclaration::VariableDeclaration(const VariableDeclaration &other): name(other.name), array(other.array), array_size(other.array_size), - init_expression(other.init_expression), - type_declaration(0), - linked_declaration(0) + init_expression(other.init_expression) + // Do not copy type and linked declarations { } VariableDeclaration::~VariableDeclaration() @@ -359,23 +292,14 @@ void VariableDeclaration::visit(NodeVisitor &visitor) } -InterfaceBlock::InterfaceBlock(): - array(false), - type_declaration(0), - struct_declaration(0), - linked_block(0) -{ } - InterfaceBlock::InterfaceBlock(const InterfaceBlock &other): Statement(other), interface(other.interface), block_name(other.block_name), members(other.members), instance_name(other.instance_name), - array(other.array), - type_declaration(0), - struct_declaration(0), - linked_block(0) + array(other.array) + // Do not copy pointers to other nodes { } InterfaceBlock::~InterfaceBlock() @@ -392,13 +316,6 @@ void InterfaceBlock::visit(NodeVisitor &visitor) } -FunctionDeclaration::FunctionDeclaration(): - virtua(false), - overrd(false), - definition(0), - return_type_declaration(0) -{ } - FunctionDeclaration::FunctionDeclaration(const FunctionDeclaration &other): Statement(other), return_type(other.return_type), @@ -408,8 +325,8 @@ FunctionDeclaration::FunctionDeclaration(const FunctionDeclaration &other): overrd(other.overrd), body(other.body), signature(other.signature), - definition(other.definition==&other ? this : 0), - return_type_declaration(0) + definition(other.definition==&other ? this : 0) + // Do not copy return type declaration { } void FunctionDeclaration::visit(NodeVisitor &visitor) @@ -455,7 +372,7 @@ Stage::Stage(Stage::Type t): const char *Stage::get_stage_name(Type type) { - static const char *names[] = { "shared", "vertex", "geometry", "fragment" }; + static const char *const names[] = { "shared", "vertex", "geometry", "fragment" }; return names[type]; } @@ -485,72 +402,17 @@ string get_unused_variable_name(const Block &block, const string &base) } } -bool is_same_type(const TypeDeclaration &type1, const TypeDeclaration &type2) +int get_layout_value(const Layout &layout, const string &name, int def_value) { - if(const BasicTypeDeclaration *basic1 = dynamic_cast(&type1)) - { - const BasicTypeDeclaration *basic2 = dynamic_cast(&type2); - if(!basic2) - return false; - - if(basic1->kind!=basic2->kind || basic1->size!=basic2->size) - return false; - - if(basic1->base_type && basic2->base_type) - return is_same_type(*basic1->base_type, *basic2->base_type); - else - return (!basic1->base_type && !basic2->base_type); - } - else if(const ImageTypeDeclaration *image1 = dynamic_cast(&type1)) - { - const ImageTypeDeclaration *image2 = dynamic_cast(&type2); - if(!image2) - return false; - - if(image1->dimensions!=image2->dimensions || image1->array!=image2->array) - return false; - if(image1->sampled!=image2->sampled || image1->shadow!=image2->shadow) - return false; - - if(image1->base_type && image2->base_type) - return is_same_type(*image1->base_type, *image2->base_type); - else - return (!image1->base_type && !image2->base_type); - } - else if(const StructDeclaration *strct1 = dynamic_cast(&type1)) - { - const StructDeclaration *strct2 = dynamic_cast(&type2); - if(!strct2) - return false; - - NodeList::const_iterator i = strct1->members.body.begin(); - NodeList::const_iterator j = strct2->members.body.begin(); - for(; (i!=strct1->members.body.end() && j!=strct2->members.body.end()); ++i, ++j) - { - const VariableDeclaration *var1 = dynamic_cast(i->get()); - const VariableDeclaration *var2 = dynamic_cast(j->get()); - if(!var1 || !var1->type_declaration || !var2 || !var2->type_declaration) - return false; - if(!is_same_type(*var1->type_declaration, *var2->type_declaration)) - return false; - if(var1->name!=var2->name || var1->array!=var2->array) - return false; - // TODO Compare array sizes - // TODO Compare layout qualifiers for interface block members - } - - return (i==strct1->members.body.end() && j==strct2->members.body.end()); - } - else - return false; + auto i = find_member(layout.qualifiers, name, &Layout::Qualifier::name); + return (i!=layout.qualifiers.end() ? i->value : def_value); } -int get_layout_value(const Layout &layout, const string &name, int def_value) +void add_to_chain(Assignment::Target &target, Assignment::Target::ChainType type, unsigned index) { - for(vector::const_iterator i=layout.qualifiers.begin(); i!=layout.qualifiers.end(); ++i) - if(i->name==name) - return i->value; - return def_value; + if(target.chain_len<7) + target.chain[target.chain_len] = type | min(index, 0x3F); + ++target.chain_len; } } // namespace SL