Mesa (glsl-continue-return): glsl: remove test for loop unrolling when we hit conditional cont/break

Brian Paul brianp at kemper.freedesktop.org
Thu Jun 25 20:12:51 UTC 2009


Module: Mesa
Branch: glsl-continue-return
Commit: 7ffa06c43438b26292c4eee8a290777ff0d88d37
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7ffa06c43438b26292c4eee8a290777ff0d88d37

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Jun 25 09:30:53 2009 -0600

glsl: remove test for loop unrolling when we hit conditional cont/break

This is no longer needed since we added the new
_slang_loop_contains_continue_or_break() function/test.

---

 src/mesa/shader/slang/slang_codegen.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index f182ae6..aa8e44c 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -3465,8 +3465,6 @@ _slang_gen_if(slang_assemble_ctx * A, const slang_operation *oper)
    if (is_operation_type(&oper->children[1], SLANG_OPER_BREAK)
        && !haveElseClause) {
       /* Special case: generate a conditional break */
-      if (!A->CurLoop) /* probably trying to unroll */
-         return NULL;
       ifBody = new_break_if_true(A, cond);
       return ifBody;
    }
@@ -3475,8 +3473,6 @@ _slang_gen_if(slang_assemble_ctx * A, const slang_operation *oper)
             && A->CurLoopOper
             && A->CurLoopOper->type != SLANG_OPER_FOR) {
       /* Special case: generate a conditional continue */
-      if (!A->CurLoop) /* probably trying to unroll */
-         return NULL;
       ifBody = new_cont_if_true(A, cond);
       return ifBody;
    }




More information about the mesa-commit mailing list