Refactor a common part in LocationAllocator into a function

[libs/gl.git] / source / glsl / syntax.cpp

diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp
index dff52639b0e2c835d43a4f622f4d4b590d8b13cf..1489eb9e2af7e04ec542deb1c740efa6d8fc4d7f 100644 (file)
--- a/source/glsl/syntax.cpp
+++ b/source/glsl/syntax.cpp
@@ -294,6 +294,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),
@@ -366,8 +367,7 @@ void Jump::visit(NodeVisitor &visitor)
 
 
 Stage::Stage(Stage::Type t):
-       type(t),
-       previous(0)
+       type(t)
 { }
 
 const char *Stage::get_stage_name(Type type)
@@ -415,6 +415,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