Mesa (main): lavapipe: Don't wrap errors returned from vk_device_init in vk_error

[GitLab Mirror]

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

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Sun Oct 31 23:23:37 2021 -0500

lavapipe: Don't wrap errors returned from vk_device_init in vk_error

vk_device_init already calls vk_error so this is redundant.  Also, it
makes vk_error grumpy to see a VK_ERROR_FEATURE_NOT_PRESENT on an
instance rather than a physical device.

Fixes: 47adb1114376 ("lavapipe: Switch to the new vk_error helpers")
Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13619>

---

 src/gallium/frontends/lavapipe/lvp_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c
index f2676004495..bfc07ba84eb 100644
--- a/src/gallium/frontends/lavapipe/lvp_device.c
+++ b/src/gallium/frontends/lavapipe/lvp_device.c
@@ -1428,7 +1428,7 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateDevice(
                                     pAllocator);
    if (result != VK_SUCCESS) {
       vk_free(&device->vk.alloc, device);
-      return vk_error(instance, result);
+      return result;
    }
 
    device->instance = (struct lvp_instance *)physical_device->vk.instance;