Mesa (glsl2): glsl2: Flatten expressions that appear as the children of ir_return as well.

Eric Anholt anholt at kemper.freedesktop.org
Tue Jul 13 02:55:42 UTC 2010


Module: Mesa
Branch: glsl2
Commit: 94da2abfd49c6b4060544986ef68d5662b1cc292
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=94da2abfd49c6b4060544986ef68d5662b1cc292

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Jul 12 19:31:54 2010 -0700

glsl2: Flatten expressions that appear as the children of ir_return as well.

---

 src/glsl/ir_expression_flattening.cpp |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/glsl/ir_expression_flattening.cpp b/src/glsl/ir_expression_flattening.cpp
index 629194c..66268a6 100644
--- a/src/glsl/ir_expression_flattening.cpp
+++ b/src/glsl/ir_expression_flattening.cpp
@@ -176,9 +176,7 @@ ir_expression_flattening_visitor::visit_enter(ir_call *ir)
 ir_visitor_status
 ir_expression_flattening_visitor::visit_enter(ir_return *ir)
 {
-   /* FINISHME: Why not process the return value? (Same behavior as original
-    * FINISHME: code.)
-    */
-   (void) ir;
-   return visit_continue_with_parent;
+   if (ir->value)
+      ir->value = operand_to_temp(ir->value);
+   return visit_continue;
 }




More information about the mesa-commit mailing list