X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.cpp;h=38a7f003be8b239f360df2a143cf214ed50a43b8;hb=77f6973f58167d94059d3f324c29ab2ca8de4544;hp=8b00e82e46eae73f397c599f6a9e3ea0008b4e3a;hpb=ba55832910f04b90695da360b5889fa85e83c1e1;p=libs%2Fgl.git

diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp
index 8b00e82e..38a7f003 100644
--- a/source/glsl/syntax.cpp
+++ b/source/glsl/syntax.cpp
@@ -78,8 +78,7 @@ NodeContainer<C>::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)
@@ -105,17 +104,6 @@ void VariableReference::visit(NodeVisitor &visitor)
 }
 
 
-InterfaceBlockReference::InterfaceBlockReference(const InterfaceBlockReference &other):
-	Expression(other),
-	name(other.name)
-{ }
-
-void InterfaceBlockReference::visit(NodeVisitor &visitor)
-{
-	visitor.visit(*this);
-}
-
-
 MemberAccess::MemberAccess(const MemberAccess &other):
 	Expression(other),
 	left(other.left),
@@ -225,6 +213,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,16 +237,12 @@ StructDeclaration::StructDeclaration()
 
 StructDeclaration::StructDeclaration(const StructDeclaration &other):
 	TypeDeclaration(other),
-	members(other.members)
-	// Do not copy interface block
+	members(other.members),
+	block_name(other.block_name),
+	extended_alignment(other.extended_alignment)
+	// Do not copy block declaration
 { }
 
-StructDeclaration::~StructDeclaration()
-{
-	if(interface_block && interface_block->struct_declaration==this)
-		interface_block->struct_declaration = 0;
-}
-
 void StructDeclaration::visit(NodeVisitor &visitor)
 {
 	visitor.visit(*this);
@@ -277,7 +262,7 @@ VariableDeclaration::VariableDeclaration(const VariableDeclaration &other):
 	array(other.array),
 	array_size(other.array_size),
 	init_expression(other.init_expression)
-	// Do not copy type and linked declarations
+	// Do not copy pointers to other nodes
 { }
 
 VariableDeclaration::~VariableDeclaration()
@@ -292,30 +277,6 @@ void VariableDeclaration::visit(NodeVisitor &visitor)
 }
 
 
-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)
-	// Do not copy pointers to other nodes
-{ }
-
-InterfaceBlock::~InterfaceBlock()
-{
-	if(linked_block && linked_block->linked_block==this)
-		linked_block->linked_block = 0;
-	if(struct_declaration && struct_declaration->interface_block==this)
-		struct_declaration->interface_block = 0;
-}
-
-void InterfaceBlock::visit(NodeVisitor &visitor)
-{
-	visitor.visit(*this);
-}
-
-
 FunctionDeclaration::FunctionDeclaration(const FunctionDeclaration &other):
 	Statement(other),
 	return_type(other.return_type),
@@ -401,10 +362,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)
+TypeDeclaration *get_ultimate_base_type(TypeDeclaration *type)
 {
-	auto i = find_member(layout.qualifiers, name, &Layout::Qualifier::name);
-	return (i!=layout.qualifiers.end() ? i->value : def_value);
+	if(!type)
+		return 0;
+	while(const BasicTypeDeclaration *basic = dynamic_cast<const BasicTypeDeclaration *>(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> &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 +405,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_len && i<target2.chain_len); ++i)
+	{
+		Assignment::Target::ChainType type1 = static_cast<Assignment::Target::ChainType>(target1.chain[i]&0xC0);
+		Assignment::Target::ChainType type2 = static_cast<Assignment::Target::ChainType>(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<<index1);
+			else if(type2==Assignment::Target::ARRAY && index2<4)
+				overlap = index1&(1<<index2);
+			// Treat other combinations as overlapping (shouldn't happen)
+		}
+		else
+			overlap = (type1==type2 && (index1==index2 || index1==0x3F || index2==0x3F));
+	}
+
+	return overlap;
+}
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp