Mesa (staging/21.1): lavapipe: fix unused variable warning

[GitLab Mirror]

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

Author: Michel Zou <xantares09 at hotmail.com>
Date:   Thu Apr 15 22:37:58 2021 +0200

lavapipe: fix unused variable warning

Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
(cherry picked from commit 45f32ce239bcc756c9720896d12bc02d9e6cdc50)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10379>

---

 .pick_status.json                          | 2 +-
 src/gallium/frontends/lavapipe/lvp_image.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 0fa8e854b4e..3d25812c1cc 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -6727,7 +6727,7 @@
         "description": "lavapipe: fix unused variable warning",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/frontends/lavapipe/lvp_image.c b/src/gallium/frontends/lavapipe/lvp_image.c
index e889a1754af..6ea29c950fa 100644
--- a/src/gallium/frontends/lavapipe/lvp_image.c
+++ b/src/gallium/frontends/lavapipe/lvp_image.c
@@ -124,7 +124,7 @@ lvp_image_from_swapchain(VkDevice device,
                          const VkAllocationCallbacks *pAllocator,
                          VkImage *pImage)
 {
-   struct lvp_image *swapchain_image = lvp_swapchain_get_image(swapchain_info->swapchain, 0);
+   ASSERTED struct lvp_image *swapchain_image = lvp_swapchain_get_image(swapchain_info->swapchain, 0);
    assert(swapchain_image);
 
    assert(swapchain_image->type == pCreateInfo->imageType);