Mesa (master): zink: switch to passing VkPhysicalDeviceFeatures2 in VkDeviceCreateInfo

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: e5e657768c3eae23e80cef8073a6f33497ba2512
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e5e657768c3eae23e80cef8073a6f33497ba2512

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed Jun  3 08:45:57 2020 -0400

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 at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5163>

---

 src/gallium/drivers/zink/zink_screen.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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,
    };