OSDN Git Service

radeonsi: remove new asserts and replace with warnings
authorAlex Deucher <alexander.deucher@amd.com>
Thu, 15 Nov 2012 20:36:46 +0000 (15:36 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 15 Nov 2012 20:46:02 +0000 (15:46 -0500)
Fixes piglit regressions.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
src/gallium/drivers/radeonsi/si_state.c

index e0e0524..db305d4 100644 (file)
@@ -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;