[PATCH 03/10] winevulkan: Implement vk_icdNegotiateICDInterfaceVersion.
Roderick Colenbrander
thunderbird2k at gmail.com
Tue Feb 20 00:29:40 CST 2018
Signed-off-by: Roderick Colenbrander <thunderbird2k at gmail.com>
---
dlls/winevulkan/vulkan.c | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index fe866b4f94..6d9aa3401f 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -27,6 +27,13 @@
WINE_DEFAULT_DEBUG_CHANNEL(vulkan);
+/* For now default to 4 as it felt like a reasonable version feature wise to support.
+ * Don't support the optional vk_icdGetPhysicalDeviceProcAddr introduced in this version
+ * as it is unlikely we will implement physical device extensions, which the loader is not
+ * aware off. Version 5 adds more extensive version checks. Something to tackle later.
+ */
+#define WINE_VULKAN_ICD_VERSION 4
+
void * WINAPI wine_vk_icdGetInstanceProcAddr(VkInstance instance, const char *pName)
{
FIXME("stub: %p %s\n", instance, debugstr_a(pName));
@@ -35,8 +42,20 @@ void * WINAPI wine_vk_icdGetInstanceProcAddr(VkInstance instance, const char *pN
VkResult WINAPI wine_vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *pSupportedVersion)
{
- FIXME("stub: %p\n", pSupportedVersion);
- return VK_ERROR_INCOMPATIBLE_DRIVER;
+ uint32_t req_version;
+ TRACE("%p\n", pSupportedVersion);
+
+ /* The spec is not clear how to handle this. Mesa drivers don't check, but it
+ * is probably best to not explode. VK_INCOMPLETE seems to be the closest value.
+ */
+ if (!pSupportedVersion)
+ return VK_INCOMPLETE;
+
+ req_version = *pSupportedVersion;
+ *pSupportedVersion = min(req_version, WINE_VULKAN_ICD_VERSION);
+ TRACE("Loader requested ICD version=%d, returning %d\n", req_version, *pSupportedVersion);
+
+ return VK_SUCCESS;
}
BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved)
--
2.14.3
More information about the wine-devel
mailing list