Improve support for interface blocks

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

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 4f1f8629a58f46964fc34ba7bb11e172b39f2037..1ebb87c5c2ea23360c33917104745273de6d8da0 100644 (file)
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -46,7 +46,7 @@ FunctionInliner::FunctionInliner():
 void FunctionInliner::apply(Stage &stage)
 {
        inlineable = InlineableFunctionLocator().apply(stage);
-       visit(stage.content);
+       stage.content.visit(*this);
 }
 
 void FunctionInliner::visit_and_inline(RefPtr<Expression> &ptr)
@@ -129,7 +129,7 @@ ConstantConditionEliminator::ConstantConditionEliminator():
 
 void ConstantConditionEliminator::apply(Stage &stage)
 {
-       visit(stage.content);
+       stage.content.visit(*this);
        NodeRemover().apply(stage, nodes_to_remove);
 }
 
@@ -160,7 +160,7 @@ void ConstantConditionEliminator::visit(Assignment &assign)
 
 void ConstantConditionEliminator::visit(VariableDeclaration &var)
 {
-       if(var.constant || current_block->parent)
+       if((var.constant || current_block->parent) && var.init_expression)
                variable_values[&var] = var.init_expression.get();
 }
 
@@ -231,7 +231,7 @@ UnusedVariableRemover::UnusedVariableRemover():
 bool UnusedVariableRemover::apply(Stage &stage)
 {
        variables.push_back(BlockVariableMap());
-       visit(stage.content);
+       stage.content.visit(*this);
        BlockVariableMap &global_variables = variables.back();
        for(BlockVariableMap::iterator i=global_variables.begin(); i!=global_variables.end(); ++i)
        {
@@ -264,6 +264,11 @@ void UnusedVariableRemover::visit(VariableReference &var)
        }
 }
 
+void UnusedVariableRemover::visit(InterfaceBlockReference &iface)
+{
+       unused_nodes.erase(iface.declaration);
+}
+
 void UnusedVariableRemover::visit(MemberAccess &memacc)
 {
        TraversingVisitor::visit(memacc);
@@ -444,7 +449,7 @@ void UnusedVariableRemover::visit(Iteration &iter)
 
 bool UnusedFunctionRemover::apply(Stage &stage)
 {
-       visit(stage.content);
+       stage.content.visit(*this);
        NodeRemover().apply(stage, unused_nodes);
        return !unused_nodes.empty();
 }