Module: Mesa Branch: 7.9 Commit: e1918fd5d59208e8d7befcbb6ce15414f8bdc863 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e1918fd5d59208e8d7befcbb6ce15414f8bdc863
Author: Tom Stellard <tstel...@gmail.com> Date: Tue Sep 28 09:57:18 2010 -0700 r300/compiler: Don't use rc_error() unless the error is unrecoverable https://bugs.freedesktop.org/show_bug.cgi?id=30416 (cherry picked from commit 1b76dde0cd90509da0acc631f6599fb6f7fe676d) --- .../dri/r300/compiler/radeon_emulate_loops.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_emulate_loops.c b/src/mesa/drivers/dri/r300/compiler/radeon_emulate_loops.c index cd4fcba..02a52f9 100644 --- a/src/mesa/drivers/dri/r300/compiler/radeon_emulate_loops.c +++ b/src/mesa/drivers/dri/r300/compiler/radeon_emulate_loops.c @@ -386,8 +386,6 @@ static int build_loop_info(struct radeon_compiler * c, struct loop_info * loop, case RC_OPCODE_SNE: break; default: - rc_error(c, "%s: expected conditional", - __FUNCTION__); return 0; } loop->Cond = loop->If->Prev; @@ -431,8 +429,10 @@ static int transform_loop(struct emulate_loop_state * s, loop = &s->Loops[s->LoopCount++]; - if (!build_loop_info(s->C, loop, inst)) + if (!build_loop_info(s->C, loop, inst)) { + rc_error(s->C, "Failed to build loop info\n"); return 0; + } if(try_unroll_loop(s->C, loop)){ return 1; _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
