system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-30 05:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

winevulkan: Skip unsupported functions in a few more places.

Browse source
This commit is contained in:
Jacek Caban 2022-11-04 10:58:55 +01:00 committed by Alexandre Julliard
parent 692625a36a
commit 04576c156e
3 changed files with 5 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dlls/winevulkan/make_vulkan
View file

@ -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():

12
dlls/winevulkan/vulkan_thunks.c
View file

@ -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)
{

16
dlls/winevulkan/vulkan_thunks.h
View file

@ -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) \