Some rearranging and comments

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

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 080bfd7c2705001a40fdf8b97abeb9401c4821bd..9ab8ef70ef94dfc235e08ecee479792f9ae9cf2b 100644 (file)
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -728,6 +728,13 @@ void UnusedVariableRemover::visit(FunctionCall &call)
        /* Treat function calls as having side effects so expression statements
        consisting of nothing but a function call won't be optimized away. */
        r_side_effects = true;
+
+       if(stage->type==Stage::GEOMETRY && call.name=="EmitVertex")
+       {
+               for(map<Statement *, VariableInfo>::const_iterator i=variables.begin(); i!=variables.end(); ++i)
+                       if(i->second.output)
+                               referenced(i->first, call);
+       }
 }
 
 void UnusedVariableRemover::record_assignment(const Assignment::Target &target, Node &node)
@@ -802,29 +809,6 @@ void UnusedVariableRemover::visit(InterfaceBlock &iface)
        }
 }
 
-void UnusedVariableRemover::visit(FunctionDeclaration &func)
-{
-       if(func.body.body.empty())
-               return;
-
-       BlockVariableMap saved_vars = variables;
-       // Assignments from other functions should not be visible.
-       for(BlockVariableMap::iterator i=variables.begin(); i!=variables.end(); ++i)
-               i->second.assignments.resize(i->second.initialized);
-       TraversingVisitor::visit(func);
-       swap(variables, saved_vars);
-       merge_variables(saved_vars);
-
-       /* Always treat function parameters as referenced.  Removing unused
-       parameters is not currently supported. */
-       for(NodeArray<VariableDeclaration>::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
-       {
-               BlockVariableMap::iterator j = variables.find(i->get());
-               if(j!=variables.end())
-                       j->second.referenced = true;
-       }
-}
-
 void UnusedVariableRemover::merge_variables(const BlockVariableMap &other_vars)
 {
        for(BlockVariableMap::const_iterator i=other_vars.begin(); i!=other_vars.end(); ++i)
@@ -848,6 +832,29 @@ void UnusedVariableRemover::merge_variables(const BlockVariableMap &other_vars)
        }
 }
 
+void UnusedVariableRemover::visit(FunctionDeclaration &func)
+{
+       if(func.body.body.empty())
+               return;
+
+       BlockVariableMap saved_vars = variables;
+       // Assignments from other functions should not be visible.
+       for(BlockVariableMap::iterator i=variables.begin(); i!=variables.end(); ++i)
+               i->second.assignments.resize(i->second.initialized);
+       TraversingVisitor::visit(func);
+       swap(variables, saved_vars);
+       merge_variables(saved_vars);
+
+       /* Always treat function parameters as referenced.  Removing unused
+       parameters is not currently supported. */
+       for(NodeArray<VariableDeclaration>::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
+       {
+               BlockVariableMap::iterator j = variables.find(i->get());
+               if(j!=variables.end())
+                       j->second.referenced = true;
+       }
+}
+
 void UnusedVariableRemover::visit(Conditional &cond)
 {
        cond.condition->visit(*this);