Transform interface block contents into structs

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

diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp
index 931578640b94fc4f874b25648dfef01fd0330c0d..cb77419763645be5987842b9bd7d654eb30e13c5 100644 (file)
--- a/source/glsl/syntax.cpp
+++ b/source/glsl/syntax.cpp
@@ -94,7 +94,9 @@ void Block::visit(NodeVisitor &visitor)
 
 
 Expression::Expression():
-       oper(0)
+       oper(0),
+       type(0),
+       lvalue(false)
 { }
 
 
@@ -237,11 +239,57 @@ void InterfaceLayout::visit(NodeVisitor &visitor)
 }
 
 
-StructDeclaration::StructDeclaration()
+BasicTypeDeclaration::BasicTypeDeclaration():
+       kind(ALIAS),
+       size(0),
+       base_type(0)
+{ }
+
+BasicTypeDeclaration::BasicTypeDeclaration(const BasicTypeDeclaration &other):
+       TypeDeclaration(other),
+       kind(other.kind),
+       size(other.size),
+       base(other.base),
+       base_type(0)
+{ }
+
+void BasicTypeDeclaration::visit(NodeVisitor &visitor)
+{
+       visitor.visit(*this);
+}
+
+
+ImageTypeDeclaration::ImageTypeDeclaration():
+       dimensions(TWO),
+       array(false),
+       sampled(true),
+       shadow(false)
+{ }
+
+void ImageTypeDeclaration::visit(NodeVisitor &visitor)
+{
+       visitor.visit(*this);
+}
+
+
+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);
@@ -286,10 +334,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),
@@ -298,6 +346,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)
 { }
 
@@ -305,6 +355,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)
@@ -314,7 +366,8 @@ void InterfaceBlock::visit(NodeVisitor &visitor)
 
 
 FunctionDeclaration::FunctionDeclaration():
-       definition(0)
+       definition(0),
+       return_type_declaration(0)
 { }
 
 FunctionDeclaration::FunctionDeclaration(const FunctionDeclaration &other):
@@ -323,7 +376,8 @@ FunctionDeclaration::FunctionDeclaration(const FunctionDeclaration &other):
        name(other.name),
        parameters(other.parameters),
        body(other.body),
-       definition(other.definition==&other ? this : 0)
+       definition(other.definition==&other ? this : 0),
+       return_type_declaration(0)
 { }
 
 void FunctionDeclaration::visit(NodeVisitor &visitor)