X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.cpp;h=d74291bc2840edd89391f6ce04e4fc04275bf5b2;hb=4ecc965177df174ed2d26cfedf24665c8879acda;hp=8b00e82e46eae73f397c599f6a9e3ea0008b4e3a;hpb=ba55832910f04b90695da360b5889fa85e83c1e1;p=libs%2Fgl.git diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp index 8b00e82e..d74291bc 100644 --- a/source/glsl/syntax.cpp +++ b/source/glsl/syntax.cpp @@ -78,8 +78,7 @@ NodeContainer::NodeContainer(const NodeContainer &c): 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) @@ -225,6 +224,7 @@ BasicTypeDeclaration::BasicTypeDeclaration(const BasicTypeDeclaration &other): kind(other.kind), size(other.size), sign(other.sign), + extended_alignment(other.extended_alignment), base(other.base) // Do not copy base type { } @@ -248,7 +248,8 @@ StructDeclaration::StructDeclaration() StructDeclaration::StructDeclaration(const StructDeclaration &other): TypeDeclaration(other), - members(other.members) + members(other.members), + extended_alignment(other.extended_alignment) // Do not copy interface block { } @@ -294,6 +295,7 @@ void VariableDeclaration::visit(NodeVisitor &visitor) InterfaceBlock::InterfaceBlock(const InterfaceBlock &other): Statement(other), + layout(other.layout), interface(other.interface), block_name(other.block_name), members(other.members), @@ -401,10 +403,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) { - auto i = find_member(layout.qualifiers, name, &Layout::Qualifier::name); - return (i!=layout.qualifiers.end() ? i->value : 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) +{ + if(!layout) + layout = new Layout; + layout->qualifiers.push_back(q); } void add_to_chain(Assignment::Target &target, Assignment::Target::ChainType type, unsigned index) @@ -414,6 +446,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<