Unify handling of variables and interface blocks in the GLSL compiler

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

diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp
index d74291bc2840edd89391f6ce04e4fc04275bf5b2..38a7f003be8b239f360df2a143cf214ed50a43b8 100644 (file)
--- a/source/glsl/syntax.cpp
+++ b/source/glsl/syntax.cpp
@@ -104,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),
@@ -249,16 +238,11 @@ StructDeclaration::StructDeclaration()
 StructDeclaration::StructDeclaration(const StructDeclaration &other):
        TypeDeclaration(other),
        members(other.members),
+       block_name(other.block_name),
        extended_alignment(other.extended_alignment)
-       // Do not copy interface block
+       // 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);
@@ -278,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()
@@ -293,31 +277,6 @@ 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),
-       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),
@@ -403,7 +362,7 @@ string get_unused_variable_name(const Block &block, const string &base)
        }
 }
 
-const TypeDeclaration *get_ultimate_base_type(const TypeDeclaration *type)
+TypeDeclaration *get_ultimate_base_type(TypeDeclaration *type)
 {
        if(!type)
                return 0;