Mesa (staging/22.0): radv: fix cleaning the image view for CmdCopyImageToBuffer()

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Thu Mar 31 18:23:31 2022 +0200

radv: fix cleaning the image view for CmdCopyImageToBuffer()

Fixes: f07e67272e8 ("radv: fix vk_object_base_init/finish for internal image views")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15707>
(cherry picked from commit 41ece97afb072931a71cf908970e88927dd5a09b)

---

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

diff --git a/.pick_status.json b/.pick_status.json
index 0e3ff4774be..59f4a6372bc 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -740,7 +740,7 @@
         "description": "radv: fix cleaning the image view for CmdCopyImageToBuffer()",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": "f07e67272e8fd9690a7804e9c407a83a7c2b36f4"
     },
     {
diff --git a/src/amd/vulkan/radv_meta_blit2d.c b/src/amd/vulkan/radv_meta_blit2d.c
index b20f89a9b13..8d837843dad 100644
--- a/src/amd/vulkan/radv_meta_blit2d.c
+++ b/src/amd/vulkan/radv_meta_blit2d.c
@@ -399,7 +399,7 @@ radv_meta_blit2d_normal_dst(struct radv_cmd_buffer *cmd_buffer,
          if (src_type == BLIT2D_SRC_TYPE_BUFFER)
             radv_buffer_view_finish(&src_temps.bview);
          else
-            radv_image_view_finish(&dst_temps.iview);
+            radv_image_view_finish(&src_temps.iview);
 
          radv_image_view_finish(&dst_temps.iview);
       }