From: Jason Ekstrand Date: Thu, 5 Mar 2020 23:17:40 +0000 (-0600) Subject: iris: Don't skip fast depth clears if the color changed X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9d07d598423e4015bbc7beb7a2fdc4c657d5e0cf;p=mesa.git iris: Don't skip fast depth clears if the color changed We depend on BLORP to convert the clear color and write it into the clear color buffer for us. However, we weren't bothering to call blorp in the case where the state is ISL_AUX_STATE_CLEAR. This leads to the clear color not getting properly updated if we have back-to-back clears with different clear colors. Technically, we could go out of our way to set the clear color directly from iris in this case but this is a case we're unlikely to see in the wild so let's not bother. This matches what we already do for color surfaces. Cc: mesa-stable@lists.freedesktop.org Reported-by: Mark Janes Reviewed-by: Nanley Chery Tested-by: Marge Bot Part-of: --- diff --git a/src/gallium/drivers/iris/iris_clear.c b/src/gallium/drivers/iris/iris_clear.c index 5f7914a5ba0..087b32f7180 100644 --- a/src/gallium/drivers/iris/iris_clear.c +++ b/src/gallium/drivers/iris/iris_clear.c @@ -521,7 +521,11 @@ fast_clear_depth(struct iris_context *ice, for (unsigned l = 0; l < box->depth; l++) { enum isl_aux_state aux_state = iris_resource_get_aux_state(res, level, box->z + l); - if (aux_state != ISL_AUX_STATE_CLEAR) { + if (update_clear_depth || aux_state != ISL_AUX_STATE_CLEAR) { + if (aux_state == ISL_AUX_STATE_CLEAR) { + perf_debug(&ice->dbg, "Performing HiZ clear just to update the " + "depth clear value\n"); + } iris_hiz_exec(ice, batch, res, level, box->z + l, 1, ISL_AUX_OP_FAST_CLEAR, update_clear_depth);