From 0bcf214da32438ab8bf722ee8d9fea8940b6fcf9 Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Mon, 7 Nov 2022 14:22:21 +0100 Subject: [PATCH] etnaviv: fix late Z with MSAA active On RA_WRITE_DEPTH GPUs the RA stage needs to be told that MSAA is active when the PE Z/S stage is needed. Not sure what it does exactly, but this fixes broken late Z on those GPUs when performing MSAA rendering. Cc: 22.3 mesa-stable Signed-off-by: Lucas Stach Reviewed-by: Christian Gmeiner Part-of: (cherry picked from commit 2f85d9095e3559597bc1cf0051ab6d7bc18faecd) --- .pick_status.json | 2 +- src/gallium/drivers/etnaviv/etnaviv_state.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index bf05b15..0a680d6 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2146,7 +2146,7 @@ "description": "etnaviv: fix late Z with MSAA active", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/etnaviv/etnaviv_state.c b/src/gallium/drivers/etnaviv/etnaviv_state.c index 7505096..794e682 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_state.c +++ b/src/gallium/drivers/etnaviv/etnaviv_state.c @@ -777,6 +777,13 @@ etna_update_zsa(struct etna_context *ctx) */ if (late_z_test || (early_z_test && late_z_write)) new_ra_depth |= VIVS_RA_EARLY_DEPTH_HDEPTH_DISABLE; + + if (ctx->framebuffer_s.nr_cbufs > 0) { + struct pipe_resource *res = ctx->framebuffer_s.cbufs[0]->texture; + + if ((late_z_test || late_z_write) && res->nr_samples > 1) + new_ra_depth |= VIVS_RA_EARLY_DEPTH_LATE_DEPTH_MSAA; + } } if (new_pe_depth != zsa->PE_DEPTH_CONFIG || -- 2.7.4