Jacek Caban : winevulkan: Skip unsupported functions in a few more places.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 04576c156edaf6e610a37c7c366fd44490097983
URL:    https://gitlab.winehq.org/wine/wine/-/commit/04576c156edaf6e610a37c7c366fd44...

Author: Jacek Caban 
Date:   Fri Nov  4 10:58:55 2022 +0100

winevulkan: Skip unsupported functions in a few more places.

---

dlls/winevulkan/make_vulkan     | 10 +++++-----
 dlls/winevulkan/vulkan_thunks.c | 12 ------------
 dlls/winevulkan/vulkan_thunks.h | 16 ----------------
 3 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index 2d506e031aa..2d9053f7c05 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -2292,7 +2292,7 @@ class VkGenerator(object):
         self.struct_chain_conversions = []
         self.host_structs = []
         for func in self.registry.funcs.values():
-            if not func.is_required():
+            if not func.needs_exposing():
                 continue

conversions = func.get_conversions()
@@ -2517,7 +2517,7 @@ class VkGenerator(object):
         f.write("/* For use by vkDevice and children */\n")
         f.write("struct vulkan_device_funcs\n{\n")
         for vk_func in self.registry.device_funcs:
-            if not vk_func.is_required():
+            if not vk_func.needs_exposing():
                 continue

if not vk_func.needs_dispatch():
@@ -2530,7 +2530,7 @@ class VkGenerator(object):
         f.write("/* For use by vkInstance and children */\n")
         f.write("struct vulkan_instance_funcs\n{\n")
         for vk_func in self.registry.instance_funcs + self.registry.phys_dev_funcs:
-            if not vk_func.is_required():
+            if not vk_func.needs_exposing():
                 continue

if not vk_func.needs_dispatch():
@@ -2543,7 +2543,7 @@ class VkGenerator(object):
         f.write("#define ALL_VK_DEVICE_FUNCS() \\n")
         first = True
         for vk_func in self.registry.device_funcs:
-            if not vk_func.is_required():
+            if not vk_func.needs_exposing():
                 continue

if not vk_func.needs_dispatch():
@@ -2560,7 +2560,7 @@ class VkGenerator(object):
         f.write("#define ALL_VK_INSTANCE_FUNCS() \\n")
         first = True
         for vk_func in self.registry.instance_funcs + self.registry.phys_dev_funcs:
-            if not vk_func.is_required():
+            if not vk_func.needs_exposing():
                 continue

if not vk_func.needs_dispatch():
diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c
index 7a04cfba6a7..4c87b807344 100644
--- a/dlls/winevulkan/vulkan_thunks.c
+++ b/dlls/winevulkan/vulkan_thunks.c
@@ -2151,18 +2151,6 @@ static inline void convert_VkImageViewHandleInfoNVX_win32_to_host(const VkImageV
 }
 #endif /* USE_STRUCT_CONVERSION */

-#if defined(USE_STRUCT_CONVERSION)
-static inline void convert_VkMemoryGetWin32HandleInfoKHR_win32_to_host(const VkMemoryGetWin32HandleInfoKHR *in, VkMemoryGetWin32HandleInfoKHR_host *out)
-{
-    if (!in) return;
-
-    out->sType = in->sType;
-    out->pNext = in->pNext;
-    out->memory = in->memory;
-    out->handleType = in->handleType;
-}
-#endif /* USE_STRUCT_CONVERSION */
-
 #if defined(USE_STRUCT_CONVERSION)
 static inline void convert_VkMicromapBuildSizesInfoEXT_win32_to_host(const VkMicromapBuildSizesInfoEXT *in, VkMicromapBuildSizesInfoEXT_host *out)
 {
diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h
index d77a6c0c3be..13f2dcd21b0 100644
--- a/dlls/winevulkan/vulkan_thunks.h
+++ b/dlls/winevulkan/vulkan_thunks.h
@@ -1409,18 +1409,6 @@ typedef struct VkImageViewHandleInfoNVX_host
 typedef VkImageViewHandleInfoNVX VkImageViewHandleInfoNVX_host;
 #endif

-#if defined(USE_STRUCT_CONVERSION)
-typedef struct VkMemoryGetWin32HandleInfoKHR_host
-{
-    VkStructureType sType;
-    const void *pNext;
-    VkDeviceMemory memory;
-    VkExternalMemoryHandleTypeFlagBits handleType;
-} VkMemoryGetWin32HandleInfoKHR_host;
-#else
-typedef VkMemoryGetWin32HandleInfoKHR VkMemoryGetWin32HandleInfoKHR_host;
-#endif
-
 #if defined(USE_STRUCT_CONVERSION)
 typedef struct VkMicromapBuildSizesInfoEXT_host
 {
@@ -2308,8 +2296,6 @@ struct vulkan_device_funcs
     VkResult (*p_vkGetImageViewAddressNVX)(VkDevice, VkImageView, VkImageViewAddressPropertiesNVX_host *);
     uint32_t (*p_vkGetImageViewHandleNVX)(VkDevice, const VkImageViewHandleInfoNVX_host *);
     VkResult (*p_vkGetMemoryHostPointerPropertiesEXT)(VkDevice, VkExternalMemoryHandleTypeFlagBits, const void *, VkMemoryHostPointerPropertiesEXT *);
-    VkResult (*p_vkGetMemoryWin32HandleKHR)(VkDevice, const VkMemoryGetWin32HandleInfoKHR_host *, HANDLE *);
-    VkResult (*p_vkGetMemoryWin32HandlePropertiesKHR)(VkDevice, VkExternalMemoryHandleTypeFlagBits, HANDLE, VkMemoryWin32HandlePropertiesKHR *);
     void (*p_vkGetMicromapBuildSizesEXT)(VkDevice, VkAccelerationStructureBuildTypeKHR, const VkMicromapBuildInfoEXT_host *, VkMicromapBuildSizesInfoEXT_host *);
     VkResult (*p_vkGetPerformanceParameterINTEL)(VkDevice, VkPerformanceParameterTypeINTEL, VkPerformanceValueINTEL *);
     VkResult (*p_vkGetPipelineCacheData)(VkDevice, VkPipelineCache, size_t *, void *);
@@ -2823,8 +2809,6 @@ struct vulkan_instance_funcs
     USE_VK_FUNC(vkGetImageViewAddressNVX) \
     USE_VK_FUNC(vkGetImageViewHandleNVX) \
     USE_VK_FUNC(vkGetMemoryHostPointerPropertiesEXT) \
-    USE_VK_FUNC(vkGetMemoryWin32HandleKHR) \
-    USE_VK_FUNC(vkGetMemoryWin32HandlePropertiesKHR) \
     USE_VK_FUNC(vkGetMicromapBuildSizesEXT) \
     USE_VK_FUNC(vkGetPerformanceParameterINTEL) \
     USE_VK_FUNC(vkGetPipelineCacheData) \