X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.cpp;h=45765f27d88dbf0599e9de494a5ceea90dc64dd4;hp=4526bf2bd986075f6bfe50e50dae1eabf2ebd204;hb=76cc18518fc8b0b4fa11fda153e7d9b3899ed112;hpb=91e65bc9e24a6889995081035f6f6f0a78a6c20e diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp index 4526bf2b..45765f27 100644 --- a/source/glsl/syntax.cpp +++ b/source/glsl/syntax.cpp @@ -1,3 +1,4 @@ +#include #include #include "syntax.h" #include "visitor.h" @@ -69,21 +70,15 @@ 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), - use_braces(other.use_braces), - parent(0) + use_braces(other.use_braces) { } void Block::visit(NodeVisitor &visitor) @@ -92,27 +87,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 +104,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,17 +115,11 @@ void InterfaceBlockReference::visit(NodeVisitor &visitor) } -MemberAccess::MemberAccess(): - declaration(0), - index(-1) -{ } - MemberAccess::MemberAccess(const MemberAccess &other): Expression(other), left(other.left), - member(other.member), - declaration(0), - index(-1) + member(other.member) + // Do not copy declaration { } void MemberAccess::visit(NodeVisitor &visitor) @@ -156,12 +128,6 @@ void MemberAccess::visit(NodeVisitor &visitor) } -Swizzle::Swizzle(): - count(0) -{ - fill(components, components+4, 0); -} - void Swizzle::visit(NodeVisitor &visitor) { visitor.visit(*this); @@ -180,13 +146,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) @@ -195,13 +158,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) @@ -219,17 +175,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) @@ -268,20 +219,13 @@ void InterfaceLayout::visit(NodeVisitor &visitor) } -BasicTypeDeclaration::BasicTypeDeclaration(): - kind(ALIAS), - size(0), - sign(true), - base_type(0) -{ } - BasicTypeDeclaration::BasicTypeDeclaration(const BasicTypeDeclaration &other): TypeDeclaration(other), kind(other.kind), size(other.size), sign(other.sign), - base(other.base), - base_type(0) + base(other.base) + // Do not copy base type { } void BasicTypeDeclaration::visit(NodeVisitor &visitor) @@ -290,29 +234,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() @@ -327,13 +263,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), @@ -346,9 +275,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() @@ -363,23 +291,15 @@ 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), + layout(other.layout), 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() @@ -396,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), @@ -412,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) @@ -453,13 +366,12 @@ void Jump::visit(NodeVisitor &visitor) Stage::Stage(Stage::Type t): - type(t), - previous(0) + 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]; } @@ -489,12 +401,40 @@ string get_unused_variable_name(const Block &block, const string &base) } } -int get_layout_value(const Layout &layout, const string &name, int def_value) +const TypeDeclaration *get_ultimate_base_type(const TypeDeclaration *type) +{ + if(!type) + return 0; + while(const BasicTypeDeclaration *basic = dynamic_cast(type)) + { + if(!basic->base_type) + break; + type = basic->base_type; + } + return type; +} + +bool has_layout_qualifier(const Layout *layout, const string &name) +{ + if(!layout) + return false; + auto i = find_member(layout->qualifiers, name, &Layout::Qualifier::name); + return i!=layout->qualifiers.end(); +} + +int get_layout_value(const Layout *layout, const string &name, int def_value) +{ + if(!layout) + return def_value; + auto i = find_member(layout->qualifiers, name, &Layout::Qualifier::name); + return (i!=layout->qualifiers.end() ? i->value : def_value); +} + +void add_layout_qualifier(RefPtr &layout, const Layout::Qualifier &q) { - for(vector::const_iterator i=layout.qualifiers.begin(); i!=layout.qualifiers.end(); ++i) - if(i->name==name) - return i->value; - return def_value; + if(!layout) + layout = new Layout; + layout->qualifiers.push_back(q); } void add_to_chain(Assignment::Target &target, Assignment::Target::ChainType type, unsigned index) @@ -504,6 +444,32 @@ void add_to_chain(Assignment::Target &target, Assignment::Target::ChainType type ++target.chain_len; } +bool targets_overlap(const Assignment::Target &target1, const Assignment::Target &target2) +{ + bool overlap = (target1.declaration==target2.declaration); + for(unsigned i=0; (overlap && i(target1.chain[i]&0xC0); + Assignment::Target::ChainType type2 = static_cast(target2.chain[i]&0xC0); + unsigned index1 = target1.chain[i]&0x3F; + unsigned index2 = target2.chain[i]&0x3F; + if(type1==Assignment::Target::SWIZZLE || type2==Assignment::Target::SWIZZLE) + { + if(type1==Assignment::Target::SWIZZLE && type2==Assignment::Target::SWIZZLE) + overlap = index1&index2; + else if(type1==Assignment::Target::ARRAY && index1<4) + overlap = index2&(1<