radeonsi/gfx11: enable MSAA image stores in the compute blit

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28917>
This commit is contained in:
Marek Olšák
2024-03-28 20:49:01 -04:00
committed by Marge Bot
parent 5897dde3f7
commit bb86366fee
2 changed files with 2 additions and 3 deletions

View File

@@ -1052,8 +1052,9 @@ bool si_compute_blit(struct si_context *sctx, const struct pipe_blit_info *info,
/* MSAA image stores don't work on <= Gfx10.3. It's an issue with FMASK because
* AMD_DEBUG=nofmask fixes them. EQAA image stores are also unimplemented.
* MSAA image stores work fine on Gfx11 (it has neither FMASK nor EQAA).
*/
if (dst_samples > 1)
if (sctx->gfx_level < GFX11 && !(sctx->screen->debug_flags & DBG(NO_FMASK)) && dst_samples > 1)
return false;
if (info->dst.format == PIPE_FORMAT_A8R8_UNORM || /* This format fails AMD_TEST=imagecopy. */

View File

@@ -397,8 +397,6 @@ static nir_def *apply_blit_output_modifiers(nir_builder *b, nir_def *color,
* - Out-of-bounds src coordinates are clamped by emulating CLAMP_TO_EDGE using
* the image_size NIR intrinsic.
* - X/Y flipping just does this in the shader: -threadIDs - 1
* - MSAA copies are implemented but disabled because MSAA image stores don't
* work.
*/
void *si_create_blit_cs(struct si_context *sctx, const union si_compute_blit_shader_key *options)
{