From: Tom Stellard <tstellar@gmail.com>
Date: Tue, 28 Sep 2010 16:57:18 +0000 (-0700)
Subject: r300/compiler: Don't use rc_error() unless the error is unrecoverable
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1b76dde0cd90509da0acc631f6599fb6f7fe676d;p=mesa.git

r300/compiler: Don't use rc_error() unless the error is unrecoverable

https://bugs.freedesktop.org/show_bug.cgi?id=30416

NOTE: This is a candidate for the 7.9 branch.
---

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 cd4fcbabb93..02a52f92fc3 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;