Module: Mesa
Branch: master
Commit: 50add1b33ae3c56ba4692e9f1524466887c1583e
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=50add1b33ae3c56ba4692e9f1524466887c1583e

Author: Bas Nieuwenhuizen <[email protected]>
Date:   Mon Aug  5 01:24:45 2019 +0200

radv: Do not decompress on LAYOUT_GENERAL.

We handle render loops properly now and STORAGE still disables
DCC/TC-compat HTILE in general.

Reviewed-by: Dave Airlie <[email protected]>

---

 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 82107546421..0c34e296154 100644
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -1601,7 +1601,7 @@ bool radv_layout_has_htile(const struct radv_image *image,
                            unsigned queue_mask)
 {
        if (radv_image_is_tc_compat_htile(image))
-               return layout != VK_IMAGE_LAYOUT_GENERAL;
+               return !in_render_loop;
 
        return radv_image_has_htile(image) &&
               (layout == VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL ||
@@ -1615,7 +1615,7 @@ bool radv_layout_is_htile_compressed(const struct 
radv_image *image,
                                      unsigned queue_mask)
 {
        if (radv_image_is_tc_compat_htile(image))
-               return layout != VK_IMAGE_LAYOUT_GENERAL;
+               return !in_render_loop;
 
        return radv_image_has_htile(image) &&
               (layout == VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL ||
@@ -1641,7 +1641,7 @@ bool radv_layout_dcc_compressed(const struct radv_image 
*image,
            (queue_mask & (1u << RADV_QUEUE_COMPUTE)))
                return false;
 
-       return radv_image_has_dcc(image) && layout != VK_IMAGE_LAYOUT_GENERAL;
+       return radv_image_has_dcc(image) &&!in_render_loop;
 }
 
 

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to