summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Deucher <[email protected]>2012-11-15 15:36:46 -0500
committerAlex Deucher <[email protected]>2012-11-15 15:46:02 -0500
commit7bba4879bb79719e22a18b52759b1d1d839c783c (patch)
tree250ad67f9260fd5a51d922201676c1ab4d89d9d1 /src
parentd010e70a07ab4a0b24aad8c9693a7f9c680d6164 (diff)
radeonsi: remove new asserts and replace with warnings
Fixes piglit regressions. Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/radeonsi/si_state.c8
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 e0e0524797c..db305d40bf7 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;