Mesa (main): lavapipe: Update LoaderICDInterfaceVersion to v5

[GitLab Mirror]

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

Author: Charles Giessen <charles at lunarg.com>
Date:   Fri Jan 14 12:11:24 2022 -0600

lavapipe: Update LoaderICDInterfaceVersion to v5

With the proper version checking in the common vulkan instance code
(commit 88b9b68) it is now possible to bring the reported interface
version up to v5.

Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14563>

---

 src/gallium/frontends/lavapipe/lvp_device.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c
index fe6f620d924..84d50bce1bd 100644
--- a/src/gallium/frontends/lavapipe/lvp_device.c
+++ b/src/gallium/frontends/lavapipe/lvp_device.c
@@ -2560,8 +2560,14 @@ vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pSupportedVersion)
     *
     *    - Loader interface v4 differs from v3 in:
     *        - The ICD must implement vk_icdGetPhysicalDeviceProcAddr().
+    * 
+    *    - Loader interface v5 differs from v4 in:
+    *        - The ICD must support Vulkan API version 1.1 and must not return 
+    *          VK_ERROR_INCOMPATIBLE_DRIVER from vkCreateInstance() unless a
+    *          Vulkan Loader with interface v4 or smaller is being used and the
+    *          application provides an API version that is greater than 1.0.
     */
-   *pSupportedVersion = MIN2(*pSupportedVersion, 4u);
+   *pSupportedVersion = MIN2(*pSupportedVersion, 5u);
    return VK_SUCCESS;
 }