From: Marek Olšák <marek.olsak@amd.com>
Date: Wed, 6 May 2020 16:27:56 +0000 (-0400)
Subject: radeonsi: use correct clear value size for EQAA in expand_fmask
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9f8089139f1be6f30628fad033d87fdb8c804f80;p=mesa.git

radeonsi: use correct clear value size for EQAA in expand_fmask

based on the fmask_expand_values array.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4935>
---

diff --git a/src/gallium/drivers/radeonsi/si_compute_blit.c b/src/gallium/drivers/radeonsi/si_compute_blit.c
index 53bc34df508..c167a8bc7ee 100644
--- a/src/gallium/drivers/radeonsi/si_compute_blit.c
+++ b/src/gallium/drivers/radeonsi/si_compute_blit.c
@@ -687,7 +687,8 @@ void si_compute_expand_fmask(struct pipe_context *ctx, struct pipe_resource *tex
    /* Clear FMASK to identity. */
    struct si_texture *stex = (struct si_texture *)tex;
    si_clear_buffer(sctx, tex, stex->surface.fmask_offset, stex->surface.fmask_size,
-                   (uint32_t *)&fmask_expand_values[log_fragments][log_samples - 1], 4,
+                   (uint32_t *)&fmask_expand_values[log_fragments][log_samples - 1],
+                   log_fragments >= 2 && log_samples == 4 ? 8 : 4,
                    SI_COHERENCY_SHADER, false);
 }