r300: Added a warning when texture state update fails.

1 files changed, 9 insertions, 11 deletions

diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c
index 14b0c6063b7..b17652e4ddf 100644
--- a/src/mesa/drivers/dri/r300/r300_texstate.c
+++ b/src/mesa/drivers/dri/r300/r300_texstate.c
@@ -590,15 +590,13 @@ static GLboolean r300UpdateTextureUnit(GLcontext * ctx, int unit)
 
 void r300UpdateTextureState(GLcontext * ctx)
 {
-	GLboolean ok;
-
-	ok = (r300UpdateTextureUnit(ctx, 0) &&
-	      r300UpdateTextureUnit(ctx, 1) &&
-	      r300UpdateTextureUnit(ctx, 2) &&
-	      r300UpdateTextureUnit(ctx, 3) &&
-	      r300UpdateTextureUnit(ctx, 4) &&
-	      r300UpdateTextureUnit(ctx, 5) &&
-	      r300UpdateTextureUnit(ctx, 6) &&
-	      r300UpdateTextureUnit(ctx, 7)
-	      );
+	int i;
+
+	for (i = 0; i < 8; i++) {
+		if (!r300UpdateTextureUnit(ctx, i)) {
+			_mesa_warning(ctx,
+				      "failed to update texture state for unit %d.\n",
+				      i);
+		}
+	}
 }