From 76e3530f45a14853964c4af852c7a76c4c0427c8 Mon Sep 17 00:00:00 2001 From: Nanley Chery Date: Mon, 13 Feb 2023 16:45:02 -0800 Subject: [PATCH] iris: Update comment in iris_cache_flush_for_render Update the comment to reflect the fact that iris no longer switches between CCS_E and CCS_D. Cc: 23.0 Reviewed-by: Kenneth Graunke Part-of: (cherry picked from commit ad9c0b7a84c5f73a53a4b8f99a48f83d3e833b20) --- .pick_status.json | 2 +- src/gallium/drivers/iris/iris_resolve.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index d082b1e3416..f65d702d49f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -517,7 +517,7 @@ "description": "iris: Update comment in iris_cache_flush_for_render", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/iris/iris_resolve.c b/src/gallium/drivers/iris/iris_resolve.c index 40633154745..bf54633af9d 100644 --- a/src/gallium/drivers/iris/iris_resolve.c +++ b/src/gallium/drivers/iris/iris_resolve.c @@ -398,10 +398,10 @@ iris_cache_flush_for_render(struct iris_batch *batch, * but with a different aux usage. If it has, flush the render cache so we * ensure that it's only in there with one aux usage at a time. * - * Even though it's not obvious, this can easily happen in practice. + * Even though it's not obvious, this could easily happen in practice. * Suppose a client is blending on a surface with sRGB encode enabled on * gfx9. This implies that you get AUX_USAGE_CCS_D at best. If the client - * then disables sRGB decode and continues blending we will flip on + * then disables sRGB decode and continues blending we could flip on * AUX_USAGE_CCS_E without doing any sort of resolve in-between (this is * perfectly valid since CCS_E is a subset of CCS_D). However, this means * that we have fragments in-flight which are rendering with UNORM+CCS_E