Mesa (main): pvr: Check if the buffer/image was bound before unbinding.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 860e3f6ff9dd396ae44060ef1cc4edc55300922b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=860e3f6ff9dd396ae44060ef1cc4edc55300922b

Author: Rajnesh Kanwal <rajnesh.kanwal at imgtec.com>
Date:   Tue Mar 22 15:33:46 2022 +0000

pvr: Check if the buffer/image was bound before unbinding.

Signed-off-by: Rajnesh Kanwal <rajnesh.kanwal at imgtec.com>
Reviewed-by: Frank Binns <frank.binns at imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15641>

---

 src/imagination/vulkan/pvr_device.c | 4 +++-
 src/imagination/vulkan/pvr_image.c  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/imagination/vulkan/pvr_device.c b/src/imagination/vulkan/pvr_device.c
index 156fbbe0285..649b9eb2d26 100644
--- a/src/imagination/vulkan/pvr_device.c
+++ b/src/imagination/vulkan/pvr_device.c
@@ -1579,7 +1579,9 @@ void pvr_DestroyBuffer(VkDevice _device,
    if (!buffer)
       return;
 
-   pvr_unbind_memory(device, buffer->vma);
+   if (buffer->vma)
+      pvr_unbind_memory(device, buffer->vma);
+
    vk_object_free(&device->vk, pAllocator, buffer);
 }
 
diff --git a/src/imagination/vulkan/pvr_image.c b/src/imagination/vulkan/pvr_image.c
index 4be62a1c9b1..d823326676d 100644
--- a/src/imagination/vulkan/pvr_image.c
+++ b/src/imagination/vulkan/pvr_image.c
@@ -160,7 +160,9 @@ void pvr_DestroyImage(VkDevice _device,
    if (!image)
       return;
 
-   pvr_unbind_memory(device, image->vma);
+   if (image->vma)
+      pvr_unbind_memory(device, image->vma);
+
    vk_image_destroy(&device->vk, pAllocator, &image->vk);
 }