Revert "radeonsi/gfx11: limit MSAA color buffers to the RGBA channel order"

This reverts commit 54d85700a1.

It's an LLVM bug. If you disable AMDGPUImageIntrinsicOptimizer in LLVM,
MSAA is fixed. There is no LLVM command line option to disable it from Mesa.

Reviewed-by: Mihai Preda <mhpreda@gmail.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16509>
This commit is contained in:
Marek Olšák
2022-05-14 03:55:34 -04:00
committed by Marge Bot
parent a529e4f7ad
commit c74d854348
-10
View File
@@ -2452,16 +2452,6 @@ static bool si_is_format_supported(struct pipe_screen *screen, enum pipe_format
if (sample_count > max_eqaa_samples || storage_sample_count > max_samples)
return false;
}
/* Gfx11: BGRA doesn't work with samples >= 4. Only allow R/0/1 to be the first
* component for simplicity.
*/
if (sscreen->info.gfx_level >= GFX11 &&
!util_format_is_depth_or_stencil(format) &&
util_format_description(format)->swizzle[0] != PIPE_SWIZZLE_X &&
util_format_description(format)->swizzle[0] != PIPE_SWIZZLE_0 &&
util_format_description(format)->swizzle[0] != PIPE_SWIZZLE_1)
return false;
}
if (usage & (PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_SHADER_IMAGE)) {