From b4dad3afaa070272aae3a7091f96afbaf99eacc1 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Fri, 16 Aug 2019 01:06:55 +0200 Subject: [PATCH] Revert "radv: Do not decompress on LAYOUT_GENERAL." Causes issues with a bunch of games with DXVK. Fixes: 50add1b33ae "radv: Do not decompress on LAYOUT_GENERAL." Acked-by: Dave Airlie --- src/amd/vulkan/radv_image.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index b3a83ff306d..27843853af0 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -1623,7 +1623,7 @@ bool radv_layout_has_htile(const struct radv_image *image, unsigned queue_mask) { if (radv_image_is_tc_compat_htile(image)) - return !in_render_loop; + return layout != VK_IMAGE_LAYOUT_GENERAL; return radv_image_has_htile(image) && (layout == VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL || @@ -1637,7 +1637,7 @@ bool radv_layout_is_htile_compressed(const struct radv_image *image, unsigned queue_mask) { if (radv_image_is_tc_compat_htile(image)) - return !in_render_loop; + return layout != VK_IMAGE_LAYOUT_GENERAL; return radv_image_has_htile(image) && (layout == VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL || @@ -1665,7 +1665,7 @@ bool radv_layout_dcc_compressed(const struct radv_device *device, !radv_support_storage_dcc(device->physical_device)) return false; - return radv_image_has_dcc(image) &&!in_render_loop; + return radv_image_has_dcc(image) && layout != VK_IMAGE_LAYOUT_GENERAL; } -- 2.30.2