Mesa (master): glsl2: Add missing sig_iter.next() to the no-constant-folding-to-outvals fix.

Eric Anholt anholt at kemper.freedesktop.org
Mon Aug 23 14:26:05 UTC 2010


Module: Mesa
Branch: master
Commit: ea709696185846c876581e1c41a21921826823ec
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ea709696185846c876581e1c41a21921826823ec

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Aug 23 07:05:07 2010 -0700

glsl2: Add missing sig_iter.next() to the no-constant-folding-to-outvals fix.

---

 src/glsl/ir_constant_folding.cpp |    1 +
 src/glsl/ir_tree_grafting.cpp    |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/glsl/ir_constant_folding.cpp b/src/glsl/ir_constant_folding.cpp
index 5d77093..3e6934c 100644
--- a/src/glsl/ir_constant_folding.cpp
+++ b/src/glsl/ir_constant_folding.cpp
@@ -117,6 +117,7 @@ ir_constant_folding_visitor::visit_enter(ir_call *ir)
 	    param_rval->replace_with(new_param);
 	 }
       }
+      sig_iter.next();
    }
 
    return visit_continue_with_parent;
diff --git a/src/glsl/ir_tree_grafting.cpp b/src/glsl/ir_tree_grafting.cpp
index 748dcec..9b569b8 100644
--- a/src/glsl/ir_tree_grafting.cpp
+++ b/src/glsl/ir_tree_grafting.cpp
@@ -202,6 +202,7 @@ ir_tree_grafting_visitor::visit_enter(ir_call *ir)
 	 ir->replace_with(new_ir);
 	 return visit_stop;
       }
+      sig_iter.next();
    }
 
    return visit_continue;




More information about the mesa-commit mailing list