From 8bbd4f32bffc7cdd4ff37c05efea60ff64135edd Mon Sep 17 00:00:00 2001 From: Rafael Antognolli Date: Wed, 3 Jul 2019 09:37:47 -0700 Subject: [PATCH] iris: Allow resolving clear color of CCS_D surfaces. Reviewed-by: Jason Ekstrand --- src/gallium/drivers/iris/iris_resolve.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/iris/iris_resolve.c b/src/gallium/drivers/iris/iris_resolve.c index 87c9d64561f..fb07d169f8d 100644 --- a/src/gallium/drivers/iris/iris_resolve.c +++ b/src/gallium/drivers/iris/iris_resolve.c @@ -756,9 +756,8 @@ get_ccs_d_resolve_op(enum isl_aux_state aux_state, { assert(aux_usage == ISL_AUX_USAGE_NONE || aux_usage == ISL_AUX_USAGE_CCS_D); - const bool ccs_supported = aux_usage == ISL_AUX_USAGE_CCS_D; - - assert(ccs_supported == fast_clear_supported); + const bool ccs_supported = + (aux_usage == ISL_AUX_USAGE_CCS_D) && fast_clear_supported; switch (aux_state) { case ISL_AUX_STATE_CLEAR: @@ -791,9 +790,6 @@ get_ccs_e_resolve_op(enum isl_aux_state aux_state, aux_usage == ISL_AUX_USAGE_CCS_D || aux_usage == ISL_AUX_USAGE_CCS_E); - if (aux_usage == ISL_AUX_USAGE_CCS_D) - assert(fast_clear_supported); - switch (aux_state) { case ISL_AUX_STATE_CLEAR: case ISL_AUX_STATE_PARTIAL_CLEAR: -- 2.30.2