Recognize swizzles in GLSL

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

diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp
index d7eec3da4bf680cbf4125d0cb747feccd54af38d..85d805d1b67aeea72ee41bcec1855222732dc5ef 100644 (file)
--- a/source/glsl/syntax.cpp
+++ b/source/glsl/syntax.cpp
@@ -161,6 +161,18 @@ void MemberAccess::visit(NodeVisitor &visitor)
 }
 
 
+Swizzle::Swizzle():
+       count(0)
+{
+       fill(components, components+4, 0);
+}
+
+void Swizzle::visit(NodeVisitor &visitor)
+{
+       visitor.visit(*this);
+}
+
+
 void UnaryExpression::visit(NodeVisitor &visitor)
 {
        visitor.visit(*this);
@@ -272,11 +284,24 @@ void ImageTypeDeclaration::visit(NodeVisitor &visitor)
 }
 
 
-StructDeclaration::StructDeclaration()
+StructDeclaration::StructDeclaration():
+       interface_block(0)
 {
        members.use_braces = true;
 }
 
+StructDeclaration::StructDeclaration(const StructDeclaration &other):
+       TypeDeclaration(other),
+       members(other.members),
+       interface_block(0)
+{ }
+
+StructDeclaration::~StructDeclaration()
+{
+       if(interface_block && interface_block->struct_declaration==this)
+               interface_block->struct_declaration = 0;
+}
+
 void StructDeclaration::visit(NodeVisitor &visitor)
 {
        visitor.visit(*this);
@@ -321,10 +346,10 @@ void VariableDeclaration::visit(NodeVisitor &visitor)
 
 InterfaceBlock::InterfaceBlock():
        array(false),
+       type_declaration(0),
+       struct_declaration(0),
        linked_block(0)
-{
-       members.use_braces = true;
-}
+{ }
 
 InterfaceBlock::InterfaceBlock(const InterfaceBlock &other):
        Statement(other),
@@ -333,6 +358,8 @@ InterfaceBlock::InterfaceBlock(const InterfaceBlock &other):
        members(other.members),
        instance_name(other.instance_name),
        array(other.array),
+       type_declaration(0),
+       struct_declaration(0),
        linked_block(0)
 { }
 
@@ -340,6 +367,8 @@ 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)