From 41883c69abedec856f529ca6d27c0ff13b792602 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Fri, 13 Nov 2020 02:44:48 +0100 Subject: [PATCH] radv: Do the sample check for tiling earlier. The LINEAR optimization is not allowed for MSAA images. --- src/amd/vulkan/radv_image.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 2bad566d12e..429c3d68467 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -47,6 +47,10 @@ radv_choose_tiling(struct radv_device *device, return RADEON_SURF_MODE_LINEAR_ALIGNED; } + /* MSAA resources must be 2D tiled. */ + if (pCreateInfo->samples > 1) + return RADEON_SURF_MODE_2D; + if (!vk_format_is_compressed(format) && !vk_format_is_depth_or_stencil(format) && device->physical_device->rad_info.chip_class <= GFX8) { @@ -59,10 +63,6 @@ radv_choose_tiling(struct radv_device *device, return RADEON_SURF_MODE_LINEAR_ALIGNED; } - /* MSAA resources must be 2D tiled. */ - if (pCreateInfo->samples > 1) - return RADEON_SURF_MODE_2D; - return RADEON_SURF_MODE_2D; } -- GitLab