Mesa (staging/21.1): radv: Actually return correct value for read-only DCC compressedness.

[GitLab Mirror]

Module: Mesa
Branch: staging/21.1
Commit: a48779fffa6a1fc0347b1a1fd2067a24a801cf5a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a48779fffa6a1fc0347b1a1fd2067a24a801cf5a

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Fri May 14 14:04:11 2021 +0200

radv: Actually return correct value for read-only DCC compressedness.

Most stuff that depends on the value wouldn't be triggered anyway but
...

Fixes: b5ecf0748a5 ("radv: Ensure we never decompress or FCE read-only textures.")
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10802>
(cherry picked from commit f44a6c6a5424db714e5c93e4b13d4e3f79bd5ed2)

---

 .pick_status.json           | 2 +-
 src/amd/vulkan/radv_image.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 427a257156a..3fa8fd55de6 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1579,7 +1579,7 @@
         "description": "radv: Actually return correct value for read-only DCC compressedness.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "b5ecf0748a5cb82df4c1a03ef41dc5f67f7a77c4"
     },
diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index e40d811b993..2de899bee2d 100644
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -1985,7 +1985,7 @@ radv_layout_dcc_compressed(const struct radv_device *device, const struct radv_i
 {
    /* If the image is read-only, we can always just keep it compressed */
    if (!(image->usage & RADV_IMAGE_USAGE_WRITE_BITS) && radv_image_has_dcc(image))
-      return false;
+      return true;
 
    /* Don't compress compute transfer dst when image stores are not supported. */
    if ((layout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL || layout == VK_IMAGE_LAYOUT_GENERAL) &&