Mesa (master): zink: error if VK_KHR_maintenance1 isn't supported

[GitLab Mirror]

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

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Tue Oct 22 15:29:55 2019 +0200

zink: error if VK_KHR_maintenance1 isn't supported

While we're at it, remove the VK_-prefix from the extension bool; all
extensions have this so it's kinda superfluous.

---

 src/gallium/drivers/zink/zink_screen.c | 7 ++++++-
 src/gallium/drivers/zink/zink_screen.h | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index d0c07024d9e..667f242091c 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -842,12 +842,17 @@ zink_internal_create_screen(struct sw_winsys *winsys, int fd)
          for (uint32_t  i = 0; i < num_extensions; ++i) {
             if (!strcmp(extensions[i].extensionName,
                 VK_KHR_MAINTENANCE1_EXTENSION_NAME))
-               screen->have_VK_KHR_maintenance1 = true;
+               screen->have_KHR_maintenance1 = true;
          }
          FREE(extensions);
       }
    }
 
+   if (!screen->have_KHR_maintenance1) {
+      debug_printf("ZINK: VK_KHR_maintenance1 required!\n");
+      goto fail;
+   }
+
    VkDeviceQueueCreateInfo qci = {};
    float dummy = 0.0f;
    qci.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
diff --git a/src/gallium/drivers/zink/zink_screen.h b/src/gallium/drivers/zink/zink_screen.h
index e91d7849a65..38ade554ccc 100644
--- a/src/gallium/drivers/zink/zink_screen.h
+++ b/src/gallium/drivers/zink/zink_screen.h
@@ -48,7 +48,7 @@ struct zink_screen {
    VkPhysicalDeviceProperties props;
    VkPhysicalDeviceFeatures feats;
    VkPhysicalDeviceMemoryProperties mem_props;
-   bool have_VK_KHR_maintenance1;
+   bool have_KHR_maintenance1;
 
    uint32_t gfx_queue;
    VkDevice dev;