From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Wed, 3 Jun 2020 12:45:57 +0000 (-0400)
Subject: zink: switch to passing VkPhysicalDeviceFeatures2 in VkDeviceCreateInfo
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e5e657768c3eae23e80cef8073a6f33497ba2512;p=mesa.git

zink: switch to passing VkPhysicalDeviceFeatures2 in VkDeviceCreateInfo

extensions need to have their feature structs passed in pNext to be enabled,
so switch to using the feature struct here in preparation for that

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5163>
---

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index ee5ff504103..71b7345dc88 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -829,7 +829,10 @@ zink_internal_create_screen(struct sw_winsys *winsys, int fd)
    dci.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
    dci.queueCreateInfoCount = 1;
    dci.pQueueCreateInfos = &qci;
-   dci.pEnabledFeatures = &screen->feats;
+   /* extensions don't have bool members in pEnabledFeatures.
+    * this requires us to pass the whole VkPhysicalDeviceFeatures2 struct
+    */
+   dci.pNext = &feats;
    const char *extensions[4] = {
       VK_KHR_MAINTENANCE1_EXTENSION_NAME,
    };