Mesa (master): radeonsi: remove new asserts and replace with warnings

[Alex Deucher]

Module: Mesa
Branch: master
Commit: 7bba4879bb79719e22a18b52759b1d1d839c783c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7bba4879bb79719e22a18b52759b1d1d839c783c

Author: Alex Deucher <alexander.deucher at amd.com>
Date:   Thu Nov 15 15:36:46 2012 -0500

radeonsi: remove new asserts and replace with warnings

Fixes piglit regressions.

Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

---

 src/gallium/drivers/radeonsi/si_state.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index e0e0524..db305d4 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -1606,7 +1606,9 @@ static void si_cb(struct r600_context *rctx, struct si_pm4_state *pm4,
 	}
 
 	format = si_translate_colorformat(surf->base.format);
-	assert(format != V_028C70_COLOR_INVALID);
+	if (format == V_028C70_COLOR_INVALID) {
+		R600_ERR("Invalid CB format: %d, disabling CB.\n", surf->base.format);
+	}
 	swap = si_translate_colorswap(surf->base.format);
 	if (rtex->resource.b.b.usage == PIPE_USAGE_STAGING) {
 		endian = V_028C70_ENDIAN_NONE;
@@ -1688,7 +1690,9 @@ static void si_db(struct r600_context *rctx, struct si_pm4_state *pm4,
 
 	format = si_translate_dbformat(rtex->real_format);
 
-	assert(format != V_028040_Z_INVALID);
+	if (format == V_028040_Z_INVALID) {
+		R600_ERR("Invalid DB format: %d, disabling DB.\n", rtex->real_format);
+	}
 
 	z_offs = r600_resource_va(rctx->context.screen, surf->base.texture);
 	z_offs += rtex->surface.level[level].offset;