[PATCH 0/4] MR923: winevulkan: Separate 32-bit and 64-bit thunks implementation.
From: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 53 +- dlls/winevulkan/vulkan_thunks.c | 8618 +++++++++++++++++++++++++------ 2 files changed, 7158 insertions(+), 1513 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index cb6fd08373b..330fe86acda 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -894,7 +894,7 @@ class VkFunction(object): stub += "}\n\n" return stub - def thunk(self, prefix=None): + def thunk(self, prefix=None, conv=False): if prefix == "thunk_": thunk = self.prototype(prefix=prefix) thunk += "\n{\n" @@ -905,15 +905,8 @@ class VkFunction(object): thunk += " struct {0}_params *params = args;\n".format(self.name) params_prefix = "params->" - if self.needs_conversion(): - thunk += "#if defined(USE_STRUCT_CONVERSION)\n" + if conv and self.needs_conversion(): thunk += self.body_conversion(conv=True, params_prefix=params_prefix) - thunk += "#else\n" - if self.needs_unwrapping(): - thunk += self.body_conversion(conv=False, params_prefix=params_prefix) - else: - thunk += self.body(params_prefix=params_prefix) - thunk += "#endif\n" elif self.needs_unwrapping(): thunk += self.body_conversion(conv=False, params_prefix=params_prefix) else: @@ -2716,7 +2709,7 @@ class VkGenerator(object): f.write("{0}{1}".format("# " if spec_file else " * ", line).rstrip(" ") + "\n") f.write("\n" if spec_file else " */\n\n") - def generate_thunks_c(self, f, prefix): + def generate_thunks_c(self, f): self._generate_copyright(f) f.write("#if 0\n") @@ -2743,15 +2736,22 @@ class VkGenerator(object): for vk_func in self.registry.funcs.values(): if not vk_func.needs_exposing(): continue - if vk_func.loader_thunk_type == ThunkType.NONE: + if vk_func.loader_thunk_type == ThunkType.NONE or vk_func.thunk_type == ThunkType.NONE: continue + f.write("#if !defined(USE_STRUCT_CONVERSION)\n\n") if vk_func.needs_private_thunk(): f.write(vk_func.thunk(prefix="thunk_")) - - if vk_func.thunk_type == ThunkType.PUBLIC: + else: + f.write("static ") + f.write(vk_func.thunk(prefix="thunk64_")) + f.write("#else /* USE_STRUCT_CONVERSION */\n\n") + if vk_func.needs_private_thunk(): + f.write(vk_func.thunk(prefix="thunk_", conv=True)) + else: f.write("static ") - f.write(vk_func.thunk(prefix=prefix)) + f.write(vk_func.thunk(prefix="thunk32_", conv=True)) + f.write("#endif /* USE_STRUCT_CONVERSION */\n\n") # Create array of device extensions. f.write("static const char * const vk_device_extensions[] =\n{\n") @@ -2827,6 +2827,8 @@ class VkGenerator(object): f.write(" }\n") f.write("}\n\n") + f.write("#if !defined(USE_STRUCT_CONVERSION)\n\n") + f.write("const unixlib_entry_t __wine_unix_call_funcs[] =\n") f.write("{\n") f.write(" init_vulkan,\n") @@ -2838,10 +2840,31 @@ class VkGenerator(object): if vk_func.loader_thunk_type == ThunkType.NONE: continue + prefix = "thunk64_" if vk_func.thunk_type == ThunkType.PUBLIC else "wine_" f.write(" {1}{0},\n".format(vk_func.name, prefix)) f.write("};\n") f.write("C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == unix_count);\n\n") + f.write("#else /* USE_STRUCT_CONVERSION) */\n\n") + + f.write("const unixlib_entry_t __wine_unix_call_funcs[] =\n") + f.write("{\n") + f.write(" init_vulkan,\n") + f.write(" vk_is_available_instance_function,\n") + f.write(" vk_is_available_device_function,\n") + for vk_func in self.registry.funcs.values(): + if not vk_func.needs_exposing(): + continue + if vk_func.loader_thunk_type == ThunkType.NONE: + continue + + prefix = "thunk32_" if vk_func.thunk_type == ThunkType.PUBLIC else "wine_" + f.write(" {1}{0},\n".format(vk_func.name, prefix)) + f.write("};\n") + f.write("C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == unix_count);\n\n") + + f.write("#endif /* USE_STRUCT_CONVERSION) */\n\n") + f.write("NTSTATUS WINAPI vk_direct_unix_call(unixlib_handle_t handle, unsigned int code, void *params)\n") f.write("{\n") f.write(" return __wine_unix_call_funcs[code](params);\n") @@ -3895,7 +3918,7 @@ def main(): generator.generate_thunks_h(f, "wine_") with open(WINE_VULKAN_THUNKS_C, "w") as f: - generator.generate_thunks_c(f, "wine_") + generator.generate_thunks_c(f) with open(WINE_VULKAN_LOADER_THUNKS_H, "w") as f: generator.generate_loader_thunks_h(f) diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index c99fa8da01c..705677ee7b6 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -5278,10 +5278,20 @@ void free_VkInstanceCreateInfo_struct_chain(VkInstanceCreateInfo *s) s->pNext = NULL; } -static NTSTATUS wine_vkAcquireNextImage2KHR(void *args) +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkAcquireNextImage2KHR(void *args) +{ + struct vkAcquireNextImage2KHR_params *params = args; + TRACE("%p, %p, %p\n", params->device, params->pAcquireInfo, params->pImageIndex); + return wine_device_from_handle(params->device)->funcs.p_vkAcquireNextImage2KHR(wine_device_from_handle(params->device)->device, params->pAcquireInfo, params->pImageIndex); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkAcquireNextImage2KHR(void *args) { struct vkAcquireNextImage2KHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkAcquireNextImageInfoKHR_host pAcquireInfo_host; TRACE("%p, %p, %p\n", params->device, params->pAcquireInfo, params->pImageIndex); @@ -5290,30 +5300,64 @@ static NTSTATUS wine_vkAcquireNextImage2KHR(void *args) result = wine_device_from_handle(params->device)->funcs.p_vkAcquireNextImage2KHR(wine_device_from_handle(params->device)->device, &pAcquireInfo_host, params->pImageIndex); return result; -#else - TRACE("%p, %p, %p\n", params->device, params->pAcquireInfo, params->pImageIndex); - return wine_device_from_handle(params->device)->funcs.p_vkAcquireNextImage2KHR(wine_device_from_handle(params->device)->device, params->pAcquireInfo, params->pImageIndex); -#endif } -static NTSTATUS wine_vkAcquireNextImageKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkAcquireNextImageKHR(void *args) +{ + struct vkAcquireNextImageKHR_params *params = args; + TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->swapchain), wine_dbgstr_longlong(params->timeout), wine_dbgstr_longlong(params->semaphore), wine_dbgstr_longlong(params->fence), params->pImageIndex); + return wine_device_from_handle(params->device)->funcs.p_vkAcquireNextImageKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->timeout, params->semaphore, params->fence, params->pImageIndex); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkAcquireNextImageKHR(void *args) { struct vkAcquireNextImageKHR_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->swapchain), wine_dbgstr_longlong(params->timeout), wine_dbgstr_longlong(params->semaphore), wine_dbgstr_longlong(params->fence), params->pImageIndex); return wine_device_from_handle(params->device)->funcs.p_vkAcquireNextImageKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->timeout, params->semaphore, params->fence, params->pImageIndex); } -static NTSTATUS wine_vkAcquirePerformanceConfigurationINTEL(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkAcquirePerformanceConfigurationINTEL(void *args) +{ + struct vkAcquirePerformanceConfigurationINTEL_params *params = args; + TRACE("%p, %p, %p\n", params->device, params->pAcquireInfo, params->pConfiguration); + return wine_device_from_handle(params->device)->funcs.p_vkAcquirePerformanceConfigurationINTEL(wine_device_from_handle(params->device)->device, params->pAcquireInfo, params->pConfiguration); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkAcquirePerformanceConfigurationINTEL(void *args) { struct vkAcquirePerformanceConfigurationINTEL_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pAcquireInfo, params->pConfiguration); return wine_device_from_handle(params->device)->funcs.p_vkAcquirePerformanceConfigurationINTEL(wine_device_from_handle(params->device)->device, params->pAcquireInfo, params->pConfiguration); } -static NTSTATUS wine_vkAcquireProfilingLockKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkAcquireProfilingLockKHR(void *args) +{ + struct vkAcquireProfilingLockKHR_params *params = args; + TRACE("%p, %p\n", params->device, params->pInfo); + return wine_device_from_handle(params->device)->funcs.p_vkAcquireProfilingLockKHR(wine_device_from_handle(params->device)->device, params->pInfo); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkAcquireProfilingLockKHR(void *args) { struct vkAcquireProfilingLockKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkAcquireProfilingLockInfoKHR_host pInfo_host; TRACE("%p, %p\n", params->device, params->pInfo); @@ -5322,16 +5366,24 @@ static NTSTATUS wine_vkAcquireProfilingLockKHR(void *args) result = wine_device_from_handle(params->device)->funcs.p_vkAcquireProfilingLockKHR(wine_device_from_handle(params->device)->device, &pInfo_host); return result; -#else - TRACE("%p, %p\n", params->device, params->pInfo); - return wine_device_from_handle(params->device)->funcs.p_vkAcquireProfilingLockKHR(wine_device_from_handle(params->device)->device, params->pInfo); -#endif } -static NTSTATUS wine_vkAllocateDescriptorSets(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkAllocateDescriptorSets(void *args) +{ + struct vkAllocateDescriptorSets_params *params = args; + TRACE("%p, %p, %p\n", params->device, params->pAllocateInfo, params->pDescriptorSets); + return wine_device_from_handle(params->device)->funcs.p_vkAllocateDescriptorSets(wine_device_from_handle(params->device)->device, params->pAllocateInfo, params->pDescriptorSets); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkAllocateDescriptorSets(void *args) { struct vkAllocateDescriptorSets_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkDescriptorSetAllocateInfo_host pAllocateInfo_host; TRACE("%p, %p, %p\n", params->device, params->pAllocateInfo, params->pDescriptorSets); @@ -5340,16 +5392,24 @@ static NTSTATUS wine_vkAllocateDescriptorSets(void *args) result = wine_device_from_handle(params->device)->funcs.p_vkAllocateDescriptorSets(wine_device_from_handle(params->device)->device, &pAllocateInfo_host, params->pDescriptorSets); return result; -#else - TRACE("%p, %p, %p\n", params->device, params->pAllocateInfo, params->pDescriptorSets); - return wine_device_from_handle(params->device)->funcs.p_vkAllocateDescriptorSets(wine_device_from_handle(params->device)->device, params->pAllocateInfo, params->pDescriptorSets); -#endif } -static NTSTATUS wine_vkAllocateMemory(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkAllocateMemory(void *args) +{ + struct vkAllocateMemory_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pAllocateInfo, params->pAllocator, params->pMemory); + return wine_device_from_handle(params->device)->funcs.p_vkAllocateMemory(wine_device_from_handle(params->device)->device, params->pAllocateInfo, NULL, params->pMemory); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkAllocateMemory(void *args) { struct vkAllocateMemory_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkMemoryAllocateInfo_host pAllocateInfo_host; TRACE("%p, %p, %p, %p\n", params->device, params->pAllocateInfo, params->pAllocator, params->pMemory); @@ -5358,16 +5418,24 @@ static NTSTATUS wine_vkAllocateMemory(void *args) result = wine_device_from_handle(params->device)->funcs.p_vkAllocateMemory(wine_device_from_handle(params->device)->device, &pAllocateInfo_host, NULL, params->pMemory); return result; -#else - TRACE("%p, %p, %p, %p\n", params->device, params->pAllocateInfo, params->pAllocator, params->pMemory); - return wine_device_from_handle(params->device)->funcs.p_vkAllocateMemory(wine_device_from_handle(params->device)->device, params->pAllocateInfo, NULL, params->pMemory); -#endif } -static NTSTATUS wine_vkBeginCommandBuffer(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkBeginCommandBuffer(void *args) +{ + struct vkBeginCommandBuffer_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pBeginInfo); + return wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkBeginCommandBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pBeginInfo); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkBeginCommandBuffer(void *args) { struct vkBeginCommandBuffer_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkCommandBufferBeginInfo_host pBeginInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pBeginInfo); @@ -5377,16 +5445,24 @@ static NTSTATUS wine_vkBeginCommandBuffer(void *args) free_VkCommandBufferBeginInfo(&pBeginInfo_host); return result; -#else - TRACE("%p, %p\n", params->commandBuffer, params->pBeginInfo); - return wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkBeginCommandBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pBeginInfo); -#endif } -static NTSTATUS wine_vkBindAccelerationStructureMemoryNV(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkBindAccelerationStructureMemoryNV(void *args) +{ + struct vkBindAccelerationStructureMemoryNV_params *params = args; + TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos); + return wine_device_from_handle(params->device)->funcs.p_vkBindAccelerationStructureMemoryNV(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkBindAccelerationStructureMemoryNV(void *args) { struct vkBindAccelerationStructureMemoryNV_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkBindAccelerationStructureMemoryInfoNV_host *pBindInfos_host; TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos); @@ -5396,23 +5472,44 @@ static NTSTATUS wine_vkBindAccelerationStructureMemoryNV(void *args) free_VkBindAccelerationStructureMemoryInfoNV_array(pBindInfos_host, params->bindInfoCount); return result; -#else - TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos); - return wine_device_from_handle(params->device)->funcs.p_vkBindAccelerationStructureMemoryNV(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); -#endif } -static NTSTATUS wine_vkBindBufferMemory(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkBindBufferMemory(void *args) +{ + struct vkBindBufferMemory_params *params = args; + TRACE("%p, 0x%s, 0x%s, 0x%s\n", params->device, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->memoryOffset)); + return wine_device_from_handle(params->device)->funcs.p_vkBindBufferMemory(wine_device_from_handle(params->device)->device, params->buffer, params->memory, params->memoryOffset); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkBindBufferMemory(void *args) { struct vkBindBufferMemory_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s\n", params->device, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->memoryOffset)); return wine_device_from_handle(params->device)->funcs.p_vkBindBufferMemory(wine_device_from_handle(params->device)->device, params->buffer, params->memory, params->memoryOffset); } -static NTSTATUS wine_vkBindBufferMemory2(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkBindBufferMemory2(void *args) +{ + struct vkBindBufferMemory2_params *params = args; + TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos); + return wine_device_from_handle(params->device)->funcs.p_vkBindBufferMemory2(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkBindBufferMemory2(void *args) { struct vkBindBufferMemory2_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkBindBufferMemoryInfo_host *pBindInfos_host; TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos); @@ -5422,16 +5519,24 @@ static NTSTATUS wine_vkBindBufferMemory2(void *args) free_VkBindBufferMemoryInfo_array(pBindInfos_host, params->bindInfoCount); return result; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkBindBufferMemory2KHR(void *args) +{ + struct vkBindBufferMemory2KHR_params *params = args; TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos); - return wine_device_from_handle(params->device)->funcs.p_vkBindBufferMemory2(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); -#endif + return wine_device_from_handle(params->device)->funcs.p_vkBindBufferMemory2KHR(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); } -static NTSTATUS wine_vkBindBufferMemory2KHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkBindBufferMemory2KHR(void *args) { struct vkBindBufferMemory2KHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkBindBufferMemoryInfo_host *pBindInfos_host; TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos); @@ -5441,23 +5546,44 @@ static NTSTATUS wine_vkBindBufferMemory2KHR(void *args) free_VkBindBufferMemoryInfo_array(pBindInfos_host, params->bindInfoCount); return result; -#else - TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos); - return wine_device_from_handle(params->device)->funcs.p_vkBindBufferMemory2KHR(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); -#endif } -static NTSTATUS wine_vkBindImageMemory(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkBindImageMemory(void *args) +{ + struct vkBindImageMemory_params *params = args; + TRACE("%p, 0x%s, 0x%s, 0x%s\n", params->device, wine_dbgstr_longlong(params->image), wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->memoryOffset)); + return wine_device_from_handle(params->device)->funcs.p_vkBindImageMemory(wine_device_from_handle(params->device)->device, params->image, params->memory, params->memoryOffset); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkBindImageMemory(void *args) { struct vkBindImageMemory_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s\n", params->device, wine_dbgstr_longlong(params->image), wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->memoryOffset)); return wine_device_from_handle(params->device)->funcs.p_vkBindImageMemory(wine_device_from_handle(params->device)->device, params->image, params->memory, params->memoryOffset); } -static NTSTATUS wine_vkBindImageMemory2(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkBindImageMemory2(void *args) +{ + struct vkBindImageMemory2_params *params = args; + TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos); + return wine_device_from_handle(params->device)->funcs.p_vkBindImageMemory2(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkBindImageMemory2(void *args) { struct vkBindImageMemory2_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkBindImageMemoryInfo_host *pBindInfos_host; TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos); @@ -5467,16 +5593,24 @@ static NTSTATUS wine_vkBindImageMemory2(void *args) free_VkBindImageMemoryInfo_array(pBindInfos_host, params->bindInfoCount); return result; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkBindImageMemory2KHR(void *args) +{ + struct vkBindImageMemory2KHR_params *params = args; TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos); - return wine_device_from_handle(params->device)->funcs.p_vkBindImageMemory2(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); -#endif + return wine_device_from_handle(params->device)->funcs.p_vkBindImageMemory2KHR(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); } -static NTSTATUS wine_vkBindImageMemory2KHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkBindImageMemory2KHR(void *args) { struct vkBindImageMemory2KHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkBindImageMemoryInfo_host *pBindInfos_host; TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos); @@ -5486,16 +5620,24 @@ static NTSTATUS wine_vkBindImageMemory2KHR(void *args) free_VkBindImageMemoryInfo_array(pBindInfos_host, params->bindInfoCount); return result; -#else - TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos); - return wine_device_from_handle(params->device)->funcs.p_vkBindImageMemory2KHR(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); -#endif } -static NTSTATUS wine_vkBuildAccelerationStructuresKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkBuildAccelerationStructuresKHR(void *args) +{ + struct vkBuildAccelerationStructuresKHR_params *params = args; + TRACE("%p, 0x%s, %u, %p, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->infoCount, params->pInfos, params->ppBuildRangeInfos); + return wine_device_from_handle(params->device)->funcs.p_vkBuildAccelerationStructuresKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, params->infoCount, params->pInfos, params->ppBuildRangeInfos); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkBuildAccelerationStructuresKHR(void *args) { struct vkBuildAccelerationStructuresKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkAccelerationStructureBuildGeometryInfoKHR_host *pInfos_host; TRACE("%p, 0x%s, %u, %p, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->infoCount, params->pInfos, params->ppBuildRangeInfos); @@ -5505,16 +5647,25 @@ static NTSTATUS wine_vkBuildAccelerationStructuresKHR(void *args) free_VkAccelerationStructureBuildGeometryInfoKHR_array(pInfos_host, params->infoCount); return result; -#else - TRACE("%p, 0x%s, %u, %p, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->infoCount, params->pInfos, params->ppBuildRangeInfos); - return wine_device_from_handle(params->device)->funcs.p_vkBuildAccelerationStructuresKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, params->infoCount, params->pInfos, params->ppBuildRangeInfos); -#endif } -static NTSTATUS wine_vkCmdBeginConditionalRenderingEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBeginConditionalRenderingEXT(void *args) +{ + struct vkCmdBeginConditionalRenderingEXT_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pConditionalRenderingBegin); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginConditionalRenderingEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pConditionalRenderingBegin); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBeginConditionalRenderingEXT(void *args) { struct vkCmdBeginConditionalRenderingEXT_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkConditionalRenderingBeginInfoEXT_host pConditionalRenderingBegin_host; TRACE("%p, %p\n", params->commandBuffer, params->pConditionalRenderingBegin); @@ -5522,14 +5673,23 @@ static NTSTATUS wine_vkCmdBeginConditionalRenderingEXT(void *args) wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginConditionalRenderingEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pConditionalRenderingBegin_host); return STATUS_SUCCESS; -#else - TRACE("%p, %p\n", params->commandBuffer, params->pConditionalRenderingBegin); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginConditionalRenderingEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pConditionalRenderingBegin); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBeginDebugUtilsLabelEXT(void *args) +{ + struct vkCmdBeginDebugUtilsLabelEXT_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pLabelInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginDebugUtilsLabelEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pLabelInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdBeginDebugUtilsLabelEXT(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBeginDebugUtilsLabelEXT(void *args) { struct vkCmdBeginDebugUtilsLabelEXT_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pLabelInfo); @@ -5537,7 +5697,21 @@ static NTSTATUS wine_vkCmdBeginDebugUtilsLabelEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdBeginQuery(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBeginQuery(void *args) +{ + struct vkCmdBeginQuery_params *params = args; + TRACE("%p, 0x%s, %u, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query, params->flags); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginQuery(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->query, params->flags); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBeginQuery(void *args) { struct vkCmdBeginQuery_params *params = args; TRACE("%p, 0x%s, %u, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query, params->flags); @@ -5545,7 +5719,11 @@ static NTSTATUS wine_vkCmdBeginQuery(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdBeginQueryIndexedEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBeginQueryIndexedEXT(void *args) { struct vkCmdBeginQueryIndexedEXT_params *params = args; TRACE("%p, 0x%s, %u, %#x, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query, params->flags, params->index); @@ -5553,28 +5731,59 @@ static NTSTATUS wine_vkCmdBeginQueryIndexedEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdBeginRenderPass(void *args) -{ - struct vkCmdBeginRenderPass_params *params = args; -#if defined(USE_STRUCT_CONVERSION) - VkRenderPassBeginInfo_host pRenderPassBegin_host; - TRACE("%p, %p, %#x\n", params->commandBuffer, params->pRenderPassBegin, params->contents); - - convert_VkRenderPassBeginInfo_win_to_host(params->pRenderPassBegin, &pRenderPassBegin_host); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderPass(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pRenderPassBegin_host, params->contents); +#else /* USE_STRUCT_CONVERSION */ +static NTSTATUS thunk32_vkCmdBeginQueryIndexedEXT(void *args) +{ + struct vkCmdBeginQueryIndexedEXT_params *params = args; + TRACE("%p, 0x%s, %u, %#x, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query, params->flags, params->index); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginQueryIndexedEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->query, params->flags, params->index); return STATUS_SUCCESS; -#else - TRACE("%p, %p, %#x\n", params->commandBuffer, params->pRenderPassBegin, params->contents); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderPass(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRenderPassBegin, params->contents); - return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdBeginRenderPass2(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBeginRenderPass(void *args) +{ + struct vkCmdBeginRenderPass_params *params = args; + TRACE("%p, %p, %#x\n", params->commandBuffer, params->pRenderPassBegin, params->contents); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderPass(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRenderPassBegin, params->contents); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBeginRenderPass(void *args) +{ + struct vkCmdBeginRenderPass_params *params = args; + VkRenderPassBeginInfo_host pRenderPassBegin_host; + TRACE("%p, %p, %#x\n", params->commandBuffer, params->pRenderPassBegin, params->contents); + + convert_VkRenderPassBeginInfo_win_to_host(params->pRenderPassBegin, &pRenderPassBegin_host); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderPass(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pRenderPassBegin_host, params->contents); + + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBeginRenderPass2(void *args) +{ + struct vkCmdBeginRenderPass2_params *params = args; + TRACE("%p, %p, %p\n", params->commandBuffer, params->pRenderPassBegin, params->pSubpassBeginInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderPass2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRenderPassBegin, params->pSubpassBeginInfo); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBeginRenderPass2(void *args) { struct vkCmdBeginRenderPass2_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkRenderPassBeginInfo_host pRenderPassBegin_host; TRACE("%p, %p, %p\n", params->commandBuffer, params->pRenderPassBegin, params->pSubpassBeginInfo); @@ -5582,17 +5791,25 @@ static NTSTATUS wine_vkCmdBeginRenderPass2(void *args) wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderPass2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pRenderPassBegin_host, params->pSubpassBeginInfo); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBeginRenderPass2KHR(void *args) +{ + struct vkCmdBeginRenderPass2KHR_params *params = args; TRACE("%p, %p, %p\n", params->commandBuffer, params->pRenderPassBegin, params->pSubpassBeginInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderPass2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRenderPassBegin, params->pSubpassBeginInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderPass2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRenderPassBegin, params->pSubpassBeginInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdBeginRenderPass2KHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBeginRenderPass2KHR(void *args) { struct vkCmdBeginRenderPass2KHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkRenderPassBeginInfo_host pRenderPassBegin_host; TRACE("%p, %p, %p\n", params->commandBuffer, params->pRenderPassBegin, params->pSubpassBeginInfo); @@ -5600,17 +5817,25 @@ static NTSTATUS wine_vkCmdBeginRenderPass2KHR(void *args) wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderPass2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pRenderPassBegin_host, params->pSubpassBeginInfo); return STATUS_SUCCESS; -#else - TRACE("%p, %p, %p\n", params->commandBuffer, params->pRenderPassBegin, params->pSubpassBeginInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderPass2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRenderPassBegin, params->pSubpassBeginInfo); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBeginRendering(void *args) +{ + struct vkCmdBeginRendering_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pRenderingInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRendering(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRenderingInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdBeginRendering(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBeginRendering(void *args) { struct vkCmdBeginRendering_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkRenderingInfo_host pRenderingInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pRenderingInfo); @@ -5619,17 +5844,25 @@ static NTSTATUS wine_vkCmdBeginRendering(void *args) free_VkRenderingInfo(&pRenderingInfo_host); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBeginRenderingKHR(void *args) +{ + struct vkCmdBeginRenderingKHR_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pRenderingInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRendering(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRenderingInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderingKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRenderingInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdBeginRenderingKHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBeginRenderingKHR(void *args) { struct vkCmdBeginRenderingKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkRenderingInfo_host pRenderingInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pRenderingInfo); @@ -5638,14 +5871,23 @@ static NTSTATUS wine_vkCmdBeginRenderingKHR(void *args) free_VkRenderingInfo(&pRenderingInfo_host); return STATUS_SUCCESS; -#else - TRACE("%p, %p\n", params->commandBuffer, params->pRenderingInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderingKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRenderingInfo); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBeginTransformFeedbackEXT(void *args) +{ + struct vkCmdBeginTransformFeedbackEXT_params *params = args; + TRACE("%p, %u, %u, %p, %p\n", params->commandBuffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginTransformFeedbackEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdBeginTransformFeedbackEXT(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBeginTransformFeedbackEXT(void *args) { struct vkCmdBeginTransformFeedbackEXT_params *params = args; TRACE("%p, %u, %u, %p, %p\n", params->commandBuffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets); @@ -5653,7 +5895,21 @@ static NTSTATUS wine_vkCmdBeginTransformFeedbackEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdBindDescriptorSets(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBindDescriptorSets(void *args) +{ + struct vkCmdBindDescriptorSets_params *params = args; + TRACE("%p, %#x, 0x%s, %u, %u, %p, %u, %p\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->layout), params->firstSet, params->descriptorSetCount, params->pDescriptorSets, params->dynamicOffsetCount, params->pDynamicOffsets); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindDescriptorSets(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineBindPoint, params->layout, params->firstSet, params->descriptorSetCount, params->pDescriptorSets, params->dynamicOffsetCount, params->pDynamicOffsets); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBindDescriptorSets(void *args) { struct vkCmdBindDescriptorSets_params *params = args; TRACE("%p, %#x, 0x%s, %u, %u, %p, %u, %p\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->layout), params->firstSet, params->descriptorSetCount, params->pDescriptorSets, params->dynamicOffsetCount, params->pDynamicOffsets); @@ -5661,7 +5917,21 @@ static NTSTATUS wine_vkCmdBindDescriptorSets(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdBindIndexBuffer(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBindIndexBuffer(void *args) +{ + struct vkCmdBindIndexBuffer_params *params = args; + TRACE("%p, 0x%s, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->indexType); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindIndexBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->indexType); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBindIndexBuffer(void *args) { struct vkCmdBindIndexBuffer_params *params = args; TRACE("%p, 0x%s, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->indexType); @@ -5669,7 +5939,21 @@ static NTSTATUS wine_vkCmdBindIndexBuffer(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdBindInvocationMaskHUAWEI(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBindInvocationMaskHUAWEI(void *args) +{ + struct vkCmdBindInvocationMaskHUAWEI_params *params = args; + TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->imageView), params->imageLayout); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindInvocationMaskHUAWEI(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->imageView, params->imageLayout); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBindInvocationMaskHUAWEI(void *args) { struct vkCmdBindInvocationMaskHUAWEI_params *params = args; TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->imageView), params->imageLayout); @@ -5677,7 +5961,21 @@ static NTSTATUS wine_vkCmdBindInvocationMaskHUAWEI(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdBindPipeline(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBindPipeline(void *args) +{ + struct vkCmdBindPipeline_params *params = args; + TRACE("%p, %#x, 0x%s\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->pipeline)); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindPipeline(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineBindPoint, params->pipeline); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBindPipeline(void *args) { struct vkCmdBindPipeline_params *params = args; TRACE("%p, %#x, 0x%s\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->pipeline)); @@ -5685,7 +5983,21 @@ static NTSTATUS wine_vkCmdBindPipeline(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdBindPipelineShaderGroupNV(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBindPipelineShaderGroupNV(void *args) +{ + struct vkCmdBindPipelineShaderGroupNV_params *params = args; + TRACE("%p, %#x, 0x%s, %u\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->pipeline), params->groupIndex); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindPipelineShaderGroupNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineBindPoint, params->pipeline, params->groupIndex); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBindPipelineShaderGroupNV(void *args) { struct vkCmdBindPipelineShaderGroupNV_params *params = args; TRACE("%p, %#x, 0x%s, %u\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->pipeline), params->groupIndex); @@ -5693,7 +6005,21 @@ static NTSTATUS wine_vkCmdBindPipelineShaderGroupNV(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdBindShadingRateImageNV(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBindShadingRateImageNV(void *args) +{ + struct vkCmdBindShadingRateImageNV_params *params = args; + TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->imageView), params->imageLayout); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindShadingRateImageNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->imageView, params->imageLayout); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBindShadingRateImageNV(void *args) { struct vkCmdBindShadingRateImageNV_params *params = args; TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->imageView), params->imageLayout); @@ -5701,7 +6027,21 @@ static NTSTATUS wine_vkCmdBindShadingRateImageNV(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdBindTransformFeedbackBuffersEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBindTransformFeedbackBuffersEXT(void *args) +{ + struct vkCmdBindTransformFeedbackBuffersEXT_params *params = args; + TRACE("%p, %u, %u, %p, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindTransformFeedbackBuffersEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBindTransformFeedbackBuffersEXT(void *args) { struct vkCmdBindTransformFeedbackBuffersEXT_params *params = args; TRACE("%p, %u, %u, %p, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes); @@ -5709,7 +6049,21 @@ static NTSTATUS wine_vkCmdBindTransformFeedbackBuffersEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdBindVertexBuffers(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBindVertexBuffers(void *args) +{ + struct vkCmdBindVertexBuffers_params *params = args; + TRACE("%p, %u, %u, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindVertexBuffers(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBindVertexBuffers(void *args) { struct vkCmdBindVertexBuffers_params *params = args; TRACE("%p, %u, %u, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets); @@ -5717,7 +6071,21 @@ static NTSTATUS wine_vkCmdBindVertexBuffers(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdBindVertexBuffers2(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBindVertexBuffers2(void *args) +{ + struct vkCmdBindVertexBuffers2_params *params = args; + TRACE("%p, %u, %u, %p, %p, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindVertexBuffers2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBindVertexBuffers2(void *args) { struct vkCmdBindVertexBuffers2_params *params = args; TRACE("%p, %u, %u, %p, %p, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides); @@ -5725,7 +6093,21 @@ static NTSTATUS wine_vkCmdBindVertexBuffers2(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdBindVertexBuffers2EXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBindVertexBuffers2EXT(void *args) +{ + struct vkCmdBindVertexBuffers2EXT_params *params = args; + TRACE("%p, %u, %u, %p, %p, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindVertexBuffers2EXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBindVertexBuffers2EXT(void *args) { struct vkCmdBindVertexBuffers2EXT_params *params = args; TRACE("%p, %u, %u, %p, %p, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides); @@ -5733,7 +6115,21 @@ static NTSTATUS wine_vkCmdBindVertexBuffers2EXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdBlitImage(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBlitImage(void *args) +{ + struct vkCmdBlitImage_params *params = args; + TRACE("%p, 0x%s, %#x, 0x%s, %#x, %u, %p, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions, params->filter); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBlitImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcImage, params->srcImageLayout, params->dstImage, params->dstImageLayout, params->regionCount, params->pRegions, params->filter); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBlitImage(void *args) { struct vkCmdBlitImage_params *params = args; TRACE("%p, 0x%s, %#x, 0x%s, %#x, %u, %p, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions, params->filter); @@ -5741,10 +6137,23 @@ static NTSTATUS wine_vkCmdBlitImage(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdBlitImage2(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBlitImage2(void *args) +{ + struct vkCmdBlitImage2_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pBlitImageInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBlitImage2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pBlitImageInfo); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBlitImage2(void *args) { struct vkCmdBlitImage2_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkBlitImageInfo2_host pBlitImageInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pBlitImageInfo); @@ -5752,17 +6161,25 @@ static NTSTATUS wine_vkCmdBlitImage2(void *args) wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBlitImage2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pBlitImageInfo_host); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBlitImage2KHR(void *args) +{ + struct vkCmdBlitImage2KHR_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pBlitImageInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBlitImage2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pBlitImageInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBlitImage2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pBlitImageInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdBlitImage2KHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBlitImage2KHR(void *args) { struct vkCmdBlitImage2KHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkBlitImageInfo2_host pBlitImageInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pBlitImageInfo); @@ -5770,17 +6187,25 @@ static NTSTATUS wine_vkCmdBlitImage2KHR(void *args) wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBlitImage2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pBlitImageInfo_host); return STATUS_SUCCESS; -#else - TRACE("%p, %p\n", params->commandBuffer, params->pBlitImageInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBlitImage2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pBlitImageInfo); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBuildAccelerationStructureNV(void *args) +{ + struct vkCmdBuildAccelerationStructureNV_params *params = args; + TRACE("%p, %p, 0x%s, 0x%s, %u, 0x%s, 0x%s, 0x%s, 0x%s\n", params->commandBuffer, params->pInfo, wine_dbgstr_longlong(params->instanceData), wine_dbgstr_longlong(params->instanceOffset), params->update, wine_dbgstr_longlong(params->dst), wine_dbgstr_longlong(params->src), wine_dbgstr_longlong(params->scratch), wine_dbgstr_longlong(params->scratchOffset)); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBuildAccelerationStructureNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pInfo, params->instanceData, params->instanceOffset, params->update, params->dst, params->src, params->scratch, params->scratchOffset); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdBuildAccelerationStructureNV(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBuildAccelerationStructureNV(void *args) { struct vkCmdBuildAccelerationStructureNV_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkAccelerationStructureInfoNV_host pInfo_host; TRACE("%p, %p, 0x%s, 0x%s, %u, 0x%s, 0x%s, 0x%s, 0x%s\n", params->commandBuffer, params->pInfo, wine_dbgstr_longlong(params->instanceData), wine_dbgstr_longlong(params->instanceOffset), params->update, wine_dbgstr_longlong(params->dst), wine_dbgstr_longlong(params->src), wine_dbgstr_longlong(params->scratch), wine_dbgstr_longlong(params->scratchOffset)); @@ -5789,17 +6214,25 @@ static NTSTATUS wine_vkCmdBuildAccelerationStructureNV(void *args) free_VkAccelerationStructureInfoNV(&pInfo_host); return STATUS_SUCCESS; -#else - TRACE("%p, %p, 0x%s, 0x%s, %u, 0x%s, 0x%s, 0x%s, 0x%s\n", params->commandBuffer, params->pInfo, wine_dbgstr_longlong(params->instanceData), wine_dbgstr_longlong(params->instanceOffset), params->update, wine_dbgstr_longlong(params->dst), wine_dbgstr_longlong(params->src), wine_dbgstr_longlong(params->scratch), wine_dbgstr_longlong(params->scratchOffset)); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBuildAccelerationStructureNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pInfo, params->instanceData, params->instanceOffset, params->update, params->dst, params->src, params->scratch, params->scratchOffset); - return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdBuildAccelerationStructuresIndirectKHR(void *args) -{ +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBuildAccelerationStructuresIndirectKHR(void *args) +{ + struct vkCmdBuildAccelerationStructuresIndirectKHR_params *params = args; + TRACE("%p, %u, %p, %p, %p, %p\n", params->commandBuffer, params->infoCount, params->pInfos, params->pIndirectDeviceAddresses, params->pIndirectStrides, params->ppMaxPrimitiveCounts); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBuildAccelerationStructuresIndirectKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->infoCount, params->pInfos, params->pIndirectDeviceAddresses, params->pIndirectStrides, params->ppMaxPrimitiveCounts); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBuildAccelerationStructuresIndirectKHR(void *args) +{ struct vkCmdBuildAccelerationStructuresIndirectKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkAccelerationStructureBuildGeometryInfoKHR_host *pInfos_host; TRACE("%p, %u, %p, %p, %p, %p\n", params->commandBuffer, params->infoCount, params->pInfos, params->pIndirectDeviceAddresses, params->pIndirectStrides, params->ppMaxPrimitiveCounts); @@ -5808,17 +6241,25 @@ static NTSTATUS wine_vkCmdBuildAccelerationStructuresIndirectKHR(void *args) free_VkAccelerationStructureBuildGeometryInfoKHR_array(pInfos_host, params->infoCount); return STATUS_SUCCESS; -#else - TRACE("%p, %u, %p, %p, %p, %p\n", params->commandBuffer, params->infoCount, params->pInfos, params->pIndirectDeviceAddresses, params->pIndirectStrides, params->ppMaxPrimitiveCounts); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBuildAccelerationStructuresIndirectKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->infoCount, params->pInfos, params->pIndirectDeviceAddresses, params->pIndirectStrides, params->ppMaxPrimitiveCounts); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdBuildAccelerationStructuresKHR(void *args) +{ + struct vkCmdBuildAccelerationStructuresKHR_params *params = args; + TRACE("%p, %u, %p, %p\n", params->commandBuffer, params->infoCount, params->pInfos, params->ppBuildRangeInfos); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBuildAccelerationStructuresKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->infoCount, params->pInfos, params->ppBuildRangeInfos); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdBuildAccelerationStructuresKHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdBuildAccelerationStructuresKHR(void *args) { struct vkCmdBuildAccelerationStructuresKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkAccelerationStructureBuildGeometryInfoKHR_host *pInfos_host; TRACE("%p, %u, %p, %p\n", params->commandBuffer, params->infoCount, params->pInfos, params->ppBuildRangeInfos); @@ -5827,14 +6268,23 @@ static NTSTATUS wine_vkCmdBuildAccelerationStructuresKHR(void *args) free_VkAccelerationStructureBuildGeometryInfoKHR_array(pInfos_host, params->infoCount); return STATUS_SUCCESS; -#else - TRACE("%p, %u, %p, %p\n", params->commandBuffer, params->infoCount, params->pInfos, params->ppBuildRangeInfos); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBuildAccelerationStructuresKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->infoCount, params->pInfos, params->ppBuildRangeInfos); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdClearAttachments(void *args) +{ + struct vkCmdClearAttachments_params *params = args; + TRACE("%p, %u, %p, %u, %p\n", params->commandBuffer, params->attachmentCount, params->pAttachments, params->rectCount, params->pRects); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdClearAttachments(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->attachmentCount, params->pAttachments, params->rectCount, params->pRects); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdClearAttachments(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdClearAttachments(void *args) { struct vkCmdClearAttachments_params *params = args; TRACE("%p, %u, %p, %u, %p\n", params->commandBuffer, params->attachmentCount, params->pAttachments, params->rectCount, params->pRects); @@ -5842,7 +6292,21 @@ static NTSTATUS wine_vkCmdClearAttachments(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdClearColorImage(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdClearColorImage(void *args) +{ + struct vkCmdClearColorImage_params *params = args; + TRACE("%p, 0x%s, %#x, %p, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->image), params->imageLayout, params->pColor, params->rangeCount, params->pRanges); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdClearColorImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->image, params->imageLayout, params->pColor, params->rangeCount, params->pRanges); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdClearColorImage(void *args) { struct vkCmdClearColorImage_params *params = args; TRACE("%p, 0x%s, %#x, %p, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->image), params->imageLayout, params->pColor, params->rangeCount, params->pRanges); @@ -5850,7 +6314,21 @@ static NTSTATUS wine_vkCmdClearColorImage(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdClearDepthStencilImage(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdClearDepthStencilImage(void *args) +{ + struct vkCmdClearDepthStencilImage_params *params = args; + TRACE("%p, 0x%s, %#x, %p, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->image), params->imageLayout, params->pDepthStencil, params->rangeCount, params->pRanges); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdClearDepthStencilImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->image, params->imageLayout, params->pDepthStencil, params->rangeCount, params->pRanges); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdClearDepthStencilImage(void *args) { struct vkCmdClearDepthStencilImage_params *params = args; TRACE("%p, 0x%s, %#x, %p, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->image), params->imageLayout, params->pDepthStencil, params->rangeCount, params->pRanges); @@ -5858,10 +6336,23 @@ static NTSTATUS wine_vkCmdClearDepthStencilImage(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdCopyAccelerationStructureKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdCopyAccelerationStructureKHR(void *args) +{ + struct vkCmdCopyAccelerationStructureKHR_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyAccelerationStructureKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pInfo); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdCopyAccelerationStructureKHR(void *args) { struct vkCmdCopyAccelerationStructureKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkCopyAccelerationStructureInfoKHR_host pInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pInfo); @@ -5869,14 +6360,23 @@ static NTSTATUS wine_vkCmdCopyAccelerationStructureKHR(void *args) wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyAccelerationStructureKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pInfo_host); return STATUS_SUCCESS; -#else - TRACE("%p, %p\n", params->commandBuffer, params->pInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyAccelerationStructureKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pInfo); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdCopyAccelerationStructureNV(void *args) +{ + struct vkCmdCopyAccelerationStructureNV_params *params = args; + TRACE("%p, 0x%s, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->dst), wine_dbgstr_longlong(params->src), params->mode); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyAccelerationStructureNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->dst, params->src, params->mode); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdCopyAccelerationStructureNV(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdCopyAccelerationStructureNV(void *args) { struct vkCmdCopyAccelerationStructureNV_params *params = args; TRACE("%p, 0x%s, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->dst), wine_dbgstr_longlong(params->src), params->mode); @@ -5884,10 +6384,23 @@ static NTSTATUS wine_vkCmdCopyAccelerationStructureNV(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdCopyAccelerationStructureToMemoryKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdCopyAccelerationStructureToMemoryKHR(void *args) +{ + struct vkCmdCopyAccelerationStructureToMemoryKHR_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyAccelerationStructureToMemoryKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pInfo); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdCopyAccelerationStructureToMemoryKHR(void *args) { struct vkCmdCopyAccelerationStructureToMemoryKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkCopyAccelerationStructureToMemoryInfoKHR_host pInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pInfo); @@ -5895,17 +6408,25 @@ static NTSTATUS wine_vkCmdCopyAccelerationStructureToMemoryKHR(void *args) wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyAccelerationStructureToMemoryKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pInfo_host); return STATUS_SUCCESS; -#else - TRACE("%p, %p\n", params->commandBuffer, params->pInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyAccelerationStructureToMemoryKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pInfo); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdCopyBuffer(void *args) +{ + struct vkCmdCopyBuffer_params *params = args; + TRACE("%p, 0x%s, 0x%s, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcBuffer), wine_dbgstr_longlong(params->dstBuffer), params->regionCount, params->pRegions); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcBuffer, params->dstBuffer, params->regionCount, params->pRegions); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdCopyBuffer(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdCopyBuffer(void *args) { struct vkCmdCopyBuffer_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkBufferCopy_host *pRegions_host; TRACE("%p, 0x%s, 0x%s, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcBuffer), wine_dbgstr_longlong(params->dstBuffer), params->regionCount, params->pRegions); @@ -5914,17 +6435,25 @@ static NTSTATUS wine_vkCmdCopyBuffer(void *args) free_VkBufferCopy_array(pRegions_host, params->regionCount); return STATUS_SUCCESS; -#else - TRACE("%p, 0x%s, 0x%s, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcBuffer), wine_dbgstr_longlong(params->dstBuffer), params->regionCount, params->pRegions); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcBuffer, params->dstBuffer, params->regionCount, params->pRegions); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdCopyBuffer2(void *args) +{ + struct vkCmdCopyBuffer2_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pCopyBufferInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBuffer2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyBufferInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdCopyBuffer2(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdCopyBuffer2(void *args) { struct vkCmdCopyBuffer2_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkCopyBufferInfo2_host pCopyBufferInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pCopyBufferInfo); @@ -5933,17 +6462,25 @@ static NTSTATUS wine_vkCmdCopyBuffer2(void *args) free_VkCopyBufferInfo2(&pCopyBufferInfo_host); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdCopyBuffer2KHR(void *args) +{ + struct vkCmdCopyBuffer2KHR_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pCopyBufferInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBuffer2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyBufferInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBuffer2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyBufferInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdCopyBuffer2KHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdCopyBuffer2KHR(void *args) { struct vkCmdCopyBuffer2KHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkCopyBufferInfo2_host pCopyBufferInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pCopyBufferInfo); @@ -5952,17 +6489,25 @@ static NTSTATUS wine_vkCmdCopyBuffer2KHR(void *args) free_VkCopyBufferInfo2(&pCopyBufferInfo_host); return STATUS_SUCCESS; -#else - TRACE("%p, %p\n", params->commandBuffer, params->pCopyBufferInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBuffer2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyBufferInfo); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdCopyBufferToImage(void *args) +{ + struct vkCmdCopyBufferToImage_params *params = args; + TRACE("%p, 0x%s, 0x%s, %#x, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcBuffer), wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBufferToImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcBuffer, params->dstImage, params->dstImageLayout, params->regionCount, params->pRegions); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdCopyBufferToImage(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdCopyBufferToImage(void *args) { struct vkCmdCopyBufferToImage_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkBufferImageCopy_host *pRegions_host; TRACE("%p, 0x%s, 0x%s, %#x, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcBuffer), wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions); @@ -5971,17 +6516,25 @@ static NTSTATUS wine_vkCmdCopyBufferToImage(void *args) free_VkBufferImageCopy_array(pRegions_host, params->regionCount); return STATUS_SUCCESS; -#else - TRACE("%p, 0x%s, 0x%s, %#x, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcBuffer), wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBufferToImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcBuffer, params->dstImage, params->dstImageLayout, params->regionCount, params->pRegions); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdCopyBufferToImage2(void *args) +{ + struct vkCmdCopyBufferToImage2_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pCopyBufferToImageInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBufferToImage2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyBufferToImageInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdCopyBufferToImage2(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdCopyBufferToImage2(void *args) { struct vkCmdCopyBufferToImage2_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkCopyBufferToImageInfo2_host pCopyBufferToImageInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pCopyBufferToImageInfo); @@ -5990,17 +6543,25 @@ static NTSTATUS wine_vkCmdCopyBufferToImage2(void *args) free_VkCopyBufferToImageInfo2(&pCopyBufferToImageInfo_host); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdCopyBufferToImage2KHR(void *args) +{ + struct vkCmdCopyBufferToImage2KHR_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pCopyBufferToImageInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBufferToImage2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyBufferToImageInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBufferToImage2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyBufferToImageInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdCopyBufferToImage2KHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdCopyBufferToImage2KHR(void *args) { struct vkCmdCopyBufferToImage2KHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkCopyBufferToImageInfo2_host pCopyBufferToImageInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pCopyBufferToImageInfo); @@ -6009,14 +6570,23 @@ static NTSTATUS wine_vkCmdCopyBufferToImage2KHR(void *args) free_VkCopyBufferToImageInfo2(&pCopyBufferToImageInfo_host); return STATUS_SUCCESS; -#else - TRACE("%p, %p\n", params->commandBuffer, params->pCopyBufferToImageInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBufferToImage2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyBufferToImageInfo); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdCopyImage(void *args) +{ + struct vkCmdCopyImage_params *params = args; + TRACE("%p, 0x%s, %#x, 0x%s, %#x, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcImage, params->srcImageLayout, params->dstImage, params->dstImageLayout, params->regionCount, params->pRegions); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdCopyImage(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdCopyImage(void *args) { struct vkCmdCopyImage_params *params = args; TRACE("%p, 0x%s, %#x, 0x%s, %#x, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions); @@ -6024,10 +6594,23 @@ static NTSTATUS wine_vkCmdCopyImage(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdCopyImage2(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdCopyImage2(void *args) +{ + struct vkCmdCopyImage2_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImage2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyImageInfo); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdCopyImage2(void *args) { struct vkCmdCopyImage2_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkCopyImageInfo2_host pCopyImageInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageInfo); @@ -6035,17 +6618,25 @@ static NTSTATUS wine_vkCmdCopyImage2(void *args) wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImage2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pCopyImageInfo_host); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdCopyImage2KHR(void *args) +{ + struct vkCmdCopyImage2KHR_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImage2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyImageInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImage2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyImageInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdCopyImage2KHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdCopyImage2KHR(void *args) { struct vkCmdCopyImage2KHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkCopyImageInfo2_host pCopyImageInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageInfo); @@ -6053,17 +6644,25 @@ static NTSTATUS wine_vkCmdCopyImage2KHR(void *args) wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImage2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pCopyImageInfo_host); return STATUS_SUCCESS; -#else - TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImage2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyImageInfo); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdCopyImageToBuffer(void *args) +{ + struct vkCmdCopyImageToBuffer_params *params = args; + TRACE("%p, 0x%s, %#x, 0x%s, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstBuffer), params->regionCount, params->pRegions); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImageToBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcImage, params->srcImageLayout, params->dstBuffer, params->regionCount, params->pRegions); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdCopyImageToBuffer(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdCopyImageToBuffer(void *args) { struct vkCmdCopyImageToBuffer_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkBufferImageCopy_host *pRegions_host; TRACE("%p, 0x%s, %#x, 0x%s, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstBuffer), params->regionCount, params->pRegions); @@ -6072,36 +6671,52 @@ static NTSTATUS wine_vkCmdCopyImageToBuffer(void *args) free_VkBufferImageCopy_array(pRegions_host, params->regionCount); return STATUS_SUCCESS; -#else - TRACE("%p, 0x%s, %#x, 0x%s, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstBuffer), params->regionCount, params->pRegions); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImageToBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcImage, params->srcImageLayout, params->dstBuffer, params->regionCount, params->pRegions); - return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdCopyImageToBuffer2(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdCopyImageToBuffer2(void *args) { struct vkCmdCopyImageToBuffer2_params *params = args; -#if defined(USE_STRUCT_CONVERSION) - VkCopyImageToBufferInfo2_host pCopyImageToBufferInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageToBufferInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImageToBuffer2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyImageToBufferInfo); + return STATUS_SUCCESS; +} - convert_VkCopyImageToBufferInfo2_win_to_host(params->pCopyImageToBufferInfo, &pCopyImageToBufferInfo_host); +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdCopyImageToBuffer2(void *args) +{ + struct vkCmdCopyImageToBuffer2_params *params = args; + VkCopyImageToBufferInfo2_host pCopyImageToBufferInfo_host; + TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageToBufferInfo); + + convert_VkCopyImageToBufferInfo2_win_to_host(params->pCopyImageToBufferInfo, &pCopyImageToBufferInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImageToBuffer2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pCopyImageToBufferInfo_host); free_VkCopyImageToBufferInfo2(&pCopyImageToBufferInfo_host); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdCopyImageToBuffer2KHR(void *args) +{ + struct vkCmdCopyImageToBuffer2KHR_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageToBufferInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImageToBuffer2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyImageToBufferInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImageToBuffer2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyImageToBufferInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdCopyImageToBuffer2KHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdCopyImageToBuffer2KHR(void *args) { struct vkCmdCopyImageToBuffer2KHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkCopyImageToBufferInfo2_host pCopyImageToBufferInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageToBufferInfo); @@ -6110,17 +6725,25 @@ static NTSTATUS wine_vkCmdCopyImageToBuffer2KHR(void *args) free_VkCopyImageToBufferInfo2(&pCopyImageToBufferInfo_host); return STATUS_SUCCESS; -#else - TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageToBufferInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImageToBuffer2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyImageToBufferInfo); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdCopyMemoryToAccelerationStructureKHR(void *args) +{ + struct vkCmdCopyMemoryToAccelerationStructureKHR_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyMemoryToAccelerationStructureKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdCopyMemoryToAccelerationStructureKHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdCopyMemoryToAccelerationStructureKHR(void *args) { struct vkCmdCopyMemoryToAccelerationStructureKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkCopyMemoryToAccelerationStructureInfoKHR_host pInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pInfo); @@ -6128,14 +6751,23 @@ static NTSTATUS wine_vkCmdCopyMemoryToAccelerationStructureKHR(void *args) wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyMemoryToAccelerationStructureKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pInfo_host); return STATUS_SUCCESS; -#else - TRACE("%p, %p\n", params->commandBuffer, params->pInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyMemoryToAccelerationStructureKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pInfo); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdCopyQueryPoolResults(void *args) +{ + struct vkCmdCopyQueryPoolResults_params *params = args; + TRACE("%p, 0x%s, %u, %u, 0x%s, 0x%s, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), wine_dbgstr_longlong(params->stride), params->flags); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyQueryPoolResults(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->firstQuery, params->queryCount, params->dstBuffer, params->dstOffset, params->stride, params->flags); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdCopyQueryPoolResults(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdCopyQueryPoolResults(void *args) { struct vkCmdCopyQueryPoolResults_params *params = args; TRACE("%p, 0x%s, %u, %u, 0x%s, 0x%s, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), wine_dbgstr_longlong(params->stride), params->flags); @@ -6143,10 +6775,23 @@ static NTSTATUS wine_vkCmdCopyQueryPoolResults(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdCuLaunchKernelNVX(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdCuLaunchKernelNVX(void *args) +{ + struct vkCmdCuLaunchKernelNVX_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pLaunchInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCuLaunchKernelNVX(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pLaunchInfo); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdCuLaunchKernelNVX(void *args) { struct vkCmdCuLaunchKernelNVX_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkCuLaunchInfoNVX_host pLaunchInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pLaunchInfo); @@ -6154,14 +6799,23 @@ static NTSTATUS wine_vkCmdCuLaunchKernelNVX(void *args) wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCuLaunchKernelNVX(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pLaunchInfo_host); return STATUS_SUCCESS; -#else - TRACE("%p, %p\n", params->commandBuffer, params->pLaunchInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCuLaunchKernelNVX(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pLaunchInfo); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDebugMarkerBeginEXT(void *args) +{ + struct vkCmdDebugMarkerBeginEXT_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDebugMarkerBeginEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pMarkerInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdDebugMarkerBeginEXT(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDebugMarkerBeginEXT(void *args) { struct vkCmdDebugMarkerBeginEXT_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo); @@ -6169,7 +6823,21 @@ static NTSTATUS wine_vkCmdDebugMarkerBeginEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDebugMarkerEndEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDebugMarkerEndEXT(void *args) +{ + struct vkCmdDebugMarkerEndEXT_params *params = args; + TRACE("%p\n", params->commandBuffer); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDebugMarkerEndEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDebugMarkerEndEXT(void *args) { struct vkCmdDebugMarkerEndEXT_params *params = args; TRACE("%p\n", params->commandBuffer); @@ -6177,7 +6845,21 @@ static NTSTATUS wine_vkCmdDebugMarkerEndEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDebugMarkerInsertEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDebugMarkerInsertEXT(void *args) +{ + struct vkCmdDebugMarkerInsertEXT_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDebugMarkerInsertEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pMarkerInfo); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDebugMarkerInsertEXT(void *args) { struct vkCmdDebugMarkerInsertEXT_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo); @@ -6185,7 +6867,21 @@ static NTSTATUS wine_vkCmdDebugMarkerInsertEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDispatch(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDispatch(void *args) +{ + struct vkCmdDispatch_params *params = args; + TRACE("%p, %u, %u, %u\n", params->commandBuffer, params->groupCountX, params->groupCountY, params->groupCountZ); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDispatch(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->groupCountX, params->groupCountY, params->groupCountZ); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDispatch(void *args) { struct vkCmdDispatch_params *params = args; TRACE("%p, %u, %u, %u\n", params->commandBuffer, params->groupCountX, params->groupCountY, params->groupCountZ); @@ -6193,7 +6889,21 @@ static NTSTATUS wine_vkCmdDispatch(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDispatchBase(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDispatchBase(void *args) +{ + struct vkCmdDispatchBase_params *params = args; + TRACE("%p, %u, %u, %u, %u, %u, %u\n", params->commandBuffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDispatchBase(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDispatchBase(void *args) { struct vkCmdDispatchBase_params *params = args; TRACE("%p, %u, %u, %u, %u, %u, %u\n", params->commandBuffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ); @@ -6201,7 +6911,21 @@ static NTSTATUS wine_vkCmdDispatchBase(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDispatchBaseKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDispatchBaseKHR(void *args) +{ + struct vkCmdDispatchBaseKHR_params *params = args; + TRACE("%p, %u, %u, %u, %u, %u, %u\n", params->commandBuffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDispatchBaseKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDispatchBaseKHR(void *args) { struct vkCmdDispatchBaseKHR_params *params = args; TRACE("%p, %u, %u, %u, %u, %u, %u\n", params->commandBuffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ); @@ -6209,7 +6933,21 @@ static NTSTATUS wine_vkCmdDispatchBaseKHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDispatchIndirect(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDispatchIndirect(void *args) +{ + struct vkCmdDispatchIndirect_params *params = args; + TRACE("%p, 0x%s, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset)); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDispatchIndirect(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDispatchIndirect(void *args) { struct vkCmdDispatchIndirect_params *params = args; TRACE("%p, 0x%s, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset)); @@ -6217,7 +6955,21 @@ static NTSTATUS wine_vkCmdDispatchIndirect(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDraw(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDraw(void *args) +{ + struct vkCmdDraw_params *params = args; + TRACE("%p, %u, %u, %u, %u\n", params->commandBuffer, params->vertexCount, params->instanceCount, params->firstVertex, params->firstInstance); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDraw(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->vertexCount, params->instanceCount, params->firstVertex, params->firstInstance); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDraw(void *args) { struct vkCmdDraw_params *params = args; TRACE("%p, %u, %u, %u, %u\n", params->commandBuffer, params->vertexCount, params->instanceCount, params->firstVertex, params->firstInstance); @@ -6225,7 +6977,21 @@ static NTSTATUS wine_vkCmdDraw(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDrawIndexed(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDrawIndexed(void *args) +{ + struct vkCmdDrawIndexed_params *params = args; + TRACE("%p, %u, %u, %u, %d, %u\n", params->commandBuffer, params->indexCount, params->instanceCount, params->firstIndex, params->vertexOffset, params->firstInstance); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexed(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->indexCount, params->instanceCount, params->firstIndex, params->vertexOffset, params->firstInstance); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDrawIndexed(void *args) { struct vkCmdDrawIndexed_params *params = args; TRACE("%p, %u, %u, %u, %d, %u\n", params->commandBuffer, params->indexCount, params->instanceCount, params->firstIndex, params->vertexOffset, params->firstInstance); @@ -6233,7 +6999,21 @@ static NTSTATUS wine_vkCmdDrawIndexed(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDrawIndexedIndirect(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDrawIndexedIndirect(void *args) +{ + struct vkCmdDrawIndexedIndirect_params *params = args; + TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexedIndirect(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->drawCount, params->stride); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDrawIndexedIndirect(void *args) { struct vkCmdDrawIndexedIndirect_params *params = args; TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); @@ -6241,7 +7021,21 @@ static NTSTATUS wine_vkCmdDrawIndexedIndirect(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDrawIndexedIndirectCount(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDrawIndexedIndirectCount(void *args) +{ + struct vkCmdDrawIndexedIndirectCount_params *params = args; + TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexedIndirectCount(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDrawIndexedIndirectCount(void *args) { struct vkCmdDrawIndexedIndirectCount_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); @@ -6249,7 +7043,21 @@ static NTSTATUS wine_vkCmdDrawIndexedIndirectCount(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDrawIndexedIndirectCountAMD(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDrawIndexedIndirectCountAMD(void *args) +{ + struct vkCmdDrawIndexedIndirectCountAMD_params *params = args; + TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexedIndirectCountAMD(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDrawIndexedIndirectCountAMD(void *args) { struct vkCmdDrawIndexedIndirectCountAMD_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); @@ -6257,7 +7065,21 @@ static NTSTATUS wine_vkCmdDrawIndexedIndirectCountAMD(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDrawIndexedIndirectCountKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDrawIndexedIndirectCountKHR(void *args) +{ + struct vkCmdDrawIndexedIndirectCountKHR_params *params = args; + TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexedIndirectCountKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDrawIndexedIndirectCountKHR(void *args) { struct vkCmdDrawIndexedIndirectCountKHR_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); @@ -6265,7 +7087,21 @@ static NTSTATUS wine_vkCmdDrawIndexedIndirectCountKHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDrawIndirect(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDrawIndirect(void *args) +{ + struct vkCmdDrawIndirect_params *params = args; + TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirect(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->drawCount, params->stride); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDrawIndirect(void *args) { struct vkCmdDrawIndirect_params *params = args; TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); @@ -6273,7 +7109,11 @@ static NTSTATUS wine_vkCmdDrawIndirect(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDrawIndirectByteCountEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDrawIndirectByteCountEXT(void *args) { struct vkCmdDrawIndirectByteCountEXT_params *params = args; TRACE("%p, %u, %u, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, params->instanceCount, params->firstInstance, wine_dbgstr_longlong(params->counterBuffer), wine_dbgstr_longlong(params->counterBufferOffset), params->counterOffset, params->vertexStride); @@ -6281,55 +7121,163 @@ static NTSTATUS wine_vkCmdDrawIndirectByteCountEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDrawIndirectCount(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDrawIndirectByteCountEXT(void *args) { - struct vkCmdDrawIndirectCount_params *params = args; - TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectCount(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + struct vkCmdDrawIndirectByteCountEXT_params *params = args; + TRACE("%p, %u, %u, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, params->instanceCount, params->firstInstance, wine_dbgstr_longlong(params->counterBuffer), wine_dbgstr_longlong(params->counterBufferOffset), params->counterOffset, params->vertexStride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectByteCountEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->instanceCount, params->firstInstance, params->counterBuffer, params->counterBufferOffset, params->counterOffset, params->vertexStride); return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDrawIndirectCountAMD(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDrawIndirectCount(void *args) { - struct vkCmdDrawIndirectCountAMD_params *params = args; + struct vkCmdDrawIndirectCount_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectCountAMD(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectCount(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDrawIndirectCountKHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDrawIndirectCount(void *args) { - struct vkCmdDrawIndirectCountKHR_params *params = args; + struct vkCmdDrawIndirectCount_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectCountKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectCount(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDrawMeshTasksEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDrawIndirectCountAMD(void *args) { - struct vkCmdDrawMeshTasksEXT_params *params = args; - TRACE("%p, %u, %u, %u\n", params->commandBuffer, params->groupCountX, params->groupCountY, params->groupCountZ); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->groupCountX, params->groupCountY, params->groupCountZ); + struct vkCmdDrawIndirectCountAMD_params *params = args; + TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectCountAMD(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDrawMeshTasksIndirectCountEXT(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDrawIndirectCountAMD(void *args) { - struct vkCmdDrawMeshTasksIndirectCountEXT_params *params = args; + struct vkCmdDrawIndirectCountAMD_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksIndirectCountEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectCountAMD(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDrawMeshTasksIndirectCountNV(void *args) -{ - struct vkCmdDrawMeshTasksIndirectCountNV_params *params = args; +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDrawIndirectCountKHR(void *args) +{ + struct vkCmdDrawIndirectCountKHR_params *params = args; + TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectCountKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDrawIndirectCountKHR(void *args) +{ + struct vkCmdDrawIndirectCountKHR_params *params = args; + TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectCountKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDrawMeshTasksEXT(void *args) +{ + struct vkCmdDrawMeshTasksEXT_params *params = args; + TRACE("%p, %u, %u, %u\n", params->commandBuffer, params->groupCountX, params->groupCountY, params->groupCountZ); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->groupCountX, params->groupCountY, params->groupCountZ); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDrawMeshTasksEXT(void *args) +{ + struct vkCmdDrawMeshTasksEXT_params *params = args; + TRACE("%p, %u, %u, %u\n", params->commandBuffer, params->groupCountX, params->groupCountY, params->groupCountZ); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->groupCountX, params->groupCountY, params->groupCountZ); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDrawMeshTasksIndirectCountEXT(void *args) +{ + struct vkCmdDrawMeshTasksIndirectCountEXT_params *params = args; + TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksIndirectCountEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDrawMeshTasksIndirectCountEXT(void *args) +{ + struct vkCmdDrawMeshTasksIndirectCountEXT_params *params = args; + TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksIndirectCountEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDrawMeshTasksIndirectCountNV(void *args) +{ + struct vkCmdDrawMeshTasksIndirectCountNV_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksIndirectCountNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDrawMeshTasksIndirectEXT(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDrawMeshTasksIndirectCountNV(void *args) +{ + struct vkCmdDrawMeshTasksIndirectCountNV_params *params = args; + TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksIndirectCountNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDrawMeshTasksIndirectEXT(void *args) +{ + struct vkCmdDrawMeshTasksIndirectEXT_params *params = args; + TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksIndirectEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->drawCount, params->stride); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDrawMeshTasksIndirectEXT(void *args) { struct vkCmdDrawMeshTasksIndirectEXT_params *params = args; TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); @@ -6337,7 +7285,11 @@ static NTSTATUS wine_vkCmdDrawMeshTasksIndirectEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDrawMeshTasksIndirectNV(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDrawMeshTasksIndirectNV(void *args) { struct vkCmdDrawMeshTasksIndirectNV_params *params = args; TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); @@ -6345,7 +7297,31 @@ static NTSTATUS wine_vkCmdDrawMeshTasksIndirectNV(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDrawMeshTasksNV(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDrawMeshTasksIndirectNV(void *args) +{ + struct vkCmdDrawMeshTasksIndirectNV_params *params = args; + TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksIndirectNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->drawCount, params->stride); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDrawMeshTasksNV(void *args) +{ + struct vkCmdDrawMeshTasksNV_params *params = args; + TRACE("%p, %u, %u\n", params->commandBuffer, params->taskCount, params->firstTask); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->taskCount, params->firstTask); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDrawMeshTasksNV(void *args) { struct vkCmdDrawMeshTasksNV_params *params = args; TRACE("%p, %u, %u\n", params->commandBuffer, params->taskCount, params->firstTask); @@ -6353,7 +7329,11 @@ static NTSTATUS wine_vkCmdDrawMeshTasksNV(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDrawMultiEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDrawMultiEXT(void *args) { struct vkCmdDrawMultiEXT_params *params = args; TRACE("%p, %u, %p, %u, %u, %u\n", params->commandBuffer, params->drawCount, params->pVertexInfo, params->instanceCount, params->firstInstance, params->stride); @@ -6361,7 +7341,31 @@ static NTSTATUS wine_vkCmdDrawMultiEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdDrawMultiIndexedEXT(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDrawMultiEXT(void *args) +{ + struct vkCmdDrawMultiEXT_params *params = args; + TRACE("%p, %u, %p, %u, %u, %u\n", params->commandBuffer, params->drawCount, params->pVertexInfo, params->instanceCount, params->firstInstance, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMultiEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->drawCount, params->pVertexInfo, params->instanceCount, params->firstInstance, params->stride); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdDrawMultiIndexedEXT(void *args) +{ + struct vkCmdDrawMultiIndexedEXT_params *params = args; + TRACE("%p, %u, %p, %u, %u, %u, %p\n", params->commandBuffer, params->drawCount, params->pIndexInfo, params->instanceCount, params->firstInstance, params->stride, params->pVertexOffset); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMultiIndexedEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->drawCount, params->pIndexInfo, params->instanceCount, params->firstInstance, params->stride, params->pVertexOffset); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdDrawMultiIndexedEXT(void *args) { struct vkCmdDrawMultiIndexedEXT_params *params = args; TRACE("%p, %u, %p, %u, %u, %u, %p\n", params->commandBuffer, params->drawCount, params->pIndexInfo, params->instanceCount, params->firstInstance, params->stride, params->pVertexOffset); @@ -6369,7 +7373,11 @@ static NTSTATUS wine_vkCmdDrawMultiIndexedEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdEndConditionalRenderingEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdEndConditionalRenderingEXT(void *args) { struct vkCmdEndConditionalRenderingEXT_params *params = args; TRACE("%p\n", params->commandBuffer); @@ -6377,7 +7385,31 @@ static NTSTATUS wine_vkCmdEndConditionalRenderingEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdEndDebugUtilsLabelEXT(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdEndConditionalRenderingEXT(void *args) +{ + struct vkCmdEndConditionalRenderingEXT_params *params = args; + TRACE("%p\n", params->commandBuffer); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndConditionalRenderingEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdEndDebugUtilsLabelEXT(void *args) +{ + struct vkCmdEndDebugUtilsLabelEXT_params *params = args; + TRACE("%p\n", params->commandBuffer); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndDebugUtilsLabelEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdEndDebugUtilsLabelEXT(void *args) { struct vkCmdEndDebugUtilsLabelEXT_params *params = args; TRACE("%p\n", params->commandBuffer); @@ -6385,7 +7417,11 @@ static NTSTATUS wine_vkCmdEndDebugUtilsLabelEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdEndQuery(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdEndQuery(void *args) { struct vkCmdEndQuery_params *params = args; TRACE("%p, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query); @@ -6393,7 +7429,31 @@ static NTSTATUS wine_vkCmdEndQuery(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdEndQueryIndexedEXT(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdEndQuery(void *args) +{ + struct vkCmdEndQuery_params *params = args; + TRACE("%p, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndQuery(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->query); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdEndQueryIndexedEXT(void *args) +{ + struct vkCmdEndQueryIndexedEXT_params *params = args; + TRACE("%p, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query, params->index); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndQueryIndexedEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->query, params->index); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdEndQueryIndexedEXT(void *args) { struct vkCmdEndQueryIndexedEXT_params *params = args; TRACE("%p, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query, params->index); @@ -6401,7 +7461,11 @@ static NTSTATUS wine_vkCmdEndQueryIndexedEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdEndRenderPass(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdEndRenderPass(void *args) { struct vkCmdEndRenderPass_params *params = args; TRACE("%p\n", params->commandBuffer); @@ -6409,7 +7473,31 @@ static NTSTATUS wine_vkCmdEndRenderPass(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdEndRenderPass2(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdEndRenderPass(void *args) +{ + struct vkCmdEndRenderPass_params *params = args; + TRACE("%p\n", params->commandBuffer); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRenderPass(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdEndRenderPass2(void *args) +{ + struct vkCmdEndRenderPass2_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pSubpassEndInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRenderPass2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSubpassEndInfo); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdEndRenderPass2(void *args) { struct vkCmdEndRenderPass2_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pSubpassEndInfo); @@ -6417,7 +7505,11 @@ static NTSTATUS wine_vkCmdEndRenderPass2(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdEndRenderPass2KHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdEndRenderPass2KHR(void *args) { struct vkCmdEndRenderPass2KHR_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pSubpassEndInfo); @@ -6425,7 +7517,31 @@ static NTSTATUS wine_vkCmdEndRenderPass2KHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdEndRendering(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdEndRenderPass2KHR(void *args) +{ + struct vkCmdEndRenderPass2KHR_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pSubpassEndInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRenderPass2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSubpassEndInfo); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdEndRendering(void *args) +{ + struct vkCmdEndRendering_params *params = args; + TRACE("%p\n", params->commandBuffer); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRendering(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdEndRendering(void *args) { struct vkCmdEndRendering_params *params = args; TRACE("%p\n", params->commandBuffer); @@ -6433,7 +7549,11 @@ static NTSTATUS wine_vkCmdEndRendering(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdEndRenderingKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdEndRenderingKHR(void *args) { struct vkCmdEndRenderingKHR_params *params = args; TRACE("%p\n", params->commandBuffer); @@ -6441,7 +7561,31 @@ static NTSTATUS wine_vkCmdEndRenderingKHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdEndTransformFeedbackEXT(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdEndRenderingKHR(void *args) +{ + struct vkCmdEndRenderingKHR_params *params = args; + TRACE("%p\n", params->commandBuffer); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRenderingKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdEndTransformFeedbackEXT(void *args) +{ + struct vkCmdEndTransformFeedbackEXT_params *params = args; + TRACE("%p, %u, %u, %p, %p\n", params->commandBuffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndTransformFeedbackEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdEndTransformFeedbackEXT(void *args) { struct vkCmdEndTransformFeedbackEXT_params *params = args; TRACE("%p, %u, %u, %p, %p\n", params->commandBuffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets); @@ -6449,7 +7593,11 @@ static NTSTATUS wine_vkCmdEndTransformFeedbackEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdExecuteCommands(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdExecuteCommands(void *args) { struct vkCmdExecuteCommands_params *params = args; VkCommandBuffer *pCommandBuffers_host; @@ -6462,10 +7610,38 @@ static NTSTATUS wine_vkCmdExecuteCommands(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdExecuteGeneratedCommandsNV(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdExecuteCommands(void *args) +{ + struct vkCmdExecuteCommands_params *params = args; + VkCommandBuffer *pCommandBuffers_host; + TRACE("%p, %u, %p\n", params->commandBuffer, params->commandBufferCount, params->pCommandBuffers); + + pCommandBuffers_host = convert_VkCommandBuffer_array_win_to_host(params->pCommandBuffers, params->commandBufferCount); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdExecuteCommands(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->commandBufferCount, pCommandBuffers_host); + + free_VkCommandBuffer_array(pCommandBuffers_host, params->commandBufferCount); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdExecuteGeneratedCommandsNV(void *args) +{ + struct vkCmdExecuteGeneratedCommandsNV_params *params = args; + TRACE("%p, %u, %p\n", params->commandBuffer, params->isPreprocessed, params->pGeneratedCommandsInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdExecuteGeneratedCommandsNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->isPreprocessed, params->pGeneratedCommandsInfo); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdExecuteGeneratedCommandsNV(void *args) { struct vkCmdExecuteGeneratedCommandsNV_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkGeneratedCommandsInfoNV_host pGeneratedCommandsInfo_host; TRACE("%p, %u, %p\n", params->commandBuffer, params->isPreprocessed, params->pGeneratedCommandsInfo); @@ -6474,14 +7650,23 @@ static NTSTATUS wine_vkCmdExecuteGeneratedCommandsNV(void *args) free_VkGeneratedCommandsInfoNV(&pGeneratedCommandsInfo_host); return STATUS_SUCCESS; -#else - TRACE("%p, %u, %p\n", params->commandBuffer, params->isPreprocessed, params->pGeneratedCommandsInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdExecuteGeneratedCommandsNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->isPreprocessed, params->pGeneratedCommandsInfo); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdFillBuffer(void *args) +{ + struct vkCmdFillBuffer_params *params = args; + TRACE("%p, 0x%s, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), wine_dbgstr_longlong(params->size), params->data); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdFillBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->dstBuffer, params->dstOffset, params->size, params->data); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdFillBuffer(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdFillBuffer(void *args) { struct vkCmdFillBuffer_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), wine_dbgstr_longlong(params->size), params->data); @@ -6489,7 +7674,21 @@ static NTSTATUS wine_vkCmdFillBuffer(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdInsertDebugUtilsLabelEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdInsertDebugUtilsLabelEXT(void *args) +{ + struct vkCmdInsertDebugUtilsLabelEXT_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pLabelInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdInsertDebugUtilsLabelEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pLabelInfo); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdInsertDebugUtilsLabelEXT(void *args) { struct vkCmdInsertDebugUtilsLabelEXT_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pLabelInfo); @@ -6497,7 +7696,11 @@ static NTSTATUS wine_vkCmdInsertDebugUtilsLabelEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdNextSubpass(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdNextSubpass(void *args) { struct vkCmdNextSubpass_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->contents); @@ -6505,7 +7708,31 @@ static NTSTATUS wine_vkCmdNextSubpass(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdNextSubpass2(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdNextSubpass(void *args) +{ + struct vkCmdNextSubpass_params *params = args; + TRACE("%p, %#x\n", params->commandBuffer, params->contents); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdNextSubpass(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->contents); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdNextSubpass2(void *args) +{ + struct vkCmdNextSubpass2_params *params = args; + TRACE("%p, %p, %p\n", params->commandBuffer, params->pSubpassBeginInfo, params->pSubpassEndInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdNextSubpass2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSubpassBeginInfo, params->pSubpassEndInfo); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdNextSubpass2(void *args) { struct vkCmdNextSubpass2_params *params = args; TRACE("%p, %p, %p\n", params->commandBuffer, params->pSubpassBeginInfo, params->pSubpassEndInfo); @@ -6513,7 +7740,11 @@ static NTSTATUS wine_vkCmdNextSubpass2(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdNextSubpass2KHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdNextSubpass2KHR(void *args) { struct vkCmdNextSubpass2KHR_params *params = args; TRACE("%p, %p, %p\n", params->commandBuffer, params->pSubpassBeginInfo, params->pSubpassEndInfo); @@ -6521,10 +7752,33 @@ static NTSTATUS wine_vkCmdNextSubpass2KHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdPipelineBarrier(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdNextSubpass2KHR(void *args) +{ + struct vkCmdNextSubpass2KHR_params *params = args; + TRACE("%p, %p, %p\n", params->commandBuffer, params->pSubpassBeginInfo, params->pSubpassEndInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdNextSubpass2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSubpassBeginInfo, params->pSubpassEndInfo); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdPipelineBarrier(void *args) +{ + struct vkCmdPipelineBarrier_params *params = args; + TRACE("%p, %#x, %#x, %#x, %u, %p, %u, %p, %u, %p\n", params->commandBuffer, params->srcStageMask, params->dstStageMask, params->dependencyFlags, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, params->pBufferMemoryBarriers, params->imageMemoryBarrierCount, params->pImageMemoryBarriers); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPipelineBarrier(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcStageMask, params->dstStageMask, params->dependencyFlags, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, params->pBufferMemoryBarriers, params->imageMemoryBarrierCount, params->pImageMemoryBarriers); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdPipelineBarrier(void *args) { struct vkCmdPipelineBarrier_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkBufferMemoryBarrier_host *pBufferMemoryBarriers_host; VkImageMemoryBarrier_host *pImageMemoryBarriers_host; TRACE("%p, %#x, %#x, %#x, %u, %p, %u, %p, %u, %p\n", params->commandBuffer, params->srcStageMask, params->dstStageMask, params->dependencyFlags, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, params->pBufferMemoryBarriers, params->imageMemoryBarrierCount, params->pImageMemoryBarriers); @@ -6536,17 +7790,25 @@ static NTSTATUS wine_vkCmdPipelineBarrier(void *args) free_VkBufferMemoryBarrier_array(pBufferMemoryBarriers_host, params->bufferMemoryBarrierCount); free_VkImageMemoryBarrier_array(pImageMemoryBarriers_host, params->imageMemoryBarrierCount); return STATUS_SUCCESS; -#else - TRACE("%p, %#x, %#x, %#x, %u, %p, %u, %p, %u, %p\n", params->commandBuffer, params->srcStageMask, params->dstStageMask, params->dependencyFlags, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, params->pBufferMemoryBarriers, params->imageMemoryBarrierCount, params->pImageMemoryBarriers); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPipelineBarrier(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcStageMask, params->dstStageMask, params->dependencyFlags, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, params->pBufferMemoryBarriers, params->imageMemoryBarrierCount, params->pImageMemoryBarriers); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdPipelineBarrier2(void *args) +{ + struct vkCmdPipelineBarrier2_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pDependencyInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPipelineBarrier2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pDependencyInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdPipelineBarrier2(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdPipelineBarrier2(void *args) { struct vkCmdPipelineBarrier2_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkDependencyInfo_host pDependencyInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pDependencyInfo); @@ -6555,17 +7817,25 @@ static NTSTATUS wine_vkCmdPipelineBarrier2(void *args) free_VkDependencyInfo(&pDependencyInfo_host); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdPipelineBarrier2KHR(void *args) +{ + struct vkCmdPipelineBarrier2KHR_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pDependencyInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPipelineBarrier2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pDependencyInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPipelineBarrier2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pDependencyInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdPipelineBarrier2KHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdPipelineBarrier2KHR(void *args) { struct vkCmdPipelineBarrier2KHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkDependencyInfo_host pDependencyInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pDependencyInfo); @@ -6574,17 +7844,25 @@ static NTSTATUS wine_vkCmdPipelineBarrier2KHR(void *args) free_VkDependencyInfo(&pDependencyInfo_host); return STATUS_SUCCESS; -#else - TRACE("%p, %p\n", params->commandBuffer, params->pDependencyInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPipelineBarrier2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pDependencyInfo); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdPreprocessGeneratedCommandsNV(void *args) +{ + struct vkCmdPreprocessGeneratedCommandsNV_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pGeneratedCommandsInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPreprocessGeneratedCommandsNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pGeneratedCommandsInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdPreprocessGeneratedCommandsNV(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdPreprocessGeneratedCommandsNV(void *args) { struct vkCmdPreprocessGeneratedCommandsNV_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkGeneratedCommandsInfoNV_host pGeneratedCommandsInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pGeneratedCommandsInfo); @@ -6593,14 +7871,23 @@ static NTSTATUS wine_vkCmdPreprocessGeneratedCommandsNV(void *args) free_VkGeneratedCommandsInfoNV(&pGeneratedCommandsInfo_host); return STATUS_SUCCESS; -#else - TRACE("%p, %p\n", params->commandBuffer, params->pGeneratedCommandsInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPreprocessGeneratedCommandsNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pGeneratedCommandsInfo); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdPushConstants(void *args) +{ + struct vkCmdPushConstants_params *params = args; + TRACE("%p, 0x%s, %#x, %u, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->layout), params->stageFlags, params->offset, params->size, params->pValues); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPushConstants(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->layout, params->stageFlags, params->offset, params->size, params->pValues); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdPushConstants(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdPushConstants(void *args) { struct vkCmdPushConstants_params *params = args; TRACE("%p, 0x%s, %#x, %u, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->layout), params->stageFlags, params->offset, params->size, params->pValues); @@ -6608,10 +7895,23 @@ static NTSTATUS wine_vkCmdPushConstants(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdPushDescriptorSetKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdPushDescriptorSetKHR(void *args) +{ + struct vkCmdPushDescriptorSetKHR_params *params = args; + TRACE("%p, %#x, 0x%s, %u, %u, %p\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->layout), params->set, params->descriptorWriteCount, params->pDescriptorWrites); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPushDescriptorSetKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineBindPoint, params->layout, params->set, params->descriptorWriteCount, params->pDescriptorWrites); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdPushDescriptorSetKHR(void *args) { struct vkCmdPushDescriptorSetKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkWriteDescriptorSet_host *pDescriptorWrites_host; TRACE("%p, %#x, 0x%s, %u, %u, %p\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->layout), params->set, params->descriptorWriteCount, params->pDescriptorWrites); @@ -6620,14 +7920,23 @@ static NTSTATUS wine_vkCmdPushDescriptorSetKHR(void *args) free_VkWriteDescriptorSet_array(pDescriptorWrites_host, params->descriptorWriteCount); return STATUS_SUCCESS; -#else - TRACE("%p, %#x, 0x%s, %u, %u, %p\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->layout), params->set, params->descriptorWriteCount, params->pDescriptorWrites); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPushDescriptorSetKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineBindPoint, params->layout, params->set, params->descriptorWriteCount, params->pDescriptorWrites); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdPushDescriptorSetWithTemplateKHR(void *args) +{ + struct vkCmdPushDescriptorSetWithTemplateKHR_params *params = args; + TRACE("%p, 0x%s, 0x%s, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->descriptorUpdateTemplate), wine_dbgstr_longlong(params->layout), params->set, params->pData); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPushDescriptorSetWithTemplateKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->descriptorUpdateTemplate, params->layout, params->set, params->pData); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdPushDescriptorSetWithTemplateKHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdPushDescriptorSetWithTemplateKHR(void *args) { struct vkCmdPushDescriptorSetWithTemplateKHR_params *params = args; TRACE("%p, 0x%s, 0x%s, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->descriptorUpdateTemplate), wine_dbgstr_longlong(params->layout), params->set, params->pData); @@ -6635,7 +7944,21 @@ static NTSTATUS wine_vkCmdPushDescriptorSetWithTemplateKHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdResetEvent(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdResetEvent(void *args) +{ + struct vkCmdResetEvent_params *params = args; + TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->stageMask); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResetEvent(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->stageMask); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdResetEvent(void *args) { struct vkCmdResetEvent_params *params = args; TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->stageMask); @@ -6643,7 +7966,21 @@ static NTSTATUS wine_vkCmdResetEvent(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdResetEvent2(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdResetEvent2(void *args) +{ + struct vkCmdResetEvent2_params *params = args; + TRACE("%p, 0x%s, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->event), wine_dbgstr_longlong(params->stageMask)); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResetEvent2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->stageMask); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdResetEvent2(void *args) { struct vkCmdResetEvent2_params *params = args; TRACE("%p, 0x%s, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->event), wine_dbgstr_longlong(params->stageMask)); @@ -6651,7 +7988,21 @@ static NTSTATUS wine_vkCmdResetEvent2(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdResetEvent2KHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdResetEvent2KHR(void *args) +{ + struct vkCmdResetEvent2KHR_params *params = args; + TRACE("%p, 0x%s, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->event), wine_dbgstr_longlong(params->stageMask)); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResetEvent2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->stageMask); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdResetEvent2KHR(void *args) { struct vkCmdResetEvent2KHR_params *params = args; TRACE("%p, 0x%s, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->event), wine_dbgstr_longlong(params->stageMask)); @@ -6659,7 +8010,21 @@ static NTSTATUS wine_vkCmdResetEvent2KHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdResetQueryPool(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdResetQueryPool(void *args) +{ + struct vkCmdResetQueryPool_params *params = args; + TRACE("%p, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResetQueryPool(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->firstQuery, params->queryCount); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdResetQueryPool(void *args) { struct vkCmdResetQueryPool_params *params = args; TRACE("%p, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount); @@ -6667,7 +8032,21 @@ static NTSTATUS wine_vkCmdResetQueryPool(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdResolveImage(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdResolveImage(void *args) +{ + struct vkCmdResolveImage_params *params = args; + TRACE("%p, 0x%s, %#x, 0x%s, %#x, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResolveImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcImage, params->srcImageLayout, params->dstImage, params->dstImageLayout, params->regionCount, params->pRegions); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdResolveImage(void *args) { struct vkCmdResolveImage_params *params = args; TRACE("%p, 0x%s, %#x, 0x%s, %#x, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions); @@ -6675,10 +8054,23 @@ static NTSTATUS wine_vkCmdResolveImage(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdResolveImage2(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdResolveImage2(void *args) +{ + struct vkCmdResolveImage2_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pResolveImageInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResolveImage2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pResolveImageInfo); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdResolveImage2(void *args) { struct vkCmdResolveImage2_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResolveImageInfo2_host pResolveImageInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pResolveImageInfo); @@ -6686,17 +8078,25 @@ static NTSTATUS wine_vkCmdResolveImage2(void *args) wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResolveImage2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pResolveImageInfo_host); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdResolveImage2KHR(void *args) +{ + struct vkCmdResolveImage2KHR_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pResolveImageInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResolveImage2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pResolveImageInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResolveImage2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pResolveImageInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdResolveImage2KHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdResolveImage2KHR(void *args) { struct vkCmdResolveImage2KHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResolveImageInfo2_host pResolveImageInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pResolveImageInfo); @@ -6704,14 +8104,23 @@ static NTSTATUS wine_vkCmdResolveImage2KHR(void *args) wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResolveImage2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pResolveImageInfo_host); return STATUS_SUCCESS; -#else - TRACE("%p, %p\n", params->commandBuffer, params->pResolveImageInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResolveImage2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pResolveImageInfo); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetBlendConstants(void *args) +{ + struct vkCmdSetBlendConstants_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->blendConstants); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetBlendConstants(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->blendConstants); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdSetBlendConstants(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetBlendConstants(void *args) { struct vkCmdSetBlendConstants_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->blendConstants); @@ -6719,7 +8128,21 @@ static NTSTATUS wine_vkCmdSetBlendConstants(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetCheckpointNV(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetCheckpointNV(void *args) +{ + struct vkCmdSetCheckpointNV_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pCheckpointMarker); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetCheckpointNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCheckpointMarker); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetCheckpointNV(void *args) { struct vkCmdSetCheckpointNV_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pCheckpointMarker); @@ -6727,7 +8150,21 @@ static NTSTATUS wine_vkCmdSetCheckpointNV(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetCoarseSampleOrderNV(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetCoarseSampleOrderNV(void *args) +{ + struct vkCmdSetCoarseSampleOrderNV_params *params = args; + TRACE("%p, %#x, %u, %p\n", params->commandBuffer, params->sampleOrderType, params->customSampleOrderCount, params->pCustomSampleOrders); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetCoarseSampleOrderNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->sampleOrderType, params->customSampleOrderCount, params->pCustomSampleOrders); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetCoarseSampleOrderNV(void *args) { struct vkCmdSetCoarseSampleOrderNV_params *params = args; TRACE("%p, %#x, %u, %p\n", params->commandBuffer, params->sampleOrderType, params->customSampleOrderCount, params->pCustomSampleOrders); @@ -6735,7 +8172,21 @@ static NTSTATUS wine_vkCmdSetCoarseSampleOrderNV(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetColorWriteEnableEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetColorWriteEnableEXT(void *args) +{ + struct vkCmdSetColorWriteEnableEXT_params *params = args; + TRACE("%p, %u, %p\n", params->commandBuffer, params->attachmentCount, params->pColorWriteEnables); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetColorWriteEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->attachmentCount, params->pColorWriteEnables); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetColorWriteEnableEXT(void *args) { struct vkCmdSetColorWriteEnableEXT_params *params = args; TRACE("%p, %u, %p\n", params->commandBuffer, params->attachmentCount, params->pColorWriteEnables); @@ -6743,7 +8194,21 @@ static NTSTATUS wine_vkCmdSetColorWriteEnableEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetCullMode(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetCullMode(void *args) +{ + struct vkCmdSetCullMode_params *params = args; + TRACE("%p, %#x\n", params->commandBuffer, params->cullMode); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetCullMode(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->cullMode); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetCullMode(void *args) { struct vkCmdSetCullMode_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->cullMode); @@ -6751,7 +8216,21 @@ static NTSTATUS wine_vkCmdSetCullMode(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetCullModeEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetCullModeEXT(void *args) +{ + struct vkCmdSetCullModeEXT_params *params = args; + TRACE("%p, %#x\n", params->commandBuffer, params->cullMode); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetCullModeEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->cullMode); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetCullModeEXT(void *args) { struct vkCmdSetCullModeEXT_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->cullMode); @@ -6759,7 +8238,21 @@ static NTSTATUS wine_vkCmdSetCullModeEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetDepthBias(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetDepthBias(void *args) +{ + struct vkCmdSetDepthBias_params *params = args; + TRACE("%p, %f, %f, %f\n", params->commandBuffer, params->depthBiasConstantFactor, params->depthBiasClamp, params->depthBiasSlopeFactor); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBias(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBiasConstantFactor, params->depthBiasClamp, params->depthBiasSlopeFactor); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetDepthBias(void *args) { struct vkCmdSetDepthBias_params *params = args; TRACE("%p, %f, %f, %f\n", params->commandBuffer, params->depthBiasConstantFactor, params->depthBiasClamp, params->depthBiasSlopeFactor); @@ -6767,7 +8260,21 @@ static NTSTATUS wine_vkCmdSetDepthBias(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetDepthBiasEnable(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetDepthBiasEnable(void *args) +{ + struct vkCmdSetDepthBiasEnable_params *params = args; + TRACE("%p, %u\n", params->commandBuffer, params->depthBiasEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBiasEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBiasEnable); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetDepthBiasEnable(void *args) { struct vkCmdSetDepthBiasEnable_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthBiasEnable); @@ -6775,7 +8282,21 @@ static NTSTATUS wine_vkCmdSetDepthBiasEnable(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetDepthBiasEnableEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetDepthBiasEnableEXT(void *args) +{ + struct vkCmdSetDepthBiasEnableEXT_params *params = args; + TRACE("%p, %u\n", params->commandBuffer, params->depthBiasEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBiasEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBiasEnable); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetDepthBiasEnableEXT(void *args) { struct vkCmdSetDepthBiasEnableEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthBiasEnable); @@ -6783,7 +8304,21 @@ static NTSTATUS wine_vkCmdSetDepthBiasEnableEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetDepthBounds(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetDepthBounds(void *args) +{ + struct vkCmdSetDepthBounds_params *params = args; + TRACE("%p, %f, %f\n", params->commandBuffer, params->minDepthBounds, params->maxDepthBounds); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBounds(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->minDepthBounds, params->maxDepthBounds); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetDepthBounds(void *args) { struct vkCmdSetDepthBounds_params *params = args; TRACE("%p, %f, %f\n", params->commandBuffer, params->minDepthBounds, params->maxDepthBounds); @@ -6791,15 +8326,43 @@ static NTSTATUS wine_vkCmdSetDepthBounds(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetDepthBoundsTestEnable(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetDepthBoundsTestEnable(void *args) +{ + struct vkCmdSetDepthBoundsTestEnable_params *params = args; + TRACE("%p, %u\n", params->commandBuffer, params->depthBoundsTestEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBoundsTestEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBoundsTestEnable); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetDepthBoundsTestEnable(void *args) +{ + struct vkCmdSetDepthBoundsTestEnable_params *params = args; + TRACE("%p, %u\n", params->commandBuffer, params->depthBoundsTestEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBoundsTestEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBoundsTestEnable); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetDepthBoundsTestEnableEXT(void *args) { - struct vkCmdSetDepthBoundsTestEnable_params *params = args; + struct vkCmdSetDepthBoundsTestEnableEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthBoundsTestEnable); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBoundsTestEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBoundsTestEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBoundsTestEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBoundsTestEnable); return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetDepthBoundsTestEnableEXT(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetDepthBoundsTestEnableEXT(void *args) { struct vkCmdSetDepthBoundsTestEnableEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthBoundsTestEnable); @@ -6807,7 +8370,21 @@ static NTSTATUS wine_vkCmdSetDepthBoundsTestEnableEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetDepthCompareOp(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetDepthCompareOp(void *args) +{ + struct vkCmdSetDepthCompareOp_params *params = args; + TRACE("%p, %#x\n", params->commandBuffer, params->depthCompareOp); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthCompareOp(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthCompareOp); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetDepthCompareOp(void *args) { struct vkCmdSetDepthCompareOp_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->depthCompareOp); @@ -6815,7 +8392,21 @@ static NTSTATUS wine_vkCmdSetDepthCompareOp(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetDepthCompareOpEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetDepthCompareOpEXT(void *args) +{ + struct vkCmdSetDepthCompareOpEXT_params *params = args; + TRACE("%p, %#x\n", params->commandBuffer, params->depthCompareOp); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthCompareOpEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthCompareOp); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetDepthCompareOpEXT(void *args) { struct vkCmdSetDepthCompareOpEXT_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->depthCompareOp); @@ -6823,7 +8414,21 @@ static NTSTATUS wine_vkCmdSetDepthCompareOpEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetDepthTestEnable(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetDepthTestEnable(void *args) +{ + struct vkCmdSetDepthTestEnable_params *params = args; + TRACE("%p, %u\n", params->commandBuffer, params->depthTestEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthTestEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthTestEnable); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetDepthTestEnable(void *args) { struct vkCmdSetDepthTestEnable_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthTestEnable); @@ -6831,7 +8436,21 @@ static NTSTATUS wine_vkCmdSetDepthTestEnable(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetDepthTestEnableEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetDepthTestEnableEXT(void *args) +{ + struct vkCmdSetDepthTestEnableEXT_params *params = args; + TRACE("%p, %u\n", params->commandBuffer, params->depthTestEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthTestEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthTestEnable); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetDepthTestEnableEXT(void *args) { struct vkCmdSetDepthTestEnableEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthTestEnable); @@ -6839,7 +8458,21 @@ static NTSTATUS wine_vkCmdSetDepthTestEnableEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetDepthWriteEnable(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetDepthWriteEnable(void *args) +{ + struct vkCmdSetDepthWriteEnable_params *params = args; + TRACE("%p, %u\n", params->commandBuffer, params->depthWriteEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthWriteEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthWriteEnable); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetDepthWriteEnable(void *args) { struct vkCmdSetDepthWriteEnable_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthWriteEnable); @@ -6847,7 +8480,21 @@ static NTSTATUS wine_vkCmdSetDepthWriteEnable(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetDepthWriteEnableEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetDepthWriteEnableEXT(void *args) +{ + struct vkCmdSetDepthWriteEnableEXT_params *params = args; + TRACE("%p, %u\n", params->commandBuffer, params->depthWriteEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthWriteEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthWriteEnable); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetDepthWriteEnableEXT(void *args) { struct vkCmdSetDepthWriteEnableEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthWriteEnable); @@ -6855,7 +8502,21 @@ static NTSTATUS wine_vkCmdSetDepthWriteEnableEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetDeviceMask(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetDeviceMask(void *args) +{ + struct vkCmdSetDeviceMask_params *params = args; + TRACE("%p, %u\n", params->commandBuffer, params->deviceMask); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDeviceMask(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->deviceMask); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetDeviceMask(void *args) { struct vkCmdSetDeviceMask_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->deviceMask); @@ -6863,7 +8524,21 @@ static NTSTATUS wine_vkCmdSetDeviceMask(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetDeviceMaskKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetDeviceMaskKHR(void *args) +{ + struct vkCmdSetDeviceMaskKHR_params *params = args; + TRACE("%p, %u\n", params->commandBuffer, params->deviceMask); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDeviceMaskKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->deviceMask); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetDeviceMaskKHR(void *args) { struct vkCmdSetDeviceMaskKHR_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->deviceMask); @@ -6871,7 +8546,21 @@ static NTSTATUS wine_vkCmdSetDeviceMaskKHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetDiscardRectangleEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetDiscardRectangleEXT(void *args) +{ + struct vkCmdSetDiscardRectangleEXT_params *params = args; + TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstDiscardRectangle, params->discardRectangleCount, params->pDiscardRectangles); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDiscardRectangleEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstDiscardRectangle, params->discardRectangleCount, params->pDiscardRectangles); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetDiscardRectangleEXT(void *args) { struct vkCmdSetDiscardRectangleEXT_params *params = args; TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstDiscardRectangle, params->discardRectangleCount, params->pDiscardRectangles); @@ -6879,7 +8568,21 @@ static NTSTATUS wine_vkCmdSetDiscardRectangleEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetEvent(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetEvent(void *args) +{ + struct vkCmdSetEvent_params *params = args; + TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->stageMask); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetEvent(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->stageMask); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetEvent(void *args) { struct vkCmdSetEvent_params *params = args; TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->stageMask); @@ -6887,10 +8590,23 @@ static NTSTATUS wine_vkCmdSetEvent(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetEvent2(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetEvent2(void *args) +{ + struct vkCmdSetEvent2_params *params = args; + TRACE("%p, 0x%s, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->pDependencyInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetEvent2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->pDependencyInfo); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetEvent2(void *args) { struct vkCmdSetEvent2_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkDependencyInfo_host pDependencyInfo_host; TRACE("%p, 0x%s, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->pDependencyInfo); @@ -6899,17 +8615,25 @@ static NTSTATUS wine_vkCmdSetEvent2(void *args) free_VkDependencyInfo(&pDependencyInfo_host); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetEvent2KHR(void *args) +{ + struct vkCmdSetEvent2KHR_params *params = args; TRACE("%p, 0x%s, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->pDependencyInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetEvent2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->pDependencyInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetEvent2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->pDependencyInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdSetEvent2KHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetEvent2KHR(void *args) { struct vkCmdSetEvent2KHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkDependencyInfo_host pDependencyInfo_host; TRACE("%p, 0x%s, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->pDependencyInfo); @@ -6918,14 +8642,23 @@ static NTSTATUS wine_vkCmdSetEvent2KHR(void *args) free_VkDependencyInfo(&pDependencyInfo_host); return STATUS_SUCCESS; -#else - TRACE("%p, 0x%s, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->pDependencyInfo); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetEvent2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->pDependencyInfo); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetExclusiveScissorNV(void *args) +{ + struct vkCmdSetExclusiveScissorNV_params *params = args; + TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstExclusiveScissor, params->exclusiveScissorCount, params->pExclusiveScissors); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetExclusiveScissorNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstExclusiveScissor, params->exclusiveScissorCount, params->pExclusiveScissors); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdSetExclusiveScissorNV(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetExclusiveScissorNV(void *args) { struct vkCmdSetExclusiveScissorNV_params *params = args; TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstExclusiveScissor, params->exclusiveScissorCount, params->pExclusiveScissors); @@ -6933,7 +8666,21 @@ static NTSTATUS wine_vkCmdSetExclusiveScissorNV(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetFragmentShadingRateEnumNV(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetFragmentShadingRateEnumNV(void *args) +{ + struct vkCmdSetFragmentShadingRateEnumNV_params *params = args; + TRACE("%p, %#x, %p\n", params->commandBuffer, params->shadingRate, params->combinerOps); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetFragmentShadingRateEnumNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->shadingRate, params->combinerOps); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetFragmentShadingRateEnumNV(void *args) { struct vkCmdSetFragmentShadingRateEnumNV_params *params = args; TRACE("%p, %#x, %p\n", params->commandBuffer, params->shadingRate, params->combinerOps); @@ -6941,7 +8688,21 @@ static NTSTATUS wine_vkCmdSetFragmentShadingRateEnumNV(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetFragmentShadingRateKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetFragmentShadingRateKHR(void *args) +{ + struct vkCmdSetFragmentShadingRateKHR_params *params = args; + TRACE("%p, %p, %p\n", params->commandBuffer, params->pFragmentSize, params->combinerOps); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetFragmentShadingRateKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pFragmentSize, params->combinerOps); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetFragmentShadingRateKHR(void *args) { struct vkCmdSetFragmentShadingRateKHR_params *params = args; TRACE("%p, %p, %p\n", params->commandBuffer, params->pFragmentSize, params->combinerOps); @@ -6949,7 +8710,21 @@ static NTSTATUS wine_vkCmdSetFragmentShadingRateKHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetFrontFace(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetFrontFace(void *args) +{ + struct vkCmdSetFrontFace_params *params = args; + TRACE("%p, %#x\n", params->commandBuffer, params->frontFace); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetFrontFace(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->frontFace); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetFrontFace(void *args) { struct vkCmdSetFrontFace_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->frontFace); @@ -6957,7 +8732,21 @@ static NTSTATUS wine_vkCmdSetFrontFace(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetFrontFaceEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetFrontFaceEXT(void *args) +{ + struct vkCmdSetFrontFaceEXT_params *params = args; + TRACE("%p, %#x\n", params->commandBuffer, params->frontFace); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetFrontFaceEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->frontFace); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetFrontFaceEXT(void *args) { struct vkCmdSetFrontFaceEXT_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->frontFace); @@ -6965,7 +8754,21 @@ static NTSTATUS wine_vkCmdSetFrontFaceEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetLineStippleEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetLineStippleEXT(void *args) +{ + struct vkCmdSetLineStippleEXT_params *params = args; + TRACE("%p, %u, %u\n", params->commandBuffer, params->lineStippleFactor, params->lineStipplePattern); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetLineStippleEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->lineStippleFactor, params->lineStipplePattern); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetLineStippleEXT(void *args) { struct vkCmdSetLineStippleEXT_params *params = args; TRACE("%p, %u, %u\n", params->commandBuffer, params->lineStippleFactor, params->lineStipplePattern); @@ -6973,7 +8776,21 @@ static NTSTATUS wine_vkCmdSetLineStippleEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetLineWidth(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetLineWidth(void *args) +{ + struct vkCmdSetLineWidth_params *params = args; + TRACE("%p, %f\n", params->commandBuffer, params->lineWidth); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetLineWidth(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->lineWidth); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetLineWidth(void *args) { struct vkCmdSetLineWidth_params *params = args; TRACE("%p, %f\n", params->commandBuffer, params->lineWidth); @@ -6981,7 +8798,21 @@ static NTSTATUS wine_vkCmdSetLineWidth(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetLogicOpEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetLogicOpEXT(void *args) +{ + struct vkCmdSetLogicOpEXT_params *params = args; + TRACE("%p, %#x\n", params->commandBuffer, params->logicOp); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetLogicOpEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->logicOp); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetLogicOpEXT(void *args) { struct vkCmdSetLogicOpEXT_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->logicOp); @@ -6989,7 +8820,21 @@ static NTSTATUS wine_vkCmdSetLogicOpEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetPatchControlPointsEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetPatchControlPointsEXT(void *args) +{ + struct vkCmdSetPatchControlPointsEXT_params *params = args; + TRACE("%p, %u\n", params->commandBuffer, params->patchControlPoints); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPatchControlPointsEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->patchControlPoints); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetPatchControlPointsEXT(void *args) { struct vkCmdSetPatchControlPointsEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->patchControlPoints); @@ -6997,10 +8842,22 @@ static NTSTATUS wine_vkCmdSetPatchControlPointsEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetPerformanceMarkerINTEL(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetPerformanceMarkerINTEL(void *args) +{ + struct vkCmdSetPerformanceMarkerINTEL_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo); + return wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPerformanceMarkerINTEL(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pMarkerInfo); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetPerformanceMarkerINTEL(void *args) { struct vkCmdSetPerformanceMarkerINTEL_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkPerformanceMarkerInfoINTEL_host pMarkerInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo); @@ -7009,16 +8866,24 @@ static NTSTATUS wine_vkCmdSetPerformanceMarkerINTEL(void *args) result = wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPerformanceMarkerINTEL(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pMarkerInfo_host); return result; -#else - TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo); - return wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPerformanceMarkerINTEL(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pMarkerInfo); -#endif } -static NTSTATUS wine_vkCmdSetPerformanceOverrideINTEL(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetPerformanceOverrideINTEL(void *args) +{ + struct vkCmdSetPerformanceOverrideINTEL_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pOverrideInfo); + return wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPerformanceOverrideINTEL(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pOverrideInfo); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetPerformanceOverrideINTEL(void *args) { struct vkCmdSetPerformanceOverrideINTEL_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkPerformanceOverrideInfoINTEL_host pOverrideInfo_host; TRACE("%p, %p\n", params->commandBuffer, params->pOverrideInfo); @@ -7027,20 +8892,43 @@ static NTSTATUS wine_vkCmdSetPerformanceOverrideINTEL(void *args) result = wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPerformanceOverrideINTEL(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pOverrideInfo_host); return result; -#else - TRACE("%p, %p\n", params->commandBuffer, params->pOverrideInfo); - return wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPerformanceOverrideINTEL(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pOverrideInfo); -#endif } -static NTSTATUS wine_vkCmdSetPerformanceStreamMarkerINTEL(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetPerformanceStreamMarkerINTEL(void *args) +{ + struct vkCmdSetPerformanceStreamMarkerINTEL_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo); + return wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPerformanceStreamMarkerINTEL(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pMarkerInfo); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetPerformanceStreamMarkerINTEL(void *args) { struct vkCmdSetPerformanceStreamMarkerINTEL_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo); return wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPerformanceStreamMarkerINTEL(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pMarkerInfo); } -static NTSTATUS wine_vkCmdSetPrimitiveRestartEnable(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetPrimitiveRestartEnable(void *args) +{ + struct vkCmdSetPrimitiveRestartEnable_params *params = args; + TRACE("%p, %u\n", params->commandBuffer, params->primitiveRestartEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPrimitiveRestartEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->primitiveRestartEnable); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetPrimitiveRestartEnable(void *args) { struct vkCmdSetPrimitiveRestartEnable_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->primitiveRestartEnable); @@ -7048,7 +8936,21 @@ static NTSTATUS wine_vkCmdSetPrimitiveRestartEnable(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetPrimitiveRestartEnableEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetPrimitiveRestartEnableEXT(void *args) +{ + struct vkCmdSetPrimitiveRestartEnableEXT_params *params = args; + TRACE("%p, %u\n", params->commandBuffer, params->primitiveRestartEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPrimitiveRestartEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->primitiveRestartEnable); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetPrimitiveRestartEnableEXT(void *args) { struct vkCmdSetPrimitiveRestartEnableEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->primitiveRestartEnable); @@ -7056,7 +8958,21 @@ static NTSTATUS wine_vkCmdSetPrimitiveRestartEnableEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetPrimitiveTopology(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetPrimitiveTopology(void *args) +{ + struct vkCmdSetPrimitiveTopology_params *params = args; + TRACE("%p, %#x\n", params->commandBuffer, params->primitiveTopology); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPrimitiveTopology(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->primitiveTopology); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetPrimitiveTopology(void *args) { struct vkCmdSetPrimitiveTopology_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->primitiveTopology); @@ -7064,7 +8980,21 @@ static NTSTATUS wine_vkCmdSetPrimitiveTopology(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetPrimitiveTopologyEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetPrimitiveTopologyEXT(void *args) +{ + struct vkCmdSetPrimitiveTopologyEXT_params *params = args; + TRACE("%p, %#x\n", params->commandBuffer, params->primitiveTopology); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPrimitiveTopologyEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->primitiveTopology); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetPrimitiveTopologyEXT(void *args) { struct vkCmdSetPrimitiveTopologyEXT_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->primitiveTopology); @@ -7072,7 +9002,21 @@ static NTSTATUS wine_vkCmdSetPrimitiveTopologyEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetRasterizerDiscardEnable(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetRasterizerDiscardEnable(void *args) +{ + struct vkCmdSetRasterizerDiscardEnable_params *params = args; + TRACE("%p, %u\n", params->commandBuffer, params->rasterizerDiscardEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetRasterizerDiscardEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->rasterizerDiscardEnable); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetRasterizerDiscardEnable(void *args) { struct vkCmdSetRasterizerDiscardEnable_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->rasterizerDiscardEnable); @@ -7080,7 +9024,21 @@ static NTSTATUS wine_vkCmdSetRasterizerDiscardEnable(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetRasterizerDiscardEnableEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetRasterizerDiscardEnableEXT(void *args) +{ + struct vkCmdSetRasterizerDiscardEnableEXT_params *params = args; + TRACE("%p, %u\n", params->commandBuffer, params->rasterizerDiscardEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetRasterizerDiscardEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->rasterizerDiscardEnable); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetRasterizerDiscardEnableEXT(void *args) { struct vkCmdSetRasterizerDiscardEnableEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->rasterizerDiscardEnable); @@ -7088,7 +9046,21 @@ static NTSTATUS wine_vkCmdSetRasterizerDiscardEnableEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetRayTracingPipelineStackSizeKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetRayTracingPipelineStackSizeKHR(void *args) +{ + struct vkCmdSetRayTracingPipelineStackSizeKHR_params *params = args; + TRACE("%p, %u\n", params->commandBuffer, params->pipelineStackSize); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetRayTracingPipelineStackSizeKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineStackSize); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetRayTracingPipelineStackSizeKHR(void *args) { struct vkCmdSetRayTracingPipelineStackSizeKHR_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->pipelineStackSize); @@ -7096,7 +9068,21 @@ static NTSTATUS wine_vkCmdSetRayTracingPipelineStackSizeKHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetSampleLocationsEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetSampleLocationsEXT(void *args) +{ + struct vkCmdSetSampleLocationsEXT_params *params = args; + TRACE("%p, %p\n", params->commandBuffer, params->pSampleLocationsInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetSampleLocationsEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSampleLocationsInfo); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetSampleLocationsEXT(void *args) { struct vkCmdSetSampleLocationsEXT_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pSampleLocationsInfo); @@ -7104,7 +9090,21 @@ static NTSTATUS wine_vkCmdSetSampleLocationsEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetScissor(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetScissor(void *args) +{ + struct vkCmdSetScissor_params *params = args; + TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstScissor, params->scissorCount, params->pScissors); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetScissor(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstScissor, params->scissorCount, params->pScissors); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetScissor(void *args) { struct vkCmdSetScissor_params *params = args; TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstScissor, params->scissorCount, params->pScissors); @@ -7112,7 +9112,21 @@ static NTSTATUS wine_vkCmdSetScissor(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetScissorWithCount(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetScissorWithCount(void *args) +{ + struct vkCmdSetScissorWithCount_params *params = args; + TRACE("%p, %u, %p\n", params->commandBuffer, params->scissorCount, params->pScissors); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetScissorWithCount(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->scissorCount, params->pScissors); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetScissorWithCount(void *args) { struct vkCmdSetScissorWithCount_params *params = args; TRACE("%p, %u, %p\n", params->commandBuffer, params->scissorCount, params->pScissors); @@ -7120,7 +9134,21 @@ static NTSTATUS wine_vkCmdSetScissorWithCount(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetScissorWithCountEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetScissorWithCountEXT(void *args) +{ + struct vkCmdSetScissorWithCountEXT_params *params = args; + TRACE("%p, %u, %p\n", params->commandBuffer, params->scissorCount, params->pScissors); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetScissorWithCountEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->scissorCount, params->pScissors); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetScissorWithCountEXT(void *args) { struct vkCmdSetScissorWithCountEXT_params *params = args; TRACE("%p, %u, %p\n", params->commandBuffer, params->scissorCount, params->pScissors); @@ -7128,7 +9156,21 @@ static NTSTATUS wine_vkCmdSetScissorWithCountEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetStencilCompareMask(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetStencilCompareMask(void *args) +{ + struct vkCmdSetStencilCompareMask_params *params = args; + TRACE("%p, %#x, %u\n", params->commandBuffer, params->faceMask, params->compareMask); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilCompareMask(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->compareMask); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetStencilCompareMask(void *args) { struct vkCmdSetStencilCompareMask_params *params = args; TRACE("%p, %#x, %u\n", params->commandBuffer, params->faceMask, params->compareMask); @@ -7136,7 +9178,21 @@ static NTSTATUS wine_vkCmdSetStencilCompareMask(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetStencilOp(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetStencilOp(void *args) +{ + struct vkCmdSetStencilOp_params *params = args; + TRACE("%p, %#x, %#x, %#x, %#x, %#x\n", params->commandBuffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilOp(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetStencilOp(void *args) { struct vkCmdSetStencilOp_params *params = args; TRACE("%p, %#x, %#x, %#x, %#x, %#x\n", params->commandBuffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp); @@ -7144,7 +9200,21 @@ static NTSTATUS wine_vkCmdSetStencilOp(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetStencilOpEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetStencilOpEXT(void *args) +{ + struct vkCmdSetStencilOpEXT_params *params = args; + TRACE("%p, %#x, %#x, %#x, %#x, %#x\n", params->commandBuffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilOpEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetStencilOpEXT(void *args) { struct vkCmdSetStencilOpEXT_params *params = args; TRACE("%p, %#x, %#x, %#x, %#x, %#x\n", params->commandBuffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp); @@ -7152,7 +9222,21 @@ static NTSTATUS wine_vkCmdSetStencilOpEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetStencilReference(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetStencilReference(void *args) +{ + struct vkCmdSetStencilReference_params *params = args; + TRACE("%p, %#x, %u\n", params->commandBuffer, params->faceMask, params->reference); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilReference(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->reference); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetStencilReference(void *args) { struct vkCmdSetStencilReference_params *params = args; TRACE("%p, %#x, %u\n", params->commandBuffer, params->faceMask, params->reference); @@ -7160,7 +9244,21 @@ static NTSTATUS wine_vkCmdSetStencilReference(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetStencilTestEnable(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetStencilTestEnable(void *args) +{ + struct vkCmdSetStencilTestEnable_params *params = args; + TRACE("%p, %u\n", params->commandBuffer, params->stencilTestEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilTestEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stencilTestEnable); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetStencilTestEnable(void *args) { struct vkCmdSetStencilTestEnable_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->stencilTestEnable); @@ -7168,7 +9266,21 @@ static NTSTATUS wine_vkCmdSetStencilTestEnable(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetStencilTestEnableEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetStencilTestEnableEXT(void *args) +{ + struct vkCmdSetStencilTestEnableEXT_params *params = args; + TRACE("%p, %u\n", params->commandBuffer, params->stencilTestEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilTestEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stencilTestEnable); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetStencilTestEnableEXT(void *args) { struct vkCmdSetStencilTestEnableEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->stencilTestEnable); @@ -7176,7 +9288,21 @@ static NTSTATUS wine_vkCmdSetStencilTestEnableEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetStencilWriteMask(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetStencilWriteMask(void *args) +{ + struct vkCmdSetStencilWriteMask_params *params = args; + TRACE("%p, %#x, %u\n", params->commandBuffer, params->faceMask, params->writeMask); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilWriteMask(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->writeMask); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetStencilWriteMask(void *args) { struct vkCmdSetStencilWriteMask_params *params = args; TRACE("%p, %#x, %u\n", params->commandBuffer, params->faceMask, params->writeMask); @@ -7184,7 +9310,21 @@ static NTSTATUS wine_vkCmdSetStencilWriteMask(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetVertexInputEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetVertexInputEXT(void *args) +{ + struct vkCmdSetVertexInputEXT_params *params = args; + TRACE("%p, %u, %p, %u, %p\n", params->commandBuffer, params->vertexBindingDescriptionCount, params->pVertexBindingDescriptions, params->vertexAttributeDescriptionCount, params->pVertexAttributeDescriptions); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetVertexInputEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->vertexBindingDescriptionCount, params->pVertexBindingDescriptions, params->vertexAttributeDescriptionCount, params->pVertexAttributeDescriptions); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetVertexInputEXT(void *args) { struct vkCmdSetVertexInputEXT_params *params = args; TRACE("%p, %u, %p, %u, %p\n", params->commandBuffer, params->vertexBindingDescriptionCount, params->pVertexBindingDescriptions, params->vertexAttributeDescriptionCount, params->pVertexAttributeDescriptions); @@ -7192,7 +9332,21 @@ static NTSTATUS wine_vkCmdSetVertexInputEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetViewport(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetViewport(void *args) +{ + struct vkCmdSetViewport_params *params = args; + TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstViewport, params->viewportCount, params->pViewports); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewport(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstViewport, params->viewportCount, params->pViewports); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetViewport(void *args) { struct vkCmdSetViewport_params *params = args; TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstViewport, params->viewportCount, params->pViewports); @@ -7200,7 +9354,21 @@ static NTSTATUS wine_vkCmdSetViewport(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetViewportShadingRatePaletteNV(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetViewportShadingRatePaletteNV(void *args) +{ + struct vkCmdSetViewportShadingRatePaletteNV_params *params = args; + TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstViewport, params->viewportCount, params->pShadingRatePalettes); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewportShadingRatePaletteNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstViewport, params->viewportCount, params->pShadingRatePalettes); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetViewportShadingRatePaletteNV(void *args) { struct vkCmdSetViewportShadingRatePaletteNV_params *params = args; TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstViewport, params->viewportCount, params->pShadingRatePalettes); @@ -7208,7 +9376,21 @@ static NTSTATUS wine_vkCmdSetViewportShadingRatePaletteNV(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetViewportWScalingNV(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetViewportWScalingNV(void *args) +{ + struct vkCmdSetViewportWScalingNV_params *params = args; + TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstViewport, params->viewportCount, params->pViewportWScalings); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewportWScalingNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstViewport, params->viewportCount, params->pViewportWScalings); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetViewportWScalingNV(void *args) { struct vkCmdSetViewportWScalingNV_params *params = args; TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstViewport, params->viewportCount, params->pViewportWScalings); @@ -7216,7 +9398,21 @@ static NTSTATUS wine_vkCmdSetViewportWScalingNV(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetViewportWithCount(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetViewportWithCount(void *args) +{ + struct vkCmdSetViewportWithCount_params *params = args; + TRACE("%p, %u, %p\n", params->commandBuffer, params->viewportCount, params->pViewports); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewportWithCount(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->viewportCount, params->pViewports); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetViewportWithCount(void *args) { struct vkCmdSetViewportWithCount_params *params = args; TRACE("%p, %u, %p\n", params->commandBuffer, params->viewportCount, params->pViewports); @@ -7224,7 +9420,21 @@ static NTSTATUS wine_vkCmdSetViewportWithCount(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSetViewportWithCountEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSetViewportWithCountEXT(void *args) +{ + struct vkCmdSetViewportWithCountEXT_params *params = args; + TRACE("%p, %u, %p\n", params->commandBuffer, params->viewportCount, params->pViewports); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewportWithCountEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->viewportCount, params->pViewports); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSetViewportWithCountEXT(void *args) { struct vkCmdSetViewportWithCountEXT_params *params = args; TRACE("%p, %u, %p\n", params->commandBuffer, params->viewportCount, params->pViewports); @@ -7232,7 +9442,21 @@ static NTSTATUS wine_vkCmdSetViewportWithCountEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdSubpassShadingHUAWEI(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdSubpassShadingHUAWEI(void *args) +{ + struct vkCmdSubpassShadingHUAWEI_params *params = args; + TRACE("%p\n", params->commandBuffer); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSubpassShadingHUAWEI(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdSubpassShadingHUAWEI(void *args) { struct vkCmdSubpassShadingHUAWEI_params *params = args; TRACE("%p\n", params->commandBuffer); @@ -7240,7 +9464,21 @@ static NTSTATUS wine_vkCmdSubpassShadingHUAWEI(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdTraceRaysIndirect2KHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdTraceRaysIndirect2KHR(void *args) +{ + struct vkCmdTraceRaysIndirect2KHR_params *params = args; + TRACE("%p, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->indirectDeviceAddress)); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdTraceRaysIndirect2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->indirectDeviceAddress); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdTraceRaysIndirect2KHR(void *args) { struct vkCmdTraceRaysIndirect2KHR_params *params = args; TRACE("%p, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->indirectDeviceAddress)); @@ -7248,10 +9486,23 @@ static NTSTATUS wine_vkCmdTraceRaysIndirect2KHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdTraceRaysIndirectKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdTraceRaysIndirectKHR(void *args) +{ + struct vkCmdTraceRaysIndirectKHR_params *params = args; + TRACE("%p, %p, %p, %p, %p, 0x%s\n", params->commandBuffer, params->pRaygenShaderBindingTable, params->pMissShaderBindingTable, params->pHitShaderBindingTable, params->pCallableShaderBindingTable, wine_dbgstr_longlong(params->indirectDeviceAddress)); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdTraceRaysIndirectKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRaygenShaderBindingTable, params->pMissShaderBindingTable, params->pHitShaderBindingTable, params->pCallableShaderBindingTable, params->indirectDeviceAddress); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdTraceRaysIndirectKHR(void *args) { struct vkCmdTraceRaysIndirectKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkStridedDeviceAddressRegionKHR_host pRaygenShaderBindingTable_host; VkStridedDeviceAddressRegionKHR_host pMissShaderBindingTable_host; VkStridedDeviceAddressRegionKHR_host pHitShaderBindingTable_host; @@ -7265,17 +9516,25 @@ static NTSTATUS wine_vkCmdTraceRaysIndirectKHR(void *args) wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdTraceRaysIndirectKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pRaygenShaderBindingTable_host, &pMissShaderBindingTable_host, &pHitShaderBindingTable_host, &pCallableShaderBindingTable_host, params->indirectDeviceAddress); return STATUS_SUCCESS; -#else - TRACE("%p, %p, %p, %p, %p, 0x%s\n", params->commandBuffer, params->pRaygenShaderBindingTable, params->pMissShaderBindingTable, params->pHitShaderBindingTable, params->pCallableShaderBindingTable, wine_dbgstr_longlong(params->indirectDeviceAddress)); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdTraceRaysIndirectKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRaygenShaderBindingTable, params->pMissShaderBindingTable, params->pHitShaderBindingTable, params->pCallableShaderBindingTable, params->indirectDeviceAddress); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdTraceRaysKHR(void *args) +{ + struct vkCmdTraceRaysKHR_params *params = args; + TRACE("%p, %p, %p, %p, %p, %u, %u, %u\n", params->commandBuffer, params->pRaygenShaderBindingTable, params->pMissShaderBindingTable, params->pHitShaderBindingTable, params->pCallableShaderBindingTable, params->width, params->height, params->depth); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdTraceRaysKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRaygenShaderBindingTable, params->pMissShaderBindingTable, params->pHitShaderBindingTable, params->pCallableShaderBindingTable, params->width, params->height, params->depth); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdTraceRaysKHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdTraceRaysKHR(void *args) { struct vkCmdTraceRaysKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkStridedDeviceAddressRegionKHR_host pRaygenShaderBindingTable_host; VkStridedDeviceAddressRegionKHR_host pMissShaderBindingTable_host; VkStridedDeviceAddressRegionKHR_host pHitShaderBindingTable_host; @@ -7289,14 +9548,23 @@ static NTSTATUS wine_vkCmdTraceRaysKHR(void *args) wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdTraceRaysKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pRaygenShaderBindingTable_host, &pMissShaderBindingTable_host, &pHitShaderBindingTable_host, &pCallableShaderBindingTable_host, params->width, params->height, params->depth); return STATUS_SUCCESS; -#else - TRACE("%p, %p, %p, %p, %p, %u, %u, %u\n", params->commandBuffer, params->pRaygenShaderBindingTable, params->pMissShaderBindingTable, params->pHitShaderBindingTable, params->pCallableShaderBindingTable, params->width, params->height, params->depth); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdTraceRaysKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRaygenShaderBindingTable, params->pMissShaderBindingTable, params->pHitShaderBindingTable, params->pCallableShaderBindingTable, params->width, params->height, params->depth); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdTraceRaysNV(void *args) +{ + struct vkCmdTraceRaysNV_params *params = args; + TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->raygenShaderBindingTableBuffer), wine_dbgstr_longlong(params->raygenShaderBindingOffset), wine_dbgstr_longlong(params->missShaderBindingTableBuffer), wine_dbgstr_longlong(params->missShaderBindingOffset), wine_dbgstr_longlong(params->missShaderBindingStride), wine_dbgstr_longlong(params->hitShaderBindingTableBuffer), wine_dbgstr_longlong(params->hitShaderBindingOffset), wine_dbgstr_longlong(params->hitShaderBindingStride), wine_dbgstr_longlong(params->callableShaderBindingTableBuffer), wine_dbgstr_longlong(params->callableShaderBindingOffset), wine_dbgstr_longlong(params->callableShaderBindingStride), params->width, params->height, params->depth); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdTraceRaysNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->raygenShaderBindingTableBuffer, params->raygenShaderBindingOffset, params->missShaderBindingTableBuffer, params->missShaderBindingOffset, params->missShaderBindingStride, params->hitShaderBindingTableBuffer, params->hitShaderBindingOffset, params->hitShaderBindingStride, params->callableShaderBindingTableBuffer, params->callableShaderBindingOffset, params->callableShaderBindingStride, params->width, params->height, params->depth); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdTraceRaysNV(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdTraceRaysNV(void *args) { struct vkCmdTraceRaysNV_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->raygenShaderBindingTableBuffer), wine_dbgstr_longlong(params->raygenShaderBindingOffset), wine_dbgstr_longlong(params->missShaderBindingTableBuffer), wine_dbgstr_longlong(params->missShaderBindingOffset), wine_dbgstr_longlong(params->missShaderBindingStride), wine_dbgstr_longlong(params->hitShaderBindingTableBuffer), wine_dbgstr_longlong(params->hitShaderBindingOffset), wine_dbgstr_longlong(params->hitShaderBindingStride), wine_dbgstr_longlong(params->callableShaderBindingTableBuffer), wine_dbgstr_longlong(params->callableShaderBindingOffset), wine_dbgstr_longlong(params->callableShaderBindingStride), params->width, params->height, params->depth); @@ -7304,7 +9572,21 @@ static NTSTATUS wine_vkCmdTraceRaysNV(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdUpdateBuffer(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdUpdateBuffer(void *args) +{ + struct vkCmdUpdateBuffer_params *params = args; + TRACE("%p, 0x%s, 0x%s, 0x%s, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), wine_dbgstr_longlong(params->dataSize), params->pData); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdUpdateBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->dstBuffer, params->dstOffset, params->dataSize, params->pData); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdUpdateBuffer(void *args) { struct vkCmdUpdateBuffer_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), wine_dbgstr_longlong(params->dataSize), params->pData); @@ -7312,10 +9594,23 @@ static NTSTATUS wine_vkCmdUpdateBuffer(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdWaitEvents(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdWaitEvents(void *args) +{ + struct vkCmdWaitEvents_params *params = args; + TRACE("%p, %u, %p, %#x, %#x, %u, %p, %u, %p, %u, %p\n", params->commandBuffer, params->eventCount, params->pEvents, params->srcStageMask, params->dstStageMask, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, params->pBufferMemoryBarriers, params->imageMemoryBarrierCount, params->pImageMemoryBarriers); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWaitEvents(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->eventCount, params->pEvents, params->srcStageMask, params->dstStageMask, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, params->pBufferMemoryBarriers, params->imageMemoryBarrierCount, params->pImageMemoryBarriers); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdWaitEvents(void *args) { struct vkCmdWaitEvents_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkBufferMemoryBarrier_host *pBufferMemoryBarriers_host; VkImageMemoryBarrier_host *pImageMemoryBarriers_host; TRACE("%p, %u, %p, %#x, %#x, %u, %p, %u, %p, %u, %p\n", params->commandBuffer, params->eventCount, params->pEvents, params->srcStageMask, params->dstStageMask, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, params->pBufferMemoryBarriers, params->imageMemoryBarrierCount, params->pImageMemoryBarriers); @@ -7327,17 +9622,25 @@ static NTSTATUS wine_vkCmdWaitEvents(void *args) free_VkBufferMemoryBarrier_array(pBufferMemoryBarriers_host, params->bufferMemoryBarrierCount); free_VkImageMemoryBarrier_array(pImageMemoryBarriers_host, params->imageMemoryBarrierCount); return STATUS_SUCCESS; -#else - TRACE("%p, %u, %p, %#x, %#x, %u, %p, %u, %p, %u, %p\n", params->commandBuffer, params->eventCount, params->pEvents, params->srcStageMask, params->dstStageMask, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, params->pBufferMemoryBarriers, params->imageMemoryBarrierCount, params->pImageMemoryBarriers); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWaitEvents(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->eventCount, params->pEvents, params->srcStageMask, params->dstStageMask, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, params->pBufferMemoryBarriers, params->imageMemoryBarrierCount, params->pImageMemoryBarriers); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdWaitEvents2(void *args) +{ + struct vkCmdWaitEvents2_params *params = args; + TRACE("%p, %u, %p, %p\n", params->commandBuffer, params->eventCount, params->pEvents, params->pDependencyInfos); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWaitEvents2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->eventCount, params->pEvents, params->pDependencyInfos); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdWaitEvents2(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdWaitEvents2(void *args) { struct vkCmdWaitEvents2_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkDependencyInfo_host *pDependencyInfos_host; TRACE("%p, %u, %p, %p\n", params->commandBuffer, params->eventCount, params->pEvents, params->pDependencyInfos); @@ -7346,17 +9649,25 @@ static NTSTATUS wine_vkCmdWaitEvents2(void *args) free_VkDependencyInfo_array(pDependencyInfos_host, params->eventCount); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdWaitEvents2KHR(void *args) +{ + struct vkCmdWaitEvents2KHR_params *params = args; TRACE("%p, %u, %p, %p\n", params->commandBuffer, params->eventCount, params->pEvents, params->pDependencyInfos); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWaitEvents2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->eventCount, params->pEvents, params->pDependencyInfos); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWaitEvents2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->eventCount, params->pEvents, params->pDependencyInfos); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdWaitEvents2KHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdWaitEvents2KHR(void *args) { struct vkCmdWaitEvents2KHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkDependencyInfo_host *pDependencyInfos_host; TRACE("%p, %u, %p, %p\n", params->commandBuffer, params->eventCount, params->pEvents, params->pDependencyInfos); @@ -7365,14 +9676,23 @@ static NTSTATUS wine_vkCmdWaitEvents2KHR(void *args) free_VkDependencyInfo_array(pDependencyInfos_host, params->eventCount); return STATUS_SUCCESS; -#else - TRACE("%p, %u, %p, %p\n", params->commandBuffer, params->eventCount, params->pEvents, params->pDependencyInfos); - wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWaitEvents2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->eventCount, params->pEvents, params->pDependencyInfos); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdWriteAccelerationStructuresPropertiesKHR(void *args) +{ + struct vkCmdWriteAccelerationStructuresPropertiesKHR_params *params = args; + TRACE("%p, %u, %p, %#x, 0x%s, %u\n", params->commandBuffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, wine_dbgstr_longlong(params->queryPool), params->firstQuery); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteAccelerationStructuresPropertiesKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, params->queryPool, params->firstQuery); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkCmdWriteAccelerationStructuresPropertiesKHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdWriteAccelerationStructuresPropertiesKHR(void *args) { struct vkCmdWriteAccelerationStructuresPropertiesKHR_params *params = args; TRACE("%p, %u, %p, %#x, 0x%s, %u\n", params->commandBuffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, wine_dbgstr_longlong(params->queryPool), params->firstQuery); @@ -7380,7 +9700,21 @@ static NTSTATUS wine_vkCmdWriteAccelerationStructuresPropertiesKHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdWriteAccelerationStructuresPropertiesNV(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdWriteAccelerationStructuresPropertiesNV(void *args) +{ + struct vkCmdWriteAccelerationStructuresPropertiesNV_params *params = args; + TRACE("%p, %u, %p, %#x, 0x%s, %u\n", params->commandBuffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, wine_dbgstr_longlong(params->queryPool), params->firstQuery); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteAccelerationStructuresPropertiesNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, params->queryPool, params->firstQuery); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdWriteAccelerationStructuresPropertiesNV(void *args) { struct vkCmdWriteAccelerationStructuresPropertiesNV_params *params = args; TRACE("%p, %u, %p, %#x, 0x%s, %u\n", params->commandBuffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, wine_dbgstr_longlong(params->queryPool), params->firstQuery); @@ -7388,7 +9722,21 @@ static NTSTATUS wine_vkCmdWriteAccelerationStructuresPropertiesNV(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdWriteBufferMarker2AMD(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdWriteBufferMarker2AMD(void *args) +{ + struct vkCmdWriteBufferMarker2AMD_params *params = args; + TRACE("%p, 0x%s, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->stage), wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), params->marker); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteBufferMarker2AMD(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stage, params->dstBuffer, params->dstOffset, params->marker); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdWriteBufferMarker2AMD(void *args) { struct vkCmdWriteBufferMarker2AMD_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->stage), wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), params->marker); @@ -7396,7 +9744,21 @@ static NTSTATUS wine_vkCmdWriteBufferMarker2AMD(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdWriteBufferMarkerAMD(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdWriteBufferMarkerAMD(void *args) +{ + struct vkCmdWriteBufferMarkerAMD_params *params = args; + TRACE("%p, %#x, 0x%s, 0x%s, %u\n", params->commandBuffer, params->pipelineStage, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), params->marker); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteBufferMarkerAMD(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineStage, params->dstBuffer, params->dstOffset, params->marker); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdWriteBufferMarkerAMD(void *args) { struct vkCmdWriteBufferMarkerAMD_params *params = args; TRACE("%p, %#x, 0x%s, 0x%s, %u\n", params->commandBuffer, params->pipelineStage, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), params->marker); @@ -7404,7 +9766,21 @@ static NTSTATUS wine_vkCmdWriteBufferMarkerAMD(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdWriteTimestamp(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdWriteTimestamp(void *args) +{ + struct vkCmdWriteTimestamp_params *params = args; + TRACE("%p, %#x, 0x%s, %u\n", params->commandBuffer, params->pipelineStage, wine_dbgstr_longlong(params->queryPool), params->query); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteTimestamp(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineStage, params->queryPool, params->query); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdWriteTimestamp(void *args) { struct vkCmdWriteTimestamp_params *params = args; TRACE("%p, %#x, 0x%s, %u\n", params->commandBuffer, params->pipelineStage, wine_dbgstr_longlong(params->queryPool), params->query); @@ -7412,7 +9788,21 @@ static NTSTATUS wine_vkCmdWriteTimestamp(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdWriteTimestamp2(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdWriteTimestamp2(void *args) +{ + struct vkCmdWriteTimestamp2_params *params = args; + TRACE("%p, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->stage), wine_dbgstr_longlong(params->queryPool), params->query); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteTimestamp2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stage, params->queryPool, params->query); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdWriteTimestamp2(void *args) { struct vkCmdWriteTimestamp2_params *params = args; TRACE("%p, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->stage), wine_dbgstr_longlong(params->queryPool), params->query); @@ -7420,7 +9810,21 @@ static NTSTATUS wine_vkCmdWriteTimestamp2(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCmdWriteTimestamp2KHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCmdWriteTimestamp2KHR(void *args) +{ + struct vkCmdWriteTimestamp2KHR_params *params = args; + TRACE("%p, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->stage), wine_dbgstr_longlong(params->queryPool), params->query); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteTimestamp2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stage, params->queryPool, params->query); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCmdWriteTimestamp2KHR(void *args) { struct vkCmdWriteTimestamp2KHR_params *params = args; TRACE("%p, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->stage), wine_dbgstr_longlong(params->queryPool), params->query); @@ -7428,17 +9832,42 @@ static NTSTATUS wine_vkCmdWriteTimestamp2KHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkCompileDeferredNV(void *args) -{ - struct vkCompileDeferredNV_params *params = args; - TRACE("%p, 0x%s, %u\n", params->device, wine_dbgstr_longlong(params->pipeline), params->shader); - return wine_device_from_handle(params->device)->funcs.p_vkCompileDeferredNV(wine_device_from_handle(params->device)->device, params->pipeline, params->shader); -} +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCompileDeferredNV(void *args) +{ + struct vkCompileDeferredNV_params *params = args; + TRACE("%p, 0x%s, %u\n", params->device, wine_dbgstr_longlong(params->pipeline), params->shader); + return wine_device_from_handle(params->device)->funcs.p_vkCompileDeferredNV(wine_device_from_handle(params->device)->device, params->pipeline, params->shader); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCompileDeferredNV(void *args) +{ + struct vkCompileDeferredNV_params *params = args; + TRACE("%p, 0x%s, %u\n", params->device, wine_dbgstr_longlong(params->pipeline), params->shader); + return wine_device_from_handle(params->device)->funcs.p_vkCompileDeferredNV(wine_device_from_handle(params->device)->device, params->pipeline, params->shader); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCopyAccelerationStructureKHR(void *args) +{ + struct vkCopyAccelerationStructureKHR_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo); + return wine_device_from_handle(params->device)->funcs.p_vkCopyAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, params->pInfo); +} + +#else /* USE_STRUCT_CONVERSION */ -static NTSTATUS wine_vkCopyAccelerationStructureKHR(void *args) +static NTSTATUS thunk32_vkCopyAccelerationStructureKHR(void *args) { struct vkCopyAccelerationStructureKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkCopyAccelerationStructureInfoKHR_host pInfo_host; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo); @@ -7447,16 +9876,24 @@ static NTSTATUS wine_vkCopyAccelerationStructureKHR(void *args) result = wine_device_from_handle(params->device)->funcs.p_vkCopyAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, &pInfo_host); return result; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCopyAccelerationStructureToMemoryKHR(void *args) +{ + struct vkCopyAccelerationStructureToMemoryKHR_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo); - return wine_device_from_handle(params->device)->funcs.p_vkCopyAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, params->pInfo); -#endif + return wine_device_from_handle(params->device)->funcs.p_vkCopyAccelerationStructureToMemoryKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, params->pInfo); } -static NTSTATUS wine_vkCopyAccelerationStructureToMemoryKHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCopyAccelerationStructureToMemoryKHR(void *args) { struct vkCopyAccelerationStructureToMemoryKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkCopyAccelerationStructureToMemoryInfoKHR_host pInfo_host; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo); @@ -7465,16 +9902,24 @@ static NTSTATUS wine_vkCopyAccelerationStructureToMemoryKHR(void *args) result = wine_device_from_handle(params->device)->funcs.p_vkCopyAccelerationStructureToMemoryKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, &pInfo_host); return result; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCopyMemoryToAccelerationStructureKHR(void *args) +{ + struct vkCopyMemoryToAccelerationStructureKHR_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo); - return wine_device_from_handle(params->device)->funcs.p_vkCopyAccelerationStructureToMemoryKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, params->pInfo); -#endif + return wine_device_from_handle(params->device)->funcs.p_vkCopyMemoryToAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, params->pInfo); } -static NTSTATUS wine_vkCopyMemoryToAccelerationStructureKHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCopyMemoryToAccelerationStructureKHR(void *args) { struct vkCopyMemoryToAccelerationStructureKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkCopyMemoryToAccelerationStructureInfoKHR_host pInfo_host; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo); @@ -7483,16 +9928,24 @@ static NTSTATUS wine_vkCopyMemoryToAccelerationStructureKHR(void *args) result = wine_device_from_handle(params->device)->funcs.p_vkCopyMemoryToAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, &pInfo_host); return result; -#else - TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo); - return wine_device_from_handle(params->device)->funcs.p_vkCopyMemoryToAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, params->pInfo); -#endif } -static NTSTATUS wine_vkCreateAccelerationStructureKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateAccelerationStructureKHR(void *args) +{ + struct vkCreateAccelerationStructureKHR_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pAccelerationStructure); + return wine_device_from_handle(params->device)->funcs.p_vkCreateAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pAccelerationStructure); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateAccelerationStructureKHR(void *args) { struct vkCreateAccelerationStructureKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkAccelerationStructureCreateInfoKHR_host pCreateInfo_host; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pAccelerationStructure); @@ -7501,16 +9954,24 @@ static NTSTATUS wine_vkCreateAccelerationStructureKHR(void *args) result = wine_device_from_handle(params->device)->funcs.p_vkCreateAccelerationStructureKHR(wine_device_from_handle(params->device)->device, &pCreateInfo_host, NULL, params->pAccelerationStructure); return result; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateAccelerationStructureNV(void *args) +{ + struct vkCreateAccelerationStructureNV_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pAccelerationStructure); - return wine_device_from_handle(params->device)->funcs.p_vkCreateAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pAccelerationStructure); -#endif + return wine_device_from_handle(params->device)->funcs.p_vkCreateAccelerationStructureNV(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pAccelerationStructure); } -static NTSTATUS wine_vkCreateAccelerationStructureNV(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateAccelerationStructureNV(void *args) { struct vkCreateAccelerationStructureNV_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkAccelerationStructureCreateInfoNV_host pCreateInfo_host; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pAccelerationStructure); @@ -7519,16 +9980,24 @@ static NTSTATUS wine_vkCreateAccelerationStructureNV(void *args) result = wine_device_from_handle(params->device)->funcs.p_vkCreateAccelerationStructureNV(wine_device_from_handle(params->device)->device, &pCreateInfo_host, NULL, params->pAccelerationStructure); return result; -#else - TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pAccelerationStructure); - return wine_device_from_handle(params->device)->funcs.p_vkCreateAccelerationStructureNV(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pAccelerationStructure); -#endif } -static NTSTATUS wine_vkCreateBuffer(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateBuffer(void *args) +{ + struct vkCreateBuffer_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pBuffer); + return wine_device_from_handle(params->device)->funcs.p_vkCreateBuffer(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pBuffer); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateBuffer(void *args) { struct vkCreateBuffer_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkBufferCreateInfo_host pCreateInfo_host; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pBuffer); @@ -7537,16 +10006,24 @@ static NTSTATUS wine_vkCreateBuffer(void *args) result = wine_device_from_handle(params->device)->funcs.p_vkCreateBuffer(wine_device_from_handle(params->device)->device, &pCreateInfo_host, NULL, params->pBuffer); return result; -#else - TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pBuffer); - return wine_device_from_handle(params->device)->funcs.p_vkCreateBuffer(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pBuffer); -#endif } -static NTSTATUS wine_vkCreateBufferView(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateBufferView(void *args) +{ + struct vkCreateBufferView_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pView); + return wine_device_from_handle(params->device)->funcs.p_vkCreateBufferView(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pView); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateBufferView(void *args) { struct vkCreateBufferView_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkBufferViewCreateInfo_host pCreateInfo_host; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pView); @@ -7555,15 +10032,21 @@ static NTSTATUS wine_vkCreateBufferView(void *args) result = wine_device_from_handle(params->device)->funcs.p_vkCreateBufferView(wine_device_from_handle(params->device)->device, &pCreateInfo_host, NULL, params->pView); return result; -#else - TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pView); - return wine_device_from_handle(params->device)->funcs.p_vkCreateBufferView(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pView); -#endif } +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +VkResult thunk_vkCreateComputePipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkComputePipelineCreateInfo *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) +{ + return wine_device_from_handle(device)->funcs.p_vkCreateComputePipelines(wine_device_from_handle(device)->device, pipelineCache, createInfoCount, pCreateInfos, NULL, pPipelines); +} + +#else /* USE_STRUCT_CONVERSION */ + VkResult thunk_vkCreateComputePipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkComputePipelineCreateInfo *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) { -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkComputePipelineCreateInfo_host *pCreateInfos_host; pCreateInfos_host = convert_VkComputePipelineCreateInfo_array_win_to_host(pCreateInfos, createInfoCount); @@ -7571,15 +10054,24 @@ VkResult thunk_vkCreateComputePipelines(VkDevice device, VkPipelineCache pipelin free_VkComputePipelineCreateInfo_array(pCreateInfos_host, createInfoCount); return result; -#else - return wine_device_from_handle(device)->funcs.p_vkCreateComputePipelines(wine_device_from_handle(device)->device, pipelineCache, createInfoCount, pCreateInfos, NULL, pPipelines); -#endif } -static NTSTATUS wine_vkCreateCuFunctionNVX(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateCuFunctionNVX(void *args) +{ + struct vkCreateCuFunctionNVX_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pFunction); + return wine_device_from_handle(params->device)->funcs.p_vkCreateCuFunctionNVX(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pFunction); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateCuFunctionNVX(void *args) { struct vkCreateCuFunctionNVX_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkCuFunctionCreateInfoNVX_host pCreateInfo_host; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pFunction); @@ -7588,44 +10080,104 @@ static NTSTATUS wine_vkCreateCuFunctionNVX(void *args) result = wine_device_from_handle(params->device)->funcs.p_vkCreateCuFunctionNVX(wine_device_from_handle(params->device)->device, &pCreateInfo_host, NULL, params->pFunction); return result; -#else - TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pFunction); - return wine_device_from_handle(params->device)->funcs.p_vkCreateCuFunctionNVX(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pFunction); -#endif } -static NTSTATUS wine_vkCreateCuModuleNVX(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateCuModuleNVX(void *args) +{ + struct vkCreateCuModuleNVX_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pModule); + return wine_device_from_handle(params->device)->funcs.p_vkCreateCuModuleNVX(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pModule); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateCuModuleNVX(void *args) { struct vkCreateCuModuleNVX_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pModule); return wine_device_from_handle(params->device)->funcs.p_vkCreateCuModuleNVX(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pModule); } -static NTSTATUS wine_vkCreateDeferredOperationKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateDeferredOperationKHR(void *args) +{ + struct vkCreateDeferredOperationKHR_params *params = args; + TRACE("%p, %p, %p\n", params->device, params->pAllocator, params->pDeferredOperation); + return wine_device_from_handle(params->device)->funcs.p_vkCreateDeferredOperationKHR(wine_device_from_handle(params->device)->device, NULL, params->pDeferredOperation); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateDeferredOperationKHR(void *args) { struct vkCreateDeferredOperationKHR_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pAllocator, params->pDeferredOperation); return wine_device_from_handle(params->device)->funcs.p_vkCreateDeferredOperationKHR(wine_device_from_handle(params->device)->device, NULL, params->pDeferredOperation); } -static NTSTATUS wine_vkCreateDescriptorPool(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateDescriptorPool(void *args) +{ + struct vkCreateDescriptorPool_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pDescriptorPool); + return wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorPool(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pDescriptorPool); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateDescriptorPool(void *args) { struct vkCreateDescriptorPool_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pDescriptorPool); return wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorPool(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pDescriptorPool); } -static NTSTATUS wine_vkCreateDescriptorSetLayout(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateDescriptorSetLayout(void *args) +{ + struct vkCreateDescriptorSetLayout_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSetLayout); + return wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorSetLayout(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSetLayout); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateDescriptorSetLayout(void *args) { struct vkCreateDescriptorSetLayout_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSetLayout); return wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorSetLayout(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSetLayout); } -static NTSTATUS wine_vkCreateDescriptorUpdateTemplate(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateDescriptorUpdateTemplate(void *args) +{ + struct vkCreateDescriptorUpdateTemplate_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pDescriptorUpdateTemplate); + return wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorUpdateTemplate(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pDescriptorUpdateTemplate); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateDescriptorUpdateTemplate(void *args) { struct vkCreateDescriptorUpdateTemplate_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkDescriptorUpdateTemplateCreateInfo_host pCreateInfo_host; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pDescriptorUpdateTemplate); @@ -7634,16 +10186,24 @@ static NTSTATUS wine_vkCreateDescriptorUpdateTemplate(void *args) result = wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorUpdateTemplate(wine_device_from_handle(params->device)->device, &pCreateInfo_host, NULL, params->pDescriptorUpdateTemplate); return result; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateDescriptorUpdateTemplateKHR(void *args) +{ + struct vkCreateDescriptorUpdateTemplateKHR_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pDescriptorUpdateTemplate); - return wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorUpdateTemplate(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pDescriptorUpdateTemplate); -#endif + return wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorUpdateTemplateKHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pDescriptorUpdateTemplate); } -static NTSTATUS wine_vkCreateDescriptorUpdateTemplateKHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateDescriptorUpdateTemplateKHR(void *args) { struct vkCreateDescriptorUpdateTemplateKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkDescriptorUpdateTemplateCreateInfo_host pCreateInfo_host; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pDescriptorUpdateTemplate); @@ -7652,30 +10212,64 @@ static NTSTATUS wine_vkCreateDescriptorUpdateTemplateKHR(void *args) result = wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorUpdateTemplateKHR(wine_device_from_handle(params->device)->device, &pCreateInfo_host, NULL, params->pDescriptorUpdateTemplate); return result; -#else - TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pDescriptorUpdateTemplate); - return wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorUpdateTemplateKHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pDescriptorUpdateTemplate); -#endif } -static NTSTATUS wine_vkCreateEvent(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateEvent(void *args) +{ + struct vkCreateEvent_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pEvent); + return wine_device_from_handle(params->device)->funcs.p_vkCreateEvent(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pEvent); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateEvent(void *args) { struct vkCreateEvent_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pEvent); return wine_device_from_handle(params->device)->funcs.p_vkCreateEvent(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pEvent); } -static NTSTATUS wine_vkCreateFence(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateFence(void *args) +{ + struct vkCreateFence_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pFence); + return wine_device_from_handle(params->device)->funcs.p_vkCreateFence(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pFence); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateFence(void *args) { struct vkCreateFence_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pFence); return wine_device_from_handle(params->device)->funcs.p_vkCreateFence(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pFence); } -static NTSTATUS wine_vkCreateFramebuffer(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateFramebuffer(void *args) +{ + struct vkCreateFramebuffer_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pFramebuffer); + return wine_device_from_handle(params->device)->funcs.p_vkCreateFramebuffer(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pFramebuffer); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateFramebuffer(void *args) { struct vkCreateFramebuffer_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkFramebufferCreateInfo_host pCreateInfo_host; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pFramebuffer); @@ -7684,15 +10278,21 @@ static NTSTATUS wine_vkCreateFramebuffer(void *args) result = wine_device_from_handle(params->device)->funcs.p_vkCreateFramebuffer(wine_device_from_handle(params->device)->device, &pCreateInfo_host, NULL, params->pFramebuffer); return result; -#else - TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pFramebuffer); - return wine_device_from_handle(params->device)->funcs.p_vkCreateFramebuffer(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pFramebuffer); -#endif } +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +VkResult thunk_vkCreateGraphicsPipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkGraphicsPipelineCreateInfo *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) +{ + return wine_device_from_handle(device)->funcs.p_vkCreateGraphicsPipelines(wine_device_from_handle(device)->device, pipelineCache, createInfoCount, pCreateInfos, NULL, pPipelines); +} + +#else /* USE_STRUCT_CONVERSION */ + VkResult thunk_vkCreateGraphicsPipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkGraphicsPipelineCreateInfo *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) { -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkGraphicsPipelineCreateInfo_host *pCreateInfos_host; pCreateInfos_host = convert_VkGraphicsPipelineCreateInfo_array_win_to_host(pCreateInfos, createInfoCount); @@ -7700,22 +10300,44 @@ VkResult thunk_vkCreateGraphicsPipelines(VkDevice device, VkPipelineCache pipeli free_VkGraphicsPipelineCreateInfo_array(pCreateInfos_host, createInfoCount); return result; -#else - return wine_device_from_handle(device)->funcs.p_vkCreateGraphicsPipelines(wine_device_from_handle(device)->device, pipelineCache, createInfoCount, pCreateInfos, NULL, pPipelines); -#endif } -static NTSTATUS wine_vkCreateImage(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateImage(void *args) +{ + struct vkCreateImage_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pImage); + return wine_device_from_handle(params->device)->funcs.p_vkCreateImage(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pImage); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateImage(void *args) +{ + struct vkCreateImage_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pImage); + return wine_device_from_handle(params->device)->funcs.p_vkCreateImage(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pImage); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateImageView(void *args) { - struct vkCreateImage_params *params = args; - TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pImage); - return wine_device_from_handle(params->device)->funcs.p_vkCreateImage(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pImage); + struct vkCreateImageView_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pView); + return wine_device_from_handle(params->device)->funcs.p_vkCreateImageView(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pView); } -static NTSTATUS wine_vkCreateImageView(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateImageView(void *args) { struct vkCreateImageView_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkImageViewCreateInfo_host pCreateInfo_host; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pView); @@ -7724,16 +10346,24 @@ static NTSTATUS wine_vkCreateImageView(void *args) result = wine_device_from_handle(params->device)->funcs.p_vkCreateImageView(wine_device_from_handle(params->device)->device, &pCreateInfo_host, NULL, params->pView); return result; -#else - TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pView); - return wine_device_from_handle(params->device)->funcs.p_vkCreateImageView(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pView); -#endif } -static NTSTATUS wine_vkCreateIndirectCommandsLayoutNV(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateIndirectCommandsLayoutNV(void *args) +{ + struct vkCreateIndirectCommandsLayoutNV_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pIndirectCommandsLayout); + return wine_device_from_handle(params->device)->funcs.p_vkCreateIndirectCommandsLayoutNV(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pIndirectCommandsLayout); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateIndirectCommandsLayoutNV(void *args) { struct vkCreateIndirectCommandsLayoutNV_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkIndirectCommandsLayoutCreateInfoNV_host pCreateInfo_host; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pIndirectCommandsLayout); @@ -7743,50 +10373,121 @@ static NTSTATUS wine_vkCreateIndirectCommandsLayoutNV(void *args) free_VkIndirectCommandsLayoutCreateInfoNV(&pCreateInfo_host); return result; -#else - TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pIndirectCommandsLayout); - return wine_device_from_handle(params->device)->funcs.p_vkCreateIndirectCommandsLayoutNV(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pIndirectCommandsLayout); -#endif } -static NTSTATUS wine_vkCreatePipelineCache(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreatePipelineCache(void *args) +{ + struct vkCreatePipelineCache_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPipelineCache); + return wine_device_from_handle(params->device)->funcs.p_vkCreatePipelineCache(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPipelineCache); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreatePipelineCache(void *args) { struct vkCreatePipelineCache_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPipelineCache); return wine_device_from_handle(params->device)->funcs.p_vkCreatePipelineCache(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPipelineCache); } -static NTSTATUS wine_vkCreatePipelineLayout(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreatePipelineLayout(void *args) +{ + struct vkCreatePipelineLayout_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPipelineLayout); + return wine_device_from_handle(params->device)->funcs.p_vkCreatePipelineLayout(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPipelineLayout); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreatePipelineLayout(void *args) { struct vkCreatePipelineLayout_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPipelineLayout); return wine_device_from_handle(params->device)->funcs.p_vkCreatePipelineLayout(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPipelineLayout); } -static NTSTATUS wine_vkCreatePrivateDataSlot(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreatePrivateDataSlot(void *args) +{ + struct vkCreatePrivateDataSlot_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPrivateDataSlot); + return wine_device_from_handle(params->device)->funcs.p_vkCreatePrivateDataSlot(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPrivateDataSlot); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreatePrivateDataSlot(void *args) { struct vkCreatePrivateDataSlot_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPrivateDataSlot); return wine_device_from_handle(params->device)->funcs.p_vkCreatePrivateDataSlot(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPrivateDataSlot); } -static NTSTATUS wine_vkCreatePrivateDataSlotEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreatePrivateDataSlotEXT(void *args) +{ + struct vkCreatePrivateDataSlotEXT_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPrivateDataSlot); + return wine_device_from_handle(params->device)->funcs.p_vkCreatePrivateDataSlotEXT(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPrivateDataSlot); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreatePrivateDataSlotEXT(void *args) { struct vkCreatePrivateDataSlotEXT_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPrivateDataSlot); return wine_device_from_handle(params->device)->funcs.p_vkCreatePrivateDataSlotEXT(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPrivateDataSlot); } -static NTSTATUS wine_vkCreateQueryPool(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateQueryPool(void *args) +{ + struct vkCreateQueryPool_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pQueryPool); + return wine_device_from_handle(params->device)->funcs.p_vkCreateQueryPool(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pQueryPool); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateQueryPool(void *args) { struct vkCreateQueryPool_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pQueryPool); return wine_device_from_handle(params->device)->funcs.p_vkCreateQueryPool(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pQueryPool); } +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +VkResult thunk_vkCreateRayTracingPipelinesKHR(VkDevice device, VkDeferredOperationKHR deferredOperation, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkRayTracingPipelineCreateInfoKHR *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) +{ + return wine_device_from_handle(device)->funcs.p_vkCreateRayTracingPipelinesKHR(wine_device_from_handle(device)->device, deferredOperation, pipelineCache, createInfoCount, pCreateInfos, NULL, pPipelines); +} + +#else /* USE_STRUCT_CONVERSION */ + VkResult thunk_vkCreateRayTracingPipelinesKHR(VkDevice device, VkDeferredOperationKHR deferredOperation, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkRayTracingPipelineCreateInfoKHR *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) { -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkRayTracingPipelineCreateInfoKHR_host *pCreateInfos_host; pCreateInfos_host = convert_VkRayTracingPipelineCreateInfoKHR_array_win_to_host(pCreateInfos, createInfoCount); @@ -7794,14 +10495,21 @@ VkResult thunk_vkCreateRayTracingPipelinesKHR(VkDevice device, VkDeferredOperati free_VkRayTracingPipelineCreateInfoKHR_array(pCreateInfos_host, createInfoCount); return result; -#else - return wine_device_from_handle(device)->funcs.p_vkCreateRayTracingPipelinesKHR(wine_device_from_handle(device)->device, deferredOperation, pipelineCache, createInfoCount, pCreateInfos, NULL, pPipelines); -#endif } +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +VkResult thunk_vkCreateRayTracingPipelinesNV(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkRayTracingPipelineCreateInfoNV *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) +{ + return wine_device_from_handle(device)->funcs.p_vkCreateRayTracingPipelinesNV(wine_device_from_handle(device)->device, pipelineCache, createInfoCount, pCreateInfos, NULL, pPipelines); +} + +#else /* USE_STRUCT_CONVERSION */ + VkResult thunk_vkCreateRayTracingPipelinesNV(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkRayTracingPipelineCreateInfoNV *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) { -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkRayTracingPipelineCreateInfoNV_host *pCreateInfos_host; pCreateInfos_host = convert_VkRayTracingPipelineCreateInfoNV_array_win_to_host(pCreateInfos, createInfoCount); @@ -7809,147 +10517,299 @@ VkResult thunk_vkCreateRayTracingPipelinesNV(VkDevice device, VkPipelineCache pi free_VkRayTracingPipelineCreateInfoNV_array(pCreateInfos_host, createInfoCount); return result; -#else - return wine_device_from_handle(device)->funcs.p_vkCreateRayTracingPipelinesNV(wine_device_from_handle(device)->device, pipelineCache, createInfoCount, pCreateInfos, NULL, pPipelines); -#endif } -static NTSTATUS wine_vkCreateRenderPass(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateRenderPass(void *args) +{ + struct vkCreateRenderPass_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pRenderPass); + return wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateRenderPass(void *args) { struct vkCreateRenderPass_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pRenderPass); return wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); } -static NTSTATUS wine_vkCreateRenderPass2(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateRenderPass2(void *args) +{ + struct vkCreateRenderPass2_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pRenderPass); + return wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass2(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateRenderPass2(void *args) { struct vkCreateRenderPass2_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pRenderPass); return wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass2(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); } -static NTSTATUS wine_vkCreateRenderPass2KHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateRenderPass2KHR(void *args) +{ + struct vkCreateRenderPass2KHR_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pRenderPass); + return wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass2KHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateRenderPass2KHR(void *args) { struct vkCreateRenderPass2KHR_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pRenderPass); return wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass2KHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); } -static NTSTATUS wine_vkCreateSampler(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateSampler(void *args) +{ + struct vkCreateSampler_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSampler); + return wine_device_from_handle(params->device)->funcs.p_vkCreateSampler(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSampler); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateSampler(void *args) { struct vkCreateSampler_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSampler); return wine_device_from_handle(params->device)->funcs.p_vkCreateSampler(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSampler); } -static NTSTATUS wine_vkCreateSamplerYcbcrConversion(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateSamplerYcbcrConversion(void *args) +{ + struct vkCreateSamplerYcbcrConversion_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pYcbcrConversion); + return wine_device_from_handle(params->device)->funcs.p_vkCreateSamplerYcbcrConversion(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pYcbcrConversion); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateSamplerYcbcrConversion(void *args) { struct vkCreateSamplerYcbcrConversion_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pYcbcrConversion); return wine_device_from_handle(params->device)->funcs.p_vkCreateSamplerYcbcrConversion(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pYcbcrConversion); } -static NTSTATUS wine_vkCreateSamplerYcbcrConversionKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateSamplerYcbcrConversionKHR(void *args) +{ + struct vkCreateSamplerYcbcrConversionKHR_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pYcbcrConversion); + return wine_device_from_handle(params->device)->funcs.p_vkCreateSamplerYcbcrConversionKHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pYcbcrConversion); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateSamplerYcbcrConversionKHR(void *args) { struct vkCreateSamplerYcbcrConversionKHR_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pYcbcrConversion); return wine_device_from_handle(params->device)->funcs.p_vkCreateSamplerYcbcrConversionKHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pYcbcrConversion); } -static NTSTATUS wine_vkCreateSemaphore(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateSemaphore(void *args) +{ + struct vkCreateSemaphore_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSemaphore); + return wine_device_from_handle(params->device)->funcs.p_vkCreateSemaphore(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSemaphore); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateSemaphore(void *args) { struct vkCreateSemaphore_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSemaphore); return wine_device_from_handle(params->device)->funcs.p_vkCreateSemaphore(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSemaphore); } -static NTSTATUS wine_vkCreateShaderModule(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateShaderModule(void *args) +{ + struct vkCreateShaderModule_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pShaderModule); + return wine_device_from_handle(params->device)->funcs.p_vkCreateShaderModule(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pShaderModule); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateShaderModule(void *args) { struct vkCreateShaderModule_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pShaderModule); return wine_device_from_handle(params->device)->funcs.p_vkCreateShaderModule(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pShaderModule); } -static NTSTATUS wine_vkCreateSwapchainKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateSwapchainKHR(void *args) { struct vkCreateSwapchainKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; - VkSwapchainCreateInfoKHR_host pCreateInfo_host; + VkSwapchainCreateInfoKHR pCreateInfo_host; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSwapchain); convert_VkSwapchainCreateInfoKHR_win_to_host(params->pCreateInfo, &pCreateInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkCreateSwapchainKHR(wine_device_from_handle(params->device)->device, &pCreateInfo_host, NULL, params->pSwapchain); return result; -#else +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateSwapchainKHR(void *args) +{ + struct vkCreateSwapchainKHR_params *params = args; VkResult result; - VkSwapchainCreateInfoKHR pCreateInfo_host; + VkSwapchainCreateInfoKHR_host pCreateInfo_host; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSwapchain); convert_VkSwapchainCreateInfoKHR_win_to_host(params->pCreateInfo, &pCreateInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkCreateSwapchainKHR(wine_device_from_handle(params->device)->device, &pCreateInfo_host, NULL, params->pSwapchain); return result; -#endif } -static NTSTATUS wine_vkCreateValidationCacheEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateValidationCacheEXT(void *args) +{ + struct vkCreateValidationCacheEXT_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pValidationCache); + return wine_device_from_handle(params->device)->funcs.p_vkCreateValidationCacheEXT(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pValidationCache); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateValidationCacheEXT(void *args) { struct vkCreateValidationCacheEXT_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pValidationCache); return wine_device_from_handle(params->device)->funcs.p_vkCreateValidationCacheEXT(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pValidationCache); } -static NTSTATUS wine_vkDebugMarkerSetObjectNameEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDebugMarkerSetObjectNameEXT(void *args) { struct vkDebugMarkerSetObjectNameEXT_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; - VkDebugMarkerObjectNameInfoEXT_host pNameInfo_host; + VkDebugMarkerObjectNameInfoEXT pNameInfo_host; TRACE("%p, %p\n", params->device, params->pNameInfo); convert_VkDebugMarkerObjectNameInfoEXT_win_to_host(params->pNameInfo, &pNameInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkDebugMarkerSetObjectNameEXT(wine_device_from_handle(params->device)->device, &pNameInfo_host); return result; -#else +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDebugMarkerSetObjectNameEXT(void *args) +{ + struct vkDebugMarkerSetObjectNameEXT_params *params = args; VkResult result; - VkDebugMarkerObjectNameInfoEXT pNameInfo_host; + VkDebugMarkerObjectNameInfoEXT_host pNameInfo_host; TRACE("%p, %p\n", params->device, params->pNameInfo); convert_VkDebugMarkerObjectNameInfoEXT_win_to_host(params->pNameInfo, &pNameInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkDebugMarkerSetObjectNameEXT(wine_device_from_handle(params->device)->device, &pNameInfo_host); return result; -#endif } -static NTSTATUS wine_vkDebugMarkerSetObjectTagEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDebugMarkerSetObjectTagEXT(void *args) { struct vkDebugMarkerSetObjectTagEXT_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; - VkDebugMarkerObjectTagInfoEXT_host pTagInfo_host; + VkDebugMarkerObjectTagInfoEXT pTagInfo_host; TRACE("%p, %p\n", params->device, params->pTagInfo); convert_VkDebugMarkerObjectTagInfoEXT_win_to_host(params->pTagInfo, &pTagInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkDebugMarkerSetObjectTagEXT(wine_device_from_handle(params->device)->device, &pTagInfo_host); return result; -#else +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDebugMarkerSetObjectTagEXT(void *args) +{ + struct vkDebugMarkerSetObjectTagEXT_params *params = args; VkResult result; - VkDebugMarkerObjectTagInfoEXT pTagInfo_host; + VkDebugMarkerObjectTagInfoEXT_host pTagInfo_host; TRACE("%p, %p\n", params->device, params->pTagInfo); convert_VkDebugMarkerObjectTagInfoEXT_win_to_host(params->pTagInfo, &pTagInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkDebugMarkerSetObjectTagEXT(wine_device_from_handle(params->device)->device, &pTagInfo_host); return result; -#endif } -static NTSTATUS wine_vkDebugReportMessageEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDebugReportMessageEXT(void *args) +{ + struct vkDebugReportMessageEXT_params *params = args; + TRACE("%p, %#x, %#x, 0x%s, 0x%s, %d, %p, %p\n", params->instance, params->flags, params->objectType, wine_dbgstr_longlong(params->object), wine_dbgstr_longlong(params->location), params->messageCode, params->pLayerPrefix, params->pMessage); + wine_instance_from_handle(params->instance)->funcs.p_vkDebugReportMessageEXT(wine_instance_from_handle(params->instance)->instance, params->flags, params->objectType, wine_vk_unwrap_handle(params->objectType, params->object), params->location, params->messageCode, params->pLayerPrefix, params->pMessage); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDebugReportMessageEXT(void *args) { struct vkDebugReportMessageEXT_params *params = args; TRACE("%p, %#x, %#x, 0x%s, 0x%s, %d, %p, %p\n", params->instance, params->flags, params->objectType, wine_dbgstr_longlong(params->object), wine_dbgstr_longlong(params->location), params->messageCode, params->pLayerPrefix, params->pMessage); @@ -7957,14 +10817,41 @@ static NTSTATUS wine_vkDebugReportMessageEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDeferredOperationJoinKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDeferredOperationJoinKHR(void *args) +{ + struct vkDeferredOperationJoinKHR_params *params = args; + TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->operation)); + return wine_device_from_handle(params->device)->funcs.p_vkDeferredOperationJoinKHR(wine_device_from_handle(params->device)->device, params->operation); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDeferredOperationJoinKHR(void *args) { struct vkDeferredOperationJoinKHR_params *params = args; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->operation)); return wine_device_from_handle(params->device)->funcs.p_vkDeferredOperationJoinKHR(wine_device_from_handle(params->device)->device, params->operation); } -static NTSTATUS wine_vkDestroyAccelerationStructureKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyAccelerationStructureKHR(void *args) +{ + struct vkDestroyAccelerationStructureKHR_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->accelerationStructure), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->accelerationStructure, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyAccelerationStructureKHR(void *args) { struct vkDestroyAccelerationStructureKHR_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->accelerationStructure), params->pAllocator); @@ -7972,7 +10859,21 @@ static NTSTATUS wine_vkDestroyAccelerationStructureKHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyAccelerationStructureNV(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyAccelerationStructureNV(void *args) +{ + struct vkDestroyAccelerationStructureNV_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->accelerationStructure), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyAccelerationStructureNV(wine_device_from_handle(params->device)->device, params->accelerationStructure, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyAccelerationStructureNV(void *args) { struct vkDestroyAccelerationStructureNV_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->accelerationStructure), params->pAllocator); @@ -7980,7 +10881,21 @@ static NTSTATUS wine_vkDestroyAccelerationStructureNV(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyBuffer(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyBuffer(void *args) +{ + struct vkDestroyBuffer_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->buffer), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyBuffer(wine_device_from_handle(params->device)->device, params->buffer, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyBuffer(void *args) { struct vkDestroyBuffer_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->buffer), params->pAllocator); @@ -7988,7 +10903,21 @@ static NTSTATUS wine_vkDestroyBuffer(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyBufferView(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyBufferView(void *args) +{ + struct vkDestroyBufferView_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->bufferView), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyBufferView(wine_device_from_handle(params->device)->device, params->bufferView, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyBufferView(void *args) { struct vkDestroyBufferView_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->bufferView), params->pAllocator); @@ -7996,7 +10925,21 @@ static NTSTATUS wine_vkDestroyBufferView(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyCuFunctionNVX(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyCuFunctionNVX(void *args) +{ + struct vkDestroyCuFunctionNVX_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->function), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyCuFunctionNVX(wine_device_from_handle(params->device)->device, params->function, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyCuFunctionNVX(void *args) { struct vkDestroyCuFunctionNVX_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->function), params->pAllocator); @@ -8004,7 +10947,21 @@ static NTSTATUS wine_vkDestroyCuFunctionNVX(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyCuModuleNVX(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyCuModuleNVX(void *args) +{ + struct vkDestroyCuModuleNVX_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->module), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyCuModuleNVX(wine_device_from_handle(params->device)->device, params->module, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyCuModuleNVX(void *args) { struct vkDestroyCuModuleNVX_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->module), params->pAllocator); @@ -8012,7 +10969,21 @@ static NTSTATUS wine_vkDestroyCuModuleNVX(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyDeferredOperationKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyDeferredOperationKHR(void *args) +{ + struct vkDestroyDeferredOperationKHR_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->operation), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyDeferredOperationKHR(wine_device_from_handle(params->device)->device, params->operation, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyDeferredOperationKHR(void *args) { struct vkDestroyDeferredOperationKHR_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->operation), params->pAllocator); @@ -8020,7 +10991,21 @@ static NTSTATUS wine_vkDestroyDeferredOperationKHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyDescriptorPool(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyDescriptorPool(void *args) +{ + struct vkDestroyDescriptorPool_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorPool), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyDescriptorPool(wine_device_from_handle(params->device)->device, params->descriptorPool, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyDescriptorPool(void *args) { struct vkDestroyDescriptorPool_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorPool), params->pAllocator); @@ -8028,7 +11013,21 @@ static NTSTATUS wine_vkDestroyDescriptorPool(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyDescriptorSetLayout(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyDescriptorSetLayout(void *args) +{ + struct vkDestroyDescriptorSetLayout_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSetLayout), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyDescriptorSetLayout(wine_device_from_handle(params->device)->device, params->descriptorSetLayout, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyDescriptorSetLayout(void *args) { struct vkDestroyDescriptorSetLayout_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSetLayout), params->pAllocator); @@ -8036,7 +11035,21 @@ static NTSTATUS wine_vkDestroyDescriptorSetLayout(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyDescriptorUpdateTemplate(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyDescriptorUpdateTemplate(void *args) +{ + struct vkDestroyDescriptorUpdateTemplate_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyDescriptorUpdateTemplate(wine_device_from_handle(params->device)->device, params->descriptorUpdateTemplate, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyDescriptorUpdateTemplate(void *args) { struct vkDestroyDescriptorUpdateTemplate_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pAllocator); @@ -8044,7 +11057,21 @@ static NTSTATUS wine_vkDestroyDescriptorUpdateTemplate(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyDescriptorUpdateTemplateKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyDescriptorUpdateTemplateKHR(void *args) +{ + struct vkDestroyDescriptorUpdateTemplateKHR_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyDescriptorUpdateTemplateKHR(wine_device_from_handle(params->device)->device, params->descriptorUpdateTemplate, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyDescriptorUpdateTemplateKHR(void *args) { struct vkDestroyDescriptorUpdateTemplateKHR_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pAllocator); @@ -8052,7 +11079,21 @@ static NTSTATUS wine_vkDestroyDescriptorUpdateTemplateKHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyEvent(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyEvent(void *args) +{ + struct vkDestroyEvent_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->event), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyEvent(wine_device_from_handle(params->device)->device, params->event, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyEvent(void *args) { struct vkDestroyEvent_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->event), params->pAllocator); @@ -8060,7 +11101,21 @@ static NTSTATUS wine_vkDestroyEvent(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyFence(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyFence(void *args) +{ + struct vkDestroyFence_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->fence), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyFence(wine_device_from_handle(params->device)->device, params->fence, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyFence(void *args) { struct vkDestroyFence_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->fence), params->pAllocator); @@ -8068,7 +11123,21 @@ static NTSTATUS wine_vkDestroyFence(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyFramebuffer(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyFramebuffer(void *args) +{ + struct vkDestroyFramebuffer_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->framebuffer), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyFramebuffer(wine_device_from_handle(params->device)->device, params->framebuffer, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyFramebuffer(void *args) { struct vkDestroyFramebuffer_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->framebuffer), params->pAllocator); @@ -8076,7 +11145,21 @@ static NTSTATUS wine_vkDestroyFramebuffer(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyImage(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyImage(void *args) +{ + struct vkDestroyImage_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyImage(wine_device_from_handle(params->device)->device, params->image, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyImage(void *args) { struct vkDestroyImage_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pAllocator); @@ -8084,7 +11167,21 @@ static NTSTATUS wine_vkDestroyImage(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyImageView(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyImageView(void *args) +{ + struct vkDestroyImageView_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->imageView), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyImageView(wine_device_from_handle(params->device)->device, params->imageView, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyImageView(void *args) { struct vkDestroyImageView_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->imageView), params->pAllocator); @@ -8092,7 +11189,21 @@ static NTSTATUS wine_vkDestroyImageView(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyIndirectCommandsLayoutNV(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyIndirectCommandsLayoutNV(void *args) +{ + struct vkDestroyIndirectCommandsLayoutNV_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->indirectCommandsLayout), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyIndirectCommandsLayoutNV(wine_device_from_handle(params->device)->device, params->indirectCommandsLayout, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyIndirectCommandsLayoutNV(void *args) { struct vkDestroyIndirectCommandsLayoutNV_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->indirectCommandsLayout), params->pAllocator); @@ -8100,7 +11211,21 @@ static NTSTATUS wine_vkDestroyIndirectCommandsLayoutNV(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyPipeline(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyPipeline(void *args) +{ + struct vkDestroyPipeline_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyPipeline(wine_device_from_handle(params->device)->device, params->pipeline, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyPipeline(void *args) { struct vkDestroyPipeline_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->pAllocator); @@ -8108,7 +11233,21 @@ static NTSTATUS wine_vkDestroyPipeline(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyPipelineCache(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyPipelineCache(void *args) +{ + struct vkDestroyPipelineCache_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyPipelineCache(wine_device_from_handle(params->device)->device, params->pipelineCache, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyPipelineCache(void *args) { struct vkDestroyPipelineCache_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->pAllocator); @@ -8116,7 +11255,21 @@ static NTSTATUS wine_vkDestroyPipelineCache(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyPipelineLayout(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyPipelineLayout(void *args) +{ + struct vkDestroyPipelineLayout_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipelineLayout), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyPipelineLayout(wine_device_from_handle(params->device)->device, params->pipelineLayout, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyPipelineLayout(void *args) { struct vkDestroyPipelineLayout_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipelineLayout), params->pAllocator); @@ -8124,7 +11277,21 @@ static NTSTATUS wine_vkDestroyPipelineLayout(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyPrivateDataSlot(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyPrivateDataSlot(void *args) +{ + struct vkDestroyPrivateDataSlot_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->privateDataSlot), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyPrivateDataSlot(wine_device_from_handle(params->device)->device, params->privateDataSlot, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyPrivateDataSlot(void *args) { struct vkDestroyPrivateDataSlot_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->privateDataSlot), params->pAllocator); @@ -8132,7 +11299,21 @@ static NTSTATUS wine_vkDestroyPrivateDataSlot(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyPrivateDataSlotEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyPrivateDataSlotEXT(void *args) +{ + struct vkDestroyPrivateDataSlotEXT_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->privateDataSlot), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyPrivateDataSlotEXT(wine_device_from_handle(params->device)->device, params->privateDataSlot, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyPrivateDataSlotEXT(void *args) { struct vkDestroyPrivateDataSlotEXT_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->privateDataSlot), params->pAllocator); @@ -8140,7 +11321,21 @@ static NTSTATUS wine_vkDestroyPrivateDataSlotEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyQueryPool(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyQueryPool(void *args) +{ + struct vkDestroyQueryPool_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->queryPool), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyQueryPool(wine_device_from_handle(params->device)->device, params->queryPool, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyQueryPool(void *args) { struct vkDestroyQueryPool_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->queryPool), params->pAllocator); @@ -8148,7 +11343,21 @@ static NTSTATUS wine_vkDestroyQueryPool(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyRenderPass(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyRenderPass(void *args) +{ + struct vkDestroyRenderPass_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->renderPass), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyRenderPass(wine_device_from_handle(params->device)->device, params->renderPass, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyRenderPass(void *args) { struct vkDestroyRenderPass_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->renderPass), params->pAllocator); @@ -8156,7 +11365,21 @@ static NTSTATUS wine_vkDestroyRenderPass(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroySampler(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroySampler(void *args) +{ + struct vkDestroySampler_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->sampler), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroySampler(wine_device_from_handle(params->device)->device, params->sampler, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroySampler(void *args) { struct vkDestroySampler_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->sampler), params->pAllocator); @@ -8164,7 +11387,21 @@ static NTSTATUS wine_vkDestroySampler(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroySamplerYcbcrConversion(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroySamplerYcbcrConversion(void *args) +{ + struct vkDestroySamplerYcbcrConversion_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->ycbcrConversion), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroySamplerYcbcrConversion(wine_device_from_handle(params->device)->device, params->ycbcrConversion, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroySamplerYcbcrConversion(void *args) { struct vkDestroySamplerYcbcrConversion_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->ycbcrConversion), params->pAllocator); @@ -8172,7 +11409,21 @@ static NTSTATUS wine_vkDestroySamplerYcbcrConversion(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroySamplerYcbcrConversionKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroySamplerYcbcrConversionKHR(void *args) +{ + struct vkDestroySamplerYcbcrConversionKHR_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->ycbcrConversion), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroySamplerYcbcrConversionKHR(wine_device_from_handle(params->device)->device, params->ycbcrConversion, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroySamplerYcbcrConversionKHR(void *args) { struct vkDestroySamplerYcbcrConversionKHR_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->ycbcrConversion), params->pAllocator); @@ -8180,7 +11431,21 @@ static NTSTATUS wine_vkDestroySamplerYcbcrConversionKHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroySemaphore(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroySemaphore(void *args) +{ + struct vkDestroySemaphore_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->semaphore), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroySemaphore(wine_device_from_handle(params->device)->device, params->semaphore, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroySemaphore(void *args) { struct vkDestroySemaphore_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->semaphore), params->pAllocator); @@ -8188,7 +11453,21 @@ static NTSTATUS wine_vkDestroySemaphore(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyShaderModule(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyShaderModule(void *args) +{ + struct vkDestroyShaderModule_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->shaderModule), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyShaderModule(wine_device_from_handle(params->device)->device, params->shaderModule, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyShaderModule(void *args) { struct vkDestroyShaderModule_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->shaderModule), params->pAllocator); @@ -8196,7 +11475,21 @@ static NTSTATUS wine_vkDestroyShaderModule(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroySwapchainKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroySwapchainKHR(void *args) +{ + struct vkDestroySwapchainKHR_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->swapchain), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroySwapchainKHR(wine_device_from_handle(params->device)->device, params->swapchain, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroySwapchainKHR(void *args) { struct vkDestroySwapchainKHR_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->swapchain), params->pAllocator); @@ -8204,7 +11497,21 @@ static NTSTATUS wine_vkDestroySwapchainKHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDestroyValidationCacheEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyValidationCacheEXT(void *args) +{ + struct vkDestroyValidationCacheEXT_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->validationCache), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyValidationCacheEXT(wine_device_from_handle(params->device)->device, params->validationCache, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyValidationCacheEXT(void *args) { struct vkDestroyValidationCacheEXT_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->validationCache), params->pAllocator); @@ -8212,31 +11519,82 @@ static NTSTATUS wine_vkDestroyValidationCacheEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkDeviceWaitIdle(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDeviceWaitIdle(void *args) +{ + struct vkDeviceWaitIdle_params *params = args; + TRACE("%p\n", params->device); + return wine_device_from_handle(params->device)->funcs.p_vkDeviceWaitIdle(wine_device_from_handle(params->device)->device); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDeviceWaitIdle(void *args) { struct vkDeviceWaitIdle_params *params = args; TRACE("%p\n", params->device); return wine_device_from_handle(params->device)->funcs.p_vkDeviceWaitIdle(wine_device_from_handle(params->device)->device); } -static NTSTATUS wine_vkEndCommandBuffer(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkEndCommandBuffer(void *args) +{ + struct vkEndCommandBuffer_params *params = args; + TRACE("%p\n", params->commandBuffer); + return wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkEndCommandBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkEndCommandBuffer(void *args) { struct vkEndCommandBuffer_params *params = args; TRACE("%p\n", params->commandBuffer); return wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkEndCommandBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); } -static NTSTATUS wine_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(void *args) +{ + struct vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR_params *params = args; + TRACE("%p, %u, %p, %p, %p\n", params->physicalDevice, params->queueFamilyIndex, params->pCounterCount, params->pCounters, params->pCounterDescriptions); + return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex, params->pCounterCount, params->pCounters, params->pCounterDescriptions); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(void *args) { struct vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR_params *params = args; TRACE("%p, %u, %p, %p, %p\n", params->physicalDevice, params->queueFamilyIndex, params->pCounterCount, params->pCounters, params->pCounterDescriptions); return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex, params->pCounterCount, params->pCounters, params->pCounterDescriptions); } -static NTSTATUS wine_vkFlushMappedMemoryRanges(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkFlushMappedMemoryRanges(void *args) +{ + struct vkFlushMappedMemoryRanges_params *params = args; + TRACE("%p, %u, %p\n", params->device, params->memoryRangeCount, params->pMemoryRanges); + return wine_device_from_handle(params->device)->funcs.p_vkFlushMappedMemoryRanges(wine_device_from_handle(params->device)->device, params->memoryRangeCount, params->pMemoryRanges); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkFlushMappedMemoryRanges(void *args) { struct vkFlushMappedMemoryRanges_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkMappedMemoryRange_host *pMemoryRanges_host; TRACE("%p, %u, %p\n", params->device, params->memoryRangeCount, params->pMemoryRanges); @@ -8246,20 +11604,43 @@ static NTSTATUS wine_vkFlushMappedMemoryRanges(void *args) free_VkMappedMemoryRange_array(pMemoryRanges_host, params->memoryRangeCount); return result; -#else - TRACE("%p, %u, %p\n", params->device, params->memoryRangeCount, params->pMemoryRanges); - return wine_device_from_handle(params->device)->funcs.p_vkFlushMappedMemoryRanges(wine_device_from_handle(params->device)->device, params->memoryRangeCount, params->pMemoryRanges); -#endif } -static NTSTATUS wine_vkFreeDescriptorSets(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkFreeDescriptorSets(void *args) +{ + struct vkFreeDescriptorSets_params *params = args; + TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->descriptorPool), params->descriptorSetCount, params->pDescriptorSets); + return wine_device_from_handle(params->device)->funcs.p_vkFreeDescriptorSets(wine_device_from_handle(params->device)->device, params->descriptorPool, params->descriptorSetCount, params->pDescriptorSets); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkFreeDescriptorSets(void *args) { struct vkFreeDescriptorSets_params *params = args; TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->descriptorPool), params->descriptorSetCount, params->pDescriptorSets); return wine_device_from_handle(params->device)->funcs.p_vkFreeDescriptorSets(wine_device_from_handle(params->device)->device, params->descriptorPool, params->descriptorSetCount, params->pDescriptorSets); } -static NTSTATUS wine_vkFreeMemory(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkFreeMemory(void *args) +{ + struct vkFreeMemory_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->memory), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkFreeMemory(wine_device_from_handle(params->device)->device, params->memory, NULL); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkFreeMemory(void *args) { struct vkFreeMemory_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->memory), params->pAllocator); @@ -8267,10 +11648,23 @@ static NTSTATUS wine_vkFreeMemory(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetAccelerationStructureBuildSizesKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetAccelerationStructureBuildSizesKHR(void *args) +{ + struct vkGetAccelerationStructureBuildSizesKHR_params *params = args; + TRACE("%p, %#x, %p, %p, %p\n", params->device, params->buildType, params->pBuildInfo, params->pMaxPrimitiveCounts, params->pSizeInfo); + wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureBuildSizesKHR(wine_device_from_handle(params->device)->device, params->buildType, params->pBuildInfo, params->pMaxPrimitiveCounts, params->pSizeInfo); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetAccelerationStructureBuildSizesKHR(void *args) { struct vkGetAccelerationStructureBuildSizesKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkAccelerationStructureBuildGeometryInfoKHR_host pBuildInfo_host; VkAccelerationStructureBuildSizesInfoKHR_host pSizeInfo_host; TRACE("%p, %#x, %p, %p, %p\n", params->device, params->buildType, params->pBuildInfo, params->pMaxPrimitiveCounts, params->pSizeInfo); @@ -8280,17 +11674,25 @@ static NTSTATUS wine_vkGetAccelerationStructureBuildSizesKHR(void *args) wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureBuildSizesKHR(wine_device_from_handle(params->device)->device, params->buildType, &pBuildInfo_host, params->pMaxPrimitiveCounts, &pSizeInfo_host); return STATUS_SUCCESS; -#else - TRACE("%p, %#x, %p, %p, %p\n", params->device, params->buildType, params->pBuildInfo, params->pMaxPrimitiveCounts, params->pSizeInfo); - wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureBuildSizesKHR(wine_device_from_handle(params->device)->device, params->buildType, params->pBuildInfo, params->pMaxPrimitiveCounts, params->pSizeInfo); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetAccelerationStructureDeviceAddressKHR(void *args) +{ + struct vkGetAccelerationStructureDeviceAddressKHR_params *params = args; + TRACE("%p, %p\n", params->device, params->pInfo); + params->result = wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureDeviceAddressKHR(wine_device_from_handle(params->device)->device, params->pInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetAccelerationStructureDeviceAddressKHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetAccelerationStructureDeviceAddressKHR(void *args) { struct vkGetAccelerationStructureDeviceAddressKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkAccelerationStructureDeviceAddressInfoKHR_host pInfo_host; TRACE("%p, %p\n", params->device, params->pInfo); @@ -8298,24 +11700,45 @@ static NTSTATUS wine_vkGetAccelerationStructureDeviceAddressKHR(void *args) params->result = wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureDeviceAddressKHR(wine_device_from_handle(params->device)->device, &pInfo_host); return STATUS_SUCCESS; -#else - TRACE("%p, %p\n", params->device, params->pInfo); - params->result = wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureDeviceAddressKHR(wine_device_from_handle(params->device)->device, params->pInfo); - return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetAccelerationStructureHandleNV(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetAccelerationStructureHandleNV(void *args) +{ + struct vkGetAccelerationStructureHandleNV_params *params = args; + TRACE("%p, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->accelerationStructure), wine_dbgstr_longlong(params->dataSize), params->pData); + return wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureHandleNV(wine_device_from_handle(params->device)->device, params->accelerationStructure, params->dataSize, params->pData); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetAccelerationStructureHandleNV(void *args) { struct vkGetAccelerationStructureHandleNV_params *params = args; TRACE("%p, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->accelerationStructure), wine_dbgstr_longlong(params->dataSize), params->pData); return wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureHandleNV(wine_device_from_handle(params->device)->device, params->accelerationStructure, params->dataSize, params->pData); } -static NTSTATUS wine_vkGetAccelerationStructureMemoryRequirementsNV(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetAccelerationStructureMemoryRequirementsNV(void *args) +{ + struct vkGetAccelerationStructureMemoryRequirementsNV_params *params = args; + TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureMemoryRequirementsNV(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetAccelerationStructureMemoryRequirementsNV(void *args) { struct vkGetAccelerationStructureMemoryRequirementsNV_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkAccelerationStructureMemoryRequirementsInfoNV_host pInfo_host; VkMemoryRequirements2KHR_host pMemoryRequirements_host; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); @@ -8326,17 +11749,25 @@ static NTSTATUS wine_vkGetAccelerationStructureMemoryRequirementsNV(void *args) convert_VkMemoryRequirements2KHR_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); return STATUS_SUCCESS; -#else - TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); - wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureMemoryRequirementsNV(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetBufferDeviceAddress(void *args) +{ + struct vkGetBufferDeviceAddress_params *params = args; + TRACE("%p, %p\n", params->device, params->pInfo); + params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferDeviceAddress(wine_device_from_handle(params->device)->device, params->pInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetBufferDeviceAddress(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetBufferDeviceAddress(void *args) { struct vkGetBufferDeviceAddress_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkBufferDeviceAddressInfo_host pInfo_host; TRACE("%p, %p\n", params->device, params->pInfo); @@ -8344,17 +11775,25 @@ static NTSTATUS wine_vkGetBufferDeviceAddress(void *args) params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferDeviceAddress(wine_device_from_handle(params->device)->device, &pInfo_host); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetBufferDeviceAddressEXT(void *args) +{ + struct vkGetBufferDeviceAddressEXT_params *params = args; TRACE("%p, %p\n", params->device, params->pInfo); - params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferDeviceAddress(wine_device_from_handle(params->device)->device, params->pInfo); + params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferDeviceAddressEXT(wine_device_from_handle(params->device)->device, params->pInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetBufferDeviceAddressEXT(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetBufferDeviceAddressEXT(void *args) { struct vkGetBufferDeviceAddressEXT_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkBufferDeviceAddressInfo_host pInfo_host; TRACE("%p, %p\n", params->device, params->pInfo); @@ -8362,17 +11801,25 @@ static NTSTATUS wine_vkGetBufferDeviceAddressEXT(void *args) params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferDeviceAddressEXT(wine_device_from_handle(params->device)->device, &pInfo_host); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetBufferDeviceAddressKHR(void *args) +{ + struct vkGetBufferDeviceAddressKHR_params *params = args; TRACE("%p, %p\n", params->device, params->pInfo); - params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferDeviceAddressEXT(wine_device_from_handle(params->device)->device, params->pInfo); + params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferDeviceAddressKHR(wine_device_from_handle(params->device)->device, params->pInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetBufferDeviceAddressKHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetBufferDeviceAddressKHR(void *args) { struct vkGetBufferDeviceAddressKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkBufferDeviceAddressInfo_host pInfo_host; TRACE("%p, %p\n", params->device, params->pInfo); @@ -8380,17 +11827,25 @@ static NTSTATUS wine_vkGetBufferDeviceAddressKHR(void *args) params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferDeviceAddressKHR(wine_device_from_handle(params->device)->device, &pInfo_host); return STATUS_SUCCESS; -#else - TRACE("%p, %p\n", params->device, params->pInfo); - params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferDeviceAddressKHR(wine_device_from_handle(params->device)->device, params->pInfo); - return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetBufferMemoryRequirements(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetBufferMemoryRequirements(void *args) +{ + struct vkGetBufferMemoryRequirements_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->buffer), params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetBufferMemoryRequirements(wine_device_from_handle(params->device)->device, params->buffer, params->pMemoryRequirements); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetBufferMemoryRequirements(void *args) { struct vkGetBufferMemoryRequirements_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkMemoryRequirements_host pMemoryRequirements_host; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->buffer), params->pMemoryRequirements); @@ -8398,17 +11853,25 @@ static NTSTATUS wine_vkGetBufferMemoryRequirements(void *args) convert_VkMemoryRequirements_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); return STATUS_SUCCESS; -#else - TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->buffer), params->pMemoryRequirements); - wine_device_from_handle(params->device)->funcs.p_vkGetBufferMemoryRequirements(wine_device_from_handle(params->device)->device, params->buffer, params->pMemoryRequirements); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetBufferMemoryRequirements2(void *args) +{ + struct vkGetBufferMemoryRequirements2_params *params = args; + TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetBufferMemoryRequirements2(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetBufferMemoryRequirements2(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetBufferMemoryRequirements2(void *args) { struct vkGetBufferMemoryRequirements2_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkBufferMemoryRequirementsInfo2_host pInfo_host; VkMemoryRequirements2_host pMemoryRequirements_host; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); @@ -8419,17 +11882,25 @@ static NTSTATUS wine_vkGetBufferMemoryRequirements2(void *args) convert_VkMemoryRequirements2_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetBufferMemoryRequirements2KHR(void *args) +{ + struct vkGetBufferMemoryRequirements2KHR_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); - wine_device_from_handle(params->device)->funcs.p_vkGetBufferMemoryRequirements2(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetBufferMemoryRequirements2KHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetBufferMemoryRequirements2KHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetBufferMemoryRequirements2KHR(void *args) { struct vkGetBufferMemoryRequirements2KHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkBufferMemoryRequirementsInfo2_host pInfo_host; VkMemoryRequirements2_host pMemoryRequirements_host; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); @@ -8440,17 +11911,25 @@ static NTSTATUS wine_vkGetBufferMemoryRequirements2KHR(void *args) convert_VkMemoryRequirements2_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); return STATUS_SUCCESS; -#else - TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); - wine_device_from_handle(params->device)->funcs.p_vkGetBufferMemoryRequirements2KHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetBufferOpaqueCaptureAddress(void *args) +{ + struct vkGetBufferOpaqueCaptureAddress_params *params = args; + TRACE("%p, %p\n", params->device, params->pInfo); + params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferOpaqueCaptureAddress(wine_device_from_handle(params->device)->device, params->pInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetBufferOpaqueCaptureAddress(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetBufferOpaqueCaptureAddress(void *args) { struct vkGetBufferOpaqueCaptureAddress_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkBufferDeviceAddressInfo_host pInfo_host; TRACE("%p, %p\n", params->device, params->pInfo); @@ -8458,17 +11937,25 @@ static NTSTATUS wine_vkGetBufferOpaqueCaptureAddress(void *args) params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferOpaqueCaptureAddress(wine_device_from_handle(params->device)->device, &pInfo_host); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetBufferOpaqueCaptureAddressKHR(void *args) +{ + struct vkGetBufferOpaqueCaptureAddressKHR_params *params = args; TRACE("%p, %p\n", params->device, params->pInfo); - params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferOpaqueCaptureAddress(wine_device_from_handle(params->device)->device, params->pInfo); + params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferOpaqueCaptureAddressKHR(wine_device_from_handle(params->device)->device, params->pInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetBufferOpaqueCaptureAddressKHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetBufferOpaqueCaptureAddressKHR(void *args) { struct vkGetBufferOpaqueCaptureAddressKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkBufferDeviceAddressInfo_host pInfo_host; TRACE("%p, %p\n", params->device, params->pInfo); @@ -8476,28 +11963,63 @@ static NTSTATUS wine_vkGetBufferOpaqueCaptureAddressKHR(void *args) params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferOpaqueCaptureAddressKHR(wine_device_from_handle(params->device)->device, &pInfo_host); return STATUS_SUCCESS; -#else - TRACE("%p, %p\n", params->device, params->pInfo); - params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferOpaqueCaptureAddressKHR(wine_device_from_handle(params->device)->device, params->pInfo); - return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetDeferredOperationMaxConcurrencyKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDeferredOperationMaxConcurrencyKHR(void *args) +{ + struct vkGetDeferredOperationMaxConcurrencyKHR_params *params = args; + TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->operation)); + return wine_device_from_handle(params->device)->funcs.p_vkGetDeferredOperationMaxConcurrencyKHR(wine_device_from_handle(params->device)->device, params->operation); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDeferredOperationMaxConcurrencyKHR(void *args) { struct vkGetDeferredOperationMaxConcurrencyKHR_params *params = args; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->operation)); return wine_device_from_handle(params->device)->funcs.p_vkGetDeferredOperationMaxConcurrencyKHR(wine_device_from_handle(params->device)->device, params->operation); } -static NTSTATUS wine_vkGetDeferredOperationResultKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDeferredOperationResultKHR(void *args) +{ + struct vkGetDeferredOperationResultKHR_params *params = args; + TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->operation)); + return wine_device_from_handle(params->device)->funcs.p_vkGetDeferredOperationResultKHR(wine_device_from_handle(params->device)->device, params->operation); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDeferredOperationResultKHR(void *args) { struct vkGetDeferredOperationResultKHR_params *params = args; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->operation)); return wine_device_from_handle(params->device)->funcs.p_vkGetDeferredOperationResultKHR(wine_device_from_handle(params->device)->device, params->operation); } -static NTSTATUS wine_vkGetDescriptorSetHostMappingVALVE(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDescriptorSetHostMappingVALVE(void *args) +{ + struct vkGetDescriptorSetHostMappingVALVE_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSet), params->ppData); + wine_device_from_handle(params->device)->funcs.p_vkGetDescriptorSetHostMappingVALVE(wine_device_from_handle(params->device)->device, params->descriptorSet, params->ppData); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDescriptorSetHostMappingVALVE(void *args) { struct vkGetDescriptorSetHostMappingVALVE_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSet), params->ppData); @@ -8505,10 +12027,23 @@ static NTSTATUS wine_vkGetDescriptorSetHostMappingVALVE(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetDescriptorSetLayoutHostMappingInfoVALVE(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDescriptorSetLayoutHostMappingInfoVALVE(void *args) +{ + struct vkGetDescriptorSetLayoutHostMappingInfoVALVE_params *params = args; + TRACE("%p, %p, %p\n", params->device, params->pBindingReference, params->pHostMapping); + wine_device_from_handle(params->device)->funcs.p_vkGetDescriptorSetLayoutHostMappingInfoVALVE(wine_device_from_handle(params->device)->device, params->pBindingReference, params->pHostMapping); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDescriptorSetLayoutHostMappingInfoVALVE(void *args) { struct vkGetDescriptorSetLayoutHostMappingInfoVALVE_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkDescriptorSetBindingReferenceVALVE_host pBindingReference_host; TRACE("%p, %p, %p\n", params->device, params->pBindingReference, params->pHostMapping); @@ -8516,14 +12051,23 @@ static NTSTATUS wine_vkGetDescriptorSetLayoutHostMappingInfoVALVE(void *args) wine_device_from_handle(params->device)->funcs.p_vkGetDescriptorSetLayoutHostMappingInfoVALVE(wine_device_from_handle(params->device)->device, &pBindingReference_host, params->pHostMapping); return STATUS_SUCCESS; -#else - TRACE("%p, %p, %p\n", params->device, params->pBindingReference, params->pHostMapping); - wine_device_from_handle(params->device)->funcs.p_vkGetDescriptorSetLayoutHostMappingInfoVALVE(wine_device_from_handle(params->device)->device, params->pBindingReference, params->pHostMapping); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDescriptorSetLayoutSupport(void *args) +{ + struct vkGetDescriptorSetLayoutSupport_params *params = args; + TRACE("%p, %p, %p\n", params->device, params->pCreateInfo, params->pSupport); + wine_device_from_handle(params->device)->funcs.p_vkGetDescriptorSetLayoutSupport(wine_device_from_handle(params->device)->device, params->pCreateInfo, params->pSupport); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetDescriptorSetLayoutSupport(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDescriptorSetLayoutSupport(void *args) { struct vkGetDescriptorSetLayoutSupport_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pCreateInfo, params->pSupport); @@ -8531,7 +12075,21 @@ static NTSTATUS wine_vkGetDescriptorSetLayoutSupport(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetDescriptorSetLayoutSupportKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDescriptorSetLayoutSupportKHR(void *args) +{ + struct vkGetDescriptorSetLayoutSupportKHR_params *params = args; + TRACE("%p, %p, %p\n", params->device, params->pCreateInfo, params->pSupport); + wine_device_from_handle(params->device)->funcs.p_vkGetDescriptorSetLayoutSupportKHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, params->pSupport); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDescriptorSetLayoutSupportKHR(void *args) { struct vkGetDescriptorSetLayoutSupportKHR_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pCreateInfo, params->pSupport); @@ -8539,7 +12097,21 @@ static NTSTATUS wine_vkGetDescriptorSetLayoutSupportKHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetDeviceAccelerationStructureCompatibilityKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDeviceAccelerationStructureCompatibilityKHR(void *args) +{ + struct vkGetDeviceAccelerationStructureCompatibilityKHR_params *params = args; + TRACE("%p, %p, %p\n", params->device, params->pVersionInfo, params->pCompatibility); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceAccelerationStructureCompatibilityKHR(wine_device_from_handle(params->device)->device, params->pVersionInfo, params->pCompatibility); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDeviceAccelerationStructureCompatibilityKHR(void *args) { struct vkGetDeviceAccelerationStructureCompatibilityKHR_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pVersionInfo, params->pCompatibility); @@ -8547,10 +12119,23 @@ static NTSTATUS wine_vkGetDeviceAccelerationStructureCompatibilityKHR(void *args return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetDeviceBufferMemoryRequirements(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDeviceBufferMemoryRequirements(void *args) +{ + struct vkGetDeviceBufferMemoryRequirements_params *params = args; + TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceBufferMemoryRequirements(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDeviceBufferMemoryRequirements(void *args) { struct vkGetDeviceBufferMemoryRequirements_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkDeviceBufferMemoryRequirements_host pInfo_host; VkMemoryRequirements2_host pMemoryRequirements_host; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); @@ -8562,17 +12147,25 @@ static NTSTATUS wine_vkGetDeviceBufferMemoryRequirements(void *args) convert_VkMemoryRequirements2_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); free_VkDeviceBufferMemoryRequirements(&pInfo_host); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDeviceBufferMemoryRequirementsKHR(void *args) +{ + struct vkGetDeviceBufferMemoryRequirementsKHR_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); - wine_device_from_handle(params->device)->funcs.p_vkGetDeviceBufferMemoryRequirements(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceBufferMemoryRequirementsKHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetDeviceBufferMemoryRequirementsKHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDeviceBufferMemoryRequirementsKHR(void *args) { struct vkGetDeviceBufferMemoryRequirementsKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkDeviceBufferMemoryRequirements_host pInfo_host; VkMemoryRequirements2_host pMemoryRequirements_host; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); @@ -8584,14 +12177,23 @@ static NTSTATUS wine_vkGetDeviceBufferMemoryRequirementsKHR(void *args) convert_VkMemoryRequirements2_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); free_VkDeviceBufferMemoryRequirements(&pInfo_host); return STATUS_SUCCESS; -#else - TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); - wine_device_from_handle(params->device)->funcs.p_vkGetDeviceBufferMemoryRequirementsKHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDeviceGroupPeerMemoryFeatures(void *args) +{ + struct vkGetDeviceGroupPeerMemoryFeatures_params *params = args; + TRACE("%p, %u, %u, %u, %p\n", params->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupPeerMemoryFeatures(wine_device_from_handle(params->device)->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetDeviceGroupPeerMemoryFeatures(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDeviceGroupPeerMemoryFeatures(void *args) { struct vkGetDeviceGroupPeerMemoryFeatures_params *params = args; TRACE("%p, %u, %u, %u, %p\n", params->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures); @@ -8599,7 +12201,21 @@ static NTSTATUS wine_vkGetDeviceGroupPeerMemoryFeatures(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetDeviceGroupPeerMemoryFeaturesKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDeviceGroupPeerMemoryFeaturesKHR(void *args) +{ + struct vkGetDeviceGroupPeerMemoryFeaturesKHR_params *params = args; + TRACE("%p, %u, %u, %u, %p\n", params->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupPeerMemoryFeaturesKHR(wine_device_from_handle(params->device)->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDeviceGroupPeerMemoryFeaturesKHR(void *args) { struct vkGetDeviceGroupPeerMemoryFeaturesKHR_params *params = args; TRACE("%p, %u, %u, %u, %p\n", params->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures); @@ -8607,24 +12223,63 @@ static NTSTATUS wine_vkGetDeviceGroupPeerMemoryFeaturesKHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetDeviceGroupPresentCapabilitiesKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDeviceGroupPresentCapabilitiesKHR(void *args) +{ + struct vkGetDeviceGroupPresentCapabilitiesKHR_params *params = args; + TRACE("%p, %p\n", params->device, params->pDeviceGroupPresentCapabilities); + return wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupPresentCapabilitiesKHR(wine_device_from_handle(params->device)->device, params->pDeviceGroupPresentCapabilities); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDeviceGroupPresentCapabilitiesKHR(void *args) { struct vkGetDeviceGroupPresentCapabilitiesKHR_params *params = args; TRACE("%p, %p\n", params->device, params->pDeviceGroupPresentCapabilities); return wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupPresentCapabilitiesKHR(wine_device_from_handle(params->device)->device, params->pDeviceGroupPresentCapabilities); } -static NTSTATUS wine_vkGetDeviceGroupSurfacePresentModesKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDeviceGroupSurfacePresentModesKHR(void *args) +{ + struct vkGetDeviceGroupSurfacePresentModesKHR_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->surface), params->pModes); + return wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupSurfacePresentModesKHR(wine_device_from_handle(params->device)->device, wine_surface_from_handle(params->surface)->driver_surface, params->pModes); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDeviceGroupSurfacePresentModesKHR(void *args) { struct vkGetDeviceGroupSurfacePresentModesKHR_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->surface), params->pModes); return wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupSurfacePresentModesKHR(wine_device_from_handle(params->device)->device, wine_surface_from_handle(params->surface)->driver_surface, params->pModes); } -static NTSTATUS wine_vkGetDeviceImageMemoryRequirements(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDeviceImageMemoryRequirements(void *args) +{ + struct vkGetDeviceImageMemoryRequirements_params *params = args; + TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceImageMemoryRequirements(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDeviceImageMemoryRequirements(void *args) { struct vkGetDeviceImageMemoryRequirements_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkMemoryRequirements2_host pMemoryRequirements_host; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); @@ -8633,17 +12288,25 @@ static NTSTATUS wine_vkGetDeviceImageMemoryRequirements(void *args) convert_VkMemoryRequirements2_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDeviceImageMemoryRequirementsKHR(void *args) +{ + struct vkGetDeviceImageMemoryRequirementsKHR_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); - wine_device_from_handle(params->device)->funcs.p_vkGetDeviceImageMemoryRequirements(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceImageMemoryRequirementsKHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetDeviceImageMemoryRequirementsKHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDeviceImageMemoryRequirementsKHR(void *args) { struct vkGetDeviceImageMemoryRequirementsKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkMemoryRequirements2_host pMemoryRequirements_host; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); @@ -8652,14 +12315,23 @@ static NTSTATUS wine_vkGetDeviceImageMemoryRequirementsKHR(void *args) convert_VkMemoryRequirements2_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); return STATUS_SUCCESS; -#else - TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); - wine_device_from_handle(params->device)->funcs.p_vkGetDeviceImageMemoryRequirementsKHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDeviceImageSparseMemoryRequirements(void *args) +{ + struct vkGetDeviceImageSparseMemoryRequirements_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceImageSparseMemoryRequirements(wine_device_from_handle(params->device)->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetDeviceImageSparseMemoryRequirements(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDeviceImageSparseMemoryRequirements(void *args) { struct vkGetDeviceImageSparseMemoryRequirements_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); @@ -8667,7 +12339,21 @@ static NTSTATUS wine_vkGetDeviceImageSparseMemoryRequirements(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetDeviceImageSparseMemoryRequirementsKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDeviceImageSparseMemoryRequirementsKHR(void *args) +{ + struct vkGetDeviceImageSparseMemoryRequirementsKHR_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceImageSparseMemoryRequirementsKHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDeviceImageSparseMemoryRequirementsKHR(void *args) { struct vkGetDeviceImageSparseMemoryRequirementsKHR_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); @@ -8675,7 +12361,21 @@ static NTSTATUS wine_vkGetDeviceImageSparseMemoryRequirementsKHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetDeviceMemoryCommitment(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDeviceMemoryCommitment(void *args) +{ + struct vkGetDeviceMemoryCommitment_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->memory), params->pCommittedMemoryInBytes); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceMemoryCommitment(wine_device_from_handle(params->device)->device, params->memory, params->pCommittedMemoryInBytes); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDeviceMemoryCommitment(void *args) { struct vkGetDeviceMemoryCommitment_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->memory), params->pCommittedMemoryInBytes); @@ -8683,10 +12383,23 @@ static NTSTATUS wine_vkGetDeviceMemoryCommitment(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetDeviceMemoryOpaqueCaptureAddress(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDeviceMemoryOpaqueCaptureAddress(void *args) +{ + struct vkGetDeviceMemoryOpaqueCaptureAddress_params *params = args; + TRACE("%p, %p\n", params->device, params->pInfo); + params->result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceMemoryOpaqueCaptureAddress(wine_device_from_handle(params->device)->device, params->pInfo); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDeviceMemoryOpaqueCaptureAddress(void *args) { struct vkGetDeviceMemoryOpaqueCaptureAddress_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkDeviceMemoryOpaqueCaptureAddressInfo_host pInfo_host; TRACE("%p, %p\n", params->device, params->pInfo); @@ -8694,17 +12407,25 @@ static NTSTATUS wine_vkGetDeviceMemoryOpaqueCaptureAddress(void *args) params->result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceMemoryOpaqueCaptureAddress(wine_device_from_handle(params->device)->device, &pInfo_host); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDeviceMemoryOpaqueCaptureAddressKHR(void *args) +{ + struct vkGetDeviceMemoryOpaqueCaptureAddressKHR_params *params = args; TRACE("%p, %p\n", params->device, params->pInfo); - params->result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceMemoryOpaqueCaptureAddress(wine_device_from_handle(params->device)->device, params->pInfo); + params->result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceMemoryOpaqueCaptureAddressKHR(wine_device_from_handle(params->device)->device, params->pInfo); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetDeviceMemoryOpaqueCaptureAddressKHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDeviceMemoryOpaqueCaptureAddressKHR(void *args) { struct vkGetDeviceMemoryOpaqueCaptureAddressKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkDeviceMemoryOpaqueCaptureAddressInfo_host pInfo_host; TRACE("%p, %p\n", params->device, params->pInfo); @@ -8712,24 +12433,44 @@ static NTSTATUS wine_vkGetDeviceMemoryOpaqueCaptureAddressKHR(void *args) params->result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceMemoryOpaqueCaptureAddressKHR(wine_device_from_handle(params->device)->device, &pInfo_host); return STATUS_SUCCESS; -#else - TRACE("%p, %p\n", params->device, params->pInfo); - params->result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceMemoryOpaqueCaptureAddressKHR(wine_device_from_handle(params->device)->device, params->pInfo); - return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(void *args) +{ + struct vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->renderpass), params->pMaxWorkgroupSize); + return wine_device_from_handle(params->device)->funcs.p_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(wine_device_from_handle(params->device)->device, params->renderpass, params->pMaxWorkgroupSize); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(void *args) { struct vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->renderpass), params->pMaxWorkgroupSize); return wine_device_from_handle(params->device)->funcs.p_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(wine_device_from_handle(params->device)->device, params->renderpass, params->pMaxWorkgroupSize); } -static NTSTATUS wine_vkGetDynamicRenderingTilePropertiesQCOM(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDynamicRenderingTilePropertiesQCOM(void *args) +{ + struct vkGetDynamicRenderingTilePropertiesQCOM_params *params = args; + TRACE("%p, %p, %p\n", params->device, params->pRenderingInfo, params->pProperties); + return wine_device_from_handle(params->device)->funcs.p_vkGetDynamicRenderingTilePropertiesQCOM(wine_device_from_handle(params->device)->device, params->pRenderingInfo, params->pProperties); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDynamicRenderingTilePropertiesQCOM(void *args) { struct vkGetDynamicRenderingTilePropertiesQCOM_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkRenderingInfo_host pRenderingInfo_host; TRACE("%p, %p, %p\n", params->device, params->pRenderingInfo, params->pProperties); @@ -8739,37 +12480,85 @@ static NTSTATUS wine_vkGetDynamicRenderingTilePropertiesQCOM(void *args) free_VkRenderingInfo(&pRenderingInfo_host); return result; -#else - TRACE("%p, %p, %p\n", params->device, params->pRenderingInfo, params->pProperties); - return wine_device_from_handle(params->device)->funcs.p_vkGetDynamicRenderingTilePropertiesQCOM(wine_device_from_handle(params->device)->device, params->pRenderingInfo, params->pProperties); -#endif } -static NTSTATUS wine_vkGetEventStatus(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetEventStatus(void *args) +{ + struct vkGetEventStatus_params *params = args; + TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->event)); + return wine_device_from_handle(params->device)->funcs.p_vkGetEventStatus(wine_device_from_handle(params->device)->device, params->event); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetEventStatus(void *args) { struct vkGetEventStatus_params *params = args; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->event)); return wine_device_from_handle(params->device)->funcs.p_vkGetEventStatus(wine_device_from_handle(params->device)->device, params->event); } -static NTSTATUS wine_vkGetFenceStatus(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetFenceStatus(void *args) +{ + struct vkGetFenceStatus_params *params = args; + TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->fence)); + return wine_device_from_handle(params->device)->funcs.p_vkGetFenceStatus(wine_device_from_handle(params->device)->device, params->fence); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetFenceStatus(void *args) { struct vkGetFenceStatus_params *params = args; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->fence)); return wine_device_from_handle(params->device)->funcs.p_vkGetFenceStatus(wine_device_from_handle(params->device)->device, params->fence); } -static NTSTATUS wine_vkGetFramebufferTilePropertiesQCOM(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetFramebufferTilePropertiesQCOM(void *args) +{ + struct vkGetFramebufferTilePropertiesQCOM_params *params = args; + TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->framebuffer), params->pPropertiesCount, params->pProperties); + return wine_device_from_handle(params->device)->funcs.p_vkGetFramebufferTilePropertiesQCOM(wine_device_from_handle(params->device)->device, params->framebuffer, params->pPropertiesCount, params->pProperties); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetFramebufferTilePropertiesQCOM(void *args) { struct vkGetFramebufferTilePropertiesQCOM_params *params = args; TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->framebuffer), params->pPropertiesCount, params->pProperties); return wine_device_from_handle(params->device)->funcs.p_vkGetFramebufferTilePropertiesQCOM(wine_device_from_handle(params->device)->device, params->framebuffer, params->pPropertiesCount, params->pProperties); } -static NTSTATUS wine_vkGetGeneratedCommandsMemoryRequirementsNV(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetGeneratedCommandsMemoryRequirementsNV(void *args) +{ + struct vkGetGeneratedCommandsMemoryRequirementsNV_params *params = args; + TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetGeneratedCommandsMemoryRequirementsNV(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetGeneratedCommandsMemoryRequirementsNV(void *args) { struct vkGetGeneratedCommandsMemoryRequirementsNV_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkGeneratedCommandsMemoryRequirementsInfoNV_host pInfo_host; VkMemoryRequirements2_host pMemoryRequirements_host; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); @@ -8780,17 +12569,25 @@ static NTSTATUS wine_vkGetGeneratedCommandsMemoryRequirementsNV(void *args) convert_VkMemoryRequirements2_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); return STATUS_SUCCESS; -#else - TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); - wine_device_from_handle(params->device)->funcs.p_vkGetGeneratedCommandsMemoryRequirementsNV(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetImageMemoryRequirements(void *args) +{ + struct vkGetImageMemoryRequirements_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetImageMemoryRequirements(wine_device_from_handle(params->device)->device, params->image, params->pMemoryRequirements); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetImageMemoryRequirements(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetImageMemoryRequirements(void *args) { struct vkGetImageMemoryRequirements_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkMemoryRequirements_host pMemoryRequirements_host; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pMemoryRequirements); @@ -8798,17 +12595,25 @@ static NTSTATUS wine_vkGetImageMemoryRequirements(void *args) convert_VkMemoryRequirements_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); return STATUS_SUCCESS; -#else - TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pMemoryRequirements); - wine_device_from_handle(params->device)->funcs.p_vkGetImageMemoryRequirements(wine_device_from_handle(params->device)->device, params->image, params->pMemoryRequirements); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetImageMemoryRequirements2(void *args) +{ + struct vkGetImageMemoryRequirements2_params *params = args; + TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetImageMemoryRequirements2(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetImageMemoryRequirements2(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetImageMemoryRequirements2(void *args) { struct vkGetImageMemoryRequirements2_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkImageMemoryRequirementsInfo2_host pInfo_host; VkMemoryRequirements2_host pMemoryRequirements_host; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); @@ -8819,17 +12624,25 @@ static NTSTATUS wine_vkGetImageMemoryRequirements2(void *args) convert_VkMemoryRequirements2_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetImageMemoryRequirements2KHR(void *args) +{ + struct vkGetImageMemoryRequirements2KHR_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); - wine_device_from_handle(params->device)->funcs.p_vkGetImageMemoryRequirements2(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetImageMemoryRequirements2KHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetImageMemoryRequirements2KHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetImageMemoryRequirements2KHR(void *args) { struct vkGetImageMemoryRequirements2KHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkImageMemoryRequirementsInfo2_host pInfo_host; VkMemoryRequirements2_host pMemoryRequirements_host; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); @@ -8840,14 +12653,23 @@ static NTSTATUS wine_vkGetImageMemoryRequirements2KHR(void *args) convert_VkMemoryRequirements2_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); return STATUS_SUCCESS; -#else - TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); - wine_device_from_handle(params->device)->funcs.p_vkGetImageMemoryRequirements2KHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetImageSparseMemoryRequirements(void *args) +{ + struct vkGetImageSparseMemoryRequirements_params *params = args; + TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetImageSparseMemoryRequirements(wine_device_from_handle(params->device)->device, params->image, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetImageSparseMemoryRequirements(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetImageSparseMemoryRequirements(void *args) { struct vkGetImageSparseMemoryRequirements_params *params = args; TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); @@ -8855,10 +12677,23 @@ static NTSTATUS wine_vkGetImageSparseMemoryRequirements(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetImageSparseMemoryRequirements2(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetImageSparseMemoryRequirements2(void *args) +{ + struct vkGetImageSparseMemoryRequirements2_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetImageSparseMemoryRequirements2(wine_device_from_handle(params->device)->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetImageSparseMemoryRequirements2(void *args) { struct vkGetImageSparseMemoryRequirements2_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkImageSparseMemoryRequirementsInfo2_host pInfo_host; TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); @@ -8866,17 +12701,25 @@ static NTSTATUS wine_vkGetImageSparseMemoryRequirements2(void *args) wine_device_from_handle(params->device)->funcs.p_vkGetImageSparseMemoryRequirements2(wine_device_from_handle(params->device)->device, &pInfo_host, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetImageSparseMemoryRequirements2KHR(void *args) +{ + struct vkGetImageSparseMemoryRequirements2KHR_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); - wine_device_from_handle(params->device)->funcs.p_vkGetImageSparseMemoryRequirements2(wine_device_from_handle(params->device)->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetImageSparseMemoryRequirements2KHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetImageSparseMemoryRequirements2KHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetImageSparseMemoryRequirements2KHR(void *args) { struct vkGetImageSparseMemoryRequirements2KHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkImageSparseMemoryRequirementsInfo2_host pInfo_host; TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); @@ -8884,17 +12727,25 @@ static NTSTATUS wine_vkGetImageSparseMemoryRequirements2KHR(void *args) wine_device_from_handle(params->device)->funcs.p_vkGetImageSparseMemoryRequirements2KHR(wine_device_from_handle(params->device)->device, &pInfo_host, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); return STATUS_SUCCESS; -#else - TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); - wine_device_from_handle(params->device)->funcs.p_vkGetImageSparseMemoryRequirements2KHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetImageSubresourceLayout(void *args) +{ + struct vkGetImageSubresourceLayout_params *params = args; + TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pSubresource, params->pLayout); + wine_device_from_handle(params->device)->funcs.p_vkGetImageSubresourceLayout(wine_device_from_handle(params->device)->device, params->image, params->pSubresource, params->pLayout); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetImageSubresourceLayout(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetImageSubresourceLayout(void *args) { struct vkGetImageSubresourceLayout_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkSubresourceLayout_host pLayout_host; TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pSubresource, params->pLayout); @@ -8902,17 +12753,25 @@ static NTSTATUS wine_vkGetImageSubresourceLayout(void *args) convert_VkSubresourceLayout_host_to_win(&pLayout_host, params->pLayout); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetImageSubresourceLayout2EXT(void *args) +{ + struct vkGetImageSubresourceLayout2EXT_params *params = args; TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pSubresource, params->pLayout); - wine_device_from_handle(params->device)->funcs.p_vkGetImageSubresourceLayout(wine_device_from_handle(params->device)->device, params->image, params->pSubresource, params->pLayout); + wine_device_from_handle(params->device)->funcs.p_vkGetImageSubresourceLayout2EXT(wine_device_from_handle(params->device)->device, params->image, params->pSubresource, params->pLayout); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetImageSubresourceLayout2EXT(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetImageSubresourceLayout2EXT(void *args) { struct vkGetImageSubresourceLayout2EXT_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkSubresourceLayout2EXT_host pLayout_host; TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pSubresource, params->pLayout); @@ -8921,17 +12780,24 @@ static NTSTATUS wine_vkGetImageSubresourceLayout2EXT(void *args) convert_VkSubresourceLayout2EXT_host_to_win(&pLayout_host, params->pLayout); return STATUS_SUCCESS; -#else - TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pSubresource, params->pLayout); - wine_device_from_handle(params->device)->funcs.p_vkGetImageSubresourceLayout2EXT(wine_device_from_handle(params->device)->device, params->image, params->pSubresource, params->pLayout); - return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetImageViewAddressNVX(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetImageViewAddressNVX(void *args) +{ + struct vkGetImageViewAddressNVX_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->imageView), params->pProperties); + return wine_device_from_handle(params->device)->funcs.p_vkGetImageViewAddressNVX(wine_device_from_handle(params->device)->device, params->imageView, params->pProperties); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetImageViewAddressNVX(void *args) { struct vkGetImageViewAddressNVX_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkImageViewAddressPropertiesNVX_host pProperties_host; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->imageView), params->pProperties); @@ -8941,16 +12807,24 @@ static NTSTATUS wine_vkGetImageViewAddressNVX(void *args) convert_VkImageViewAddressPropertiesNVX_host_to_win(&pProperties_host, params->pProperties); return result; -#else - TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->imageView), params->pProperties); - return wine_device_from_handle(params->device)->funcs.p_vkGetImageViewAddressNVX(wine_device_from_handle(params->device)->device, params->imageView, params->pProperties); -#endif } -static NTSTATUS wine_vkGetImageViewHandleNVX(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetImageViewHandleNVX(void *args) +{ + struct vkGetImageViewHandleNVX_params *params = args; + TRACE("%p, %p\n", params->device, params->pInfo); + return wine_device_from_handle(params->device)->funcs.p_vkGetImageViewHandleNVX(wine_device_from_handle(params->device)->device, params->pInfo); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetImageViewHandleNVX(void *args) { struct vkGetImageViewHandleNVX_params *params = args; -#if defined(USE_STRUCT_CONVERSION) uint32_t result; VkImageViewHandleInfoNVX_host pInfo_host; TRACE("%p, %p\n", params->device, params->pInfo); @@ -8959,34 +12833,83 @@ static NTSTATUS wine_vkGetImageViewHandleNVX(void *args) result = wine_device_from_handle(params->device)->funcs.p_vkGetImageViewHandleNVX(wine_device_from_handle(params->device)->device, &pInfo_host); return result; -#else - TRACE("%p, %p\n", params->device, params->pInfo); - return wine_device_from_handle(params->device)->funcs.p_vkGetImageViewHandleNVX(wine_device_from_handle(params->device)->device, params->pInfo); -#endif } -static NTSTATUS wine_vkGetMemoryHostPointerPropertiesEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetMemoryHostPointerPropertiesEXT(void *args) +{ + struct vkGetMemoryHostPointerPropertiesEXT_params *params = args; + TRACE("%p, %#x, %p, %p\n", params->device, params->handleType, params->pHostPointer, params->pMemoryHostPointerProperties); + return wine_device_from_handle(params->device)->funcs.p_vkGetMemoryHostPointerPropertiesEXT(wine_device_from_handle(params->device)->device, params->handleType, params->pHostPointer, params->pMemoryHostPointerProperties); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetMemoryHostPointerPropertiesEXT(void *args) { struct vkGetMemoryHostPointerPropertiesEXT_params *params = args; TRACE("%p, %#x, %p, %p\n", params->device, params->handleType, params->pHostPointer, params->pMemoryHostPointerProperties); return wine_device_from_handle(params->device)->funcs.p_vkGetMemoryHostPointerPropertiesEXT(wine_device_from_handle(params->device)->device, params->handleType, params->pHostPointer, params->pMemoryHostPointerProperties); } -static NTSTATUS wine_vkGetPerformanceParameterINTEL(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPerformanceParameterINTEL(void *args) +{ + struct vkGetPerformanceParameterINTEL_params *params = args; + TRACE("%p, %#x, %p\n", params->device, params->parameter, params->pValue); + return wine_device_from_handle(params->device)->funcs.p_vkGetPerformanceParameterINTEL(wine_device_from_handle(params->device)->device, params->parameter, params->pValue); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPerformanceParameterINTEL(void *args) { struct vkGetPerformanceParameterINTEL_params *params = args; TRACE("%p, %#x, %p\n", params->device, params->parameter, params->pValue); return wine_device_from_handle(params->device)->funcs.p_vkGetPerformanceParameterINTEL(wine_device_from_handle(params->device)->device, params->parameter, params->pValue); } -static NTSTATUS wine_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(void *args) +{ + struct vkGetPhysicalDeviceCooperativeMatrixPropertiesNV_params *params = args; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pPropertyCount, params->pProperties); + return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pPropertyCount, params->pProperties); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(void *args) { struct vkGetPhysicalDeviceCooperativeMatrixPropertiesNV_params *params = args; TRACE("%p, %p, %p\n", params->physicalDevice, params->pPropertyCount, params->pProperties); return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pPropertyCount, params->pProperties); } -static NTSTATUS wine_vkGetPhysicalDeviceFeatures(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceFeatures(void *args) +{ + struct vkGetPhysicalDeviceFeatures_params *params = args; + TRACE("%p, %p\n", params->physicalDevice, params->pFeatures); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFeatures(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFeatures); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceFeatures(void *args) { struct vkGetPhysicalDeviceFeatures_params *params = args; TRACE("%p, %p\n", params->physicalDevice, params->pFeatures); @@ -8994,7 +12917,21 @@ static NTSTATUS wine_vkGetPhysicalDeviceFeatures(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetPhysicalDeviceFeatures2(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceFeatures2(void *args) +{ + struct vkGetPhysicalDeviceFeatures2_params *params = args; + TRACE("%p, %p\n", params->physicalDevice, params->pFeatures); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFeatures2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFeatures); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceFeatures2(void *args) { struct vkGetPhysicalDeviceFeatures2_params *params = args; TRACE("%p, %p\n", params->physicalDevice, params->pFeatures); @@ -9002,7 +12939,21 @@ static NTSTATUS wine_vkGetPhysicalDeviceFeatures2(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetPhysicalDeviceFeatures2KHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceFeatures2KHR(void *args) +{ + struct vkGetPhysicalDeviceFeatures2KHR_params *params = args; + TRACE("%p, %p\n", params->physicalDevice, params->pFeatures); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFeatures2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFeatures); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceFeatures2KHR(void *args) { struct vkGetPhysicalDeviceFeatures2KHR_params *params = args; TRACE("%p, %p\n", params->physicalDevice, params->pFeatures); @@ -9010,7 +12961,21 @@ static NTSTATUS wine_vkGetPhysicalDeviceFeatures2KHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetPhysicalDeviceFormatProperties(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceFormatProperties(void *args) +{ + struct vkGetPhysicalDeviceFormatProperties_params *params = args; + TRACE("%p, %#x, %p\n", params->physicalDevice, params->format, params->pFormatProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFormatProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->pFormatProperties); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceFormatProperties(void *args) { struct vkGetPhysicalDeviceFormatProperties_params *params = args; TRACE("%p, %#x, %p\n", params->physicalDevice, params->format, params->pFormatProperties); @@ -9018,7 +12983,21 @@ static NTSTATUS wine_vkGetPhysicalDeviceFormatProperties(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetPhysicalDeviceFormatProperties2(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceFormatProperties2(void *args) +{ + struct vkGetPhysicalDeviceFormatProperties2_params *params = args; + TRACE("%p, %#x, %p\n", params->physicalDevice, params->format, params->pFormatProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFormatProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->pFormatProperties); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceFormatProperties2(void *args) { struct vkGetPhysicalDeviceFormatProperties2_params *params = args; TRACE("%p, %#x, %p\n", params->physicalDevice, params->format, params->pFormatProperties); @@ -9026,7 +13005,21 @@ static NTSTATUS wine_vkGetPhysicalDeviceFormatProperties2(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetPhysicalDeviceFormatProperties2KHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceFormatProperties2KHR(void *args) +{ + struct vkGetPhysicalDeviceFormatProperties2KHR_params *params = args; + TRACE("%p, %#x, %p\n", params->physicalDevice, params->format, params->pFormatProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFormatProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->pFormatProperties); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceFormatProperties2KHR(void *args) { struct vkGetPhysicalDeviceFormatProperties2KHR_params *params = args; TRACE("%p, %#x, %p\n", params->physicalDevice, params->format, params->pFormatProperties); @@ -9034,17 +13027,42 @@ static NTSTATUS wine_vkGetPhysicalDeviceFormatProperties2KHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetPhysicalDeviceFragmentShadingRatesKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceFragmentShadingRatesKHR(void *args) +{ + struct vkGetPhysicalDeviceFragmentShadingRatesKHR_params *params = args; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pFragmentShadingRateCount, params->pFragmentShadingRates); + return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFragmentShadingRatesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFragmentShadingRateCount, params->pFragmentShadingRates); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceFragmentShadingRatesKHR(void *args) { struct vkGetPhysicalDeviceFragmentShadingRatesKHR_params *params = args; TRACE("%p, %p, %p\n", params->physicalDevice, params->pFragmentShadingRateCount, params->pFragmentShadingRates); return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFragmentShadingRatesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFragmentShadingRateCount, params->pFragmentShadingRates); } -static NTSTATUS wine_vkGetPhysicalDeviceImageFormatProperties(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceImageFormatProperties(void *args) +{ + struct vkGetPhysicalDeviceImageFormatProperties_params *params = args; + TRACE("%p, %#x, %#x, %#x, %#x, %#x, %p\n", params->physicalDevice, params->format, params->type, params->tiling, params->usage, params->flags, params->pImageFormatProperties); + return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceImageFormatProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->type, params->tiling, params->usage, params->flags, params->pImageFormatProperties); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceImageFormatProperties(void *args) { struct vkGetPhysicalDeviceImageFormatProperties_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkImageFormatProperties_host pImageFormatProperties_host; TRACE("%p, %#x, %#x, %#x, %#x, %#x, %p\n", params->physicalDevice, params->format, params->type, params->tiling, params->usage, params->flags, params->pImageFormatProperties); @@ -9053,15 +13071,21 @@ static NTSTATUS wine_vkGetPhysicalDeviceImageFormatProperties(void *args) convert_VkImageFormatProperties_host_to_win(&pImageFormatProperties_host, params->pImageFormatProperties); return result; -#else - TRACE("%p, %#x, %#x, %#x, %#x, %#x, %p\n", params->physicalDevice, params->format, params->type, params->tiling, params->usage, params->flags, params->pImageFormatProperties); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceImageFormatProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->type, params->tiling, params->usage, params->flags, params->pImageFormatProperties); -#endif } +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) +{ + return wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceImageFormatProperties2(wine_phys_dev_from_handle(physicalDevice)->phys_dev, pImageFormatInfo, pImageFormatProperties); +} + +#else /* USE_STRUCT_CONVERSION */ + VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) { -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkImageFormatProperties2_host pImageFormatProperties_host; convert_VkImageFormatProperties2_win_to_host(pImageFormatProperties, &pImageFormatProperties_host); @@ -9069,14 +13093,21 @@ VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physic convert_VkImageFormatProperties2_host_to_win(&pImageFormatProperties_host, pImageFormatProperties); return result; -#else - return wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceImageFormatProperties2(wine_phys_dev_from_handle(physicalDevice)->phys_dev, pImageFormatInfo, pImageFormatProperties); -#endif } +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) +{ + return wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceImageFormatProperties2KHR(wine_phys_dev_from_handle(physicalDevice)->phys_dev, pImageFormatInfo, pImageFormatProperties); +} + +#else /* USE_STRUCT_CONVERSION */ + VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) { -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkImageFormatProperties2_host pImageFormatProperties_host; convert_VkImageFormatProperties2_win_to_host(pImageFormatProperties, &pImageFormatProperties_host); @@ -9084,15 +13115,25 @@ VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice phy convert_VkImageFormatProperties2_host_to_win(&pImageFormatProperties_host, pImageFormatProperties); return result; -#else - return wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceImageFormatProperties2KHR(wine_phys_dev_from_handle(physicalDevice)->phys_dev, pImageFormatInfo, pImageFormatProperties); -#endif } -static NTSTATUS wine_vkGetPhysicalDeviceMemoryProperties(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceMemoryProperties(void *args) +{ + struct vkGetPhysicalDeviceMemoryProperties_params *params = args; + TRACE("%p, %p\n", params->physicalDevice, params->pMemoryProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceMemoryProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pMemoryProperties); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceMemoryProperties(void *args) { struct vkGetPhysicalDeviceMemoryProperties_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkPhysicalDeviceMemoryProperties_host pMemoryProperties_host; TRACE("%p, %p\n", params->physicalDevice, params->pMemoryProperties); @@ -9100,17 +13141,25 @@ static NTSTATUS wine_vkGetPhysicalDeviceMemoryProperties(void *args) convert_VkPhysicalDeviceMemoryProperties_host_to_win(&pMemoryProperties_host, params->pMemoryProperties); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceMemoryProperties2(void *args) +{ + struct vkGetPhysicalDeviceMemoryProperties2_params *params = args; TRACE("%p, %p\n", params->physicalDevice, params->pMemoryProperties); - wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceMemoryProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pMemoryProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceMemoryProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pMemoryProperties); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetPhysicalDeviceMemoryProperties2(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceMemoryProperties2(void *args) { struct vkGetPhysicalDeviceMemoryProperties2_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkPhysicalDeviceMemoryProperties2_host pMemoryProperties_host; TRACE("%p, %p\n", params->physicalDevice, params->pMemoryProperties); @@ -9119,17 +13168,25 @@ static NTSTATUS wine_vkGetPhysicalDeviceMemoryProperties2(void *args) convert_VkPhysicalDeviceMemoryProperties2_host_to_win(&pMemoryProperties_host, params->pMemoryProperties); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceMemoryProperties2KHR(void *args) +{ + struct vkGetPhysicalDeviceMemoryProperties2KHR_params *params = args; TRACE("%p, %p\n", params->physicalDevice, params->pMemoryProperties); - wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceMemoryProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pMemoryProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceMemoryProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pMemoryProperties); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetPhysicalDeviceMemoryProperties2KHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceMemoryProperties2KHR(void *args) { struct vkGetPhysicalDeviceMemoryProperties2KHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkPhysicalDeviceMemoryProperties2_host pMemoryProperties_host; TRACE("%p, %p\n", params->physicalDevice, params->pMemoryProperties); @@ -9138,14 +13195,23 @@ static NTSTATUS wine_vkGetPhysicalDeviceMemoryProperties2KHR(void *args) convert_VkPhysicalDeviceMemoryProperties2_host_to_win(&pMemoryProperties_host, params->pMemoryProperties); return STATUS_SUCCESS; -#else - TRACE("%p, %p\n", params->physicalDevice, params->pMemoryProperties); - wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceMemoryProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pMemoryProperties); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceMultisamplePropertiesEXT(void *args) +{ + struct vkGetPhysicalDeviceMultisamplePropertiesEXT_params *params = args; + TRACE("%p, %#x, %p\n", params->physicalDevice, params->samples, params->pMultisampleProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceMultisamplePropertiesEXT(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->samples, params->pMultisampleProperties); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetPhysicalDeviceMultisamplePropertiesEXT(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceMultisamplePropertiesEXT(void *args) { struct vkGetPhysicalDeviceMultisamplePropertiesEXT_params *params = args; TRACE("%p, %#x, %p\n", params->physicalDevice, params->samples, params->pMultisampleProperties); @@ -9153,17 +13219,43 @@ static NTSTATUS wine_vkGetPhysicalDeviceMultisamplePropertiesEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetPhysicalDevicePresentRectanglesKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDevicePresentRectanglesKHR(void *args) +{ + struct vkGetPhysicalDevicePresentRectanglesKHR_params *params = args; + TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pRectCount, params->pRects); + return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDevicePresentRectanglesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pRectCount, params->pRects); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDevicePresentRectanglesKHR(void *args) { struct vkGetPhysicalDevicePresentRectanglesKHR_params *params = args; TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pRectCount, params->pRects); return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDevicePresentRectanglesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pRectCount, params->pRects); } -static NTSTATUS wine_vkGetPhysicalDeviceProperties(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceProperties(void *args) +{ + struct vkGetPhysicalDeviceProperties_params *params = args; + TRACE("%p, %p\n", params->physicalDevice, params->pProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pProperties); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceProperties(void *args) { struct vkGetPhysicalDeviceProperties_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkPhysicalDeviceProperties_host pProperties_host; TRACE("%p, %p\n", params->physicalDevice, params->pProperties); @@ -9171,17 +13263,25 @@ static NTSTATUS wine_vkGetPhysicalDeviceProperties(void *args) convert_VkPhysicalDeviceProperties_host_to_win(&pProperties_host, params->pProperties); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceProperties2(void *args) +{ + struct vkGetPhysicalDeviceProperties2_params *params = args; TRACE("%p, %p\n", params->physicalDevice, params->pProperties); - wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pProperties); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetPhysicalDeviceProperties2(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceProperties2(void *args) { struct vkGetPhysicalDeviceProperties2_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkPhysicalDeviceProperties2_host pProperties_host; TRACE("%p, %p\n", params->physicalDevice, params->pProperties); @@ -9190,17 +13290,25 @@ static NTSTATUS wine_vkGetPhysicalDeviceProperties2(void *args) convert_VkPhysicalDeviceProperties2_host_to_win(&pProperties_host, params->pProperties); return STATUS_SUCCESS; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceProperties2KHR(void *args) +{ + struct vkGetPhysicalDeviceProperties2KHR_params *params = args; TRACE("%p, %p\n", params->physicalDevice, params->pProperties); - wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pProperties); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetPhysicalDeviceProperties2KHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceProperties2KHR(void *args) { struct vkGetPhysicalDeviceProperties2KHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkPhysicalDeviceProperties2_host pProperties_host; TRACE("%p, %p\n", params->physicalDevice, params->pProperties); @@ -9209,14 +13317,23 @@ static NTSTATUS wine_vkGetPhysicalDeviceProperties2KHR(void *args) convert_VkPhysicalDeviceProperties2_host_to_win(&pProperties_host, params->pProperties); return STATUS_SUCCESS; -#else - TRACE("%p, %p\n", params->physicalDevice, params->pProperties); - wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pProperties); +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR(void *args) +{ + struct vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR_params *params = args; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pPerformanceQueryCreateInfo, params->pNumPasses); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pPerformanceQueryCreateInfo, params->pNumPasses); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR(void *args) { struct vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR_params *params = args; TRACE("%p, %p, %p\n", params->physicalDevice, params->pPerformanceQueryCreateInfo, params->pNumPasses); @@ -9224,7 +13341,21 @@ static NTSTATUS wine_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR(voi return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetPhysicalDeviceQueueFamilyProperties(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceQueueFamilyProperties(void *args) +{ + struct vkGetPhysicalDeviceQueueFamilyProperties_params *params = args; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceQueueFamilyProperties(void *args) { struct vkGetPhysicalDeviceQueueFamilyProperties_params *params = args; TRACE("%p, %p, %p\n", params->physicalDevice, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); @@ -9232,7 +13363,21 @@ static NTSTATUS wine_vkGetPhysicalDeviceQueueFamilyProperties(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetPhysicalDeviceQueueFamilyProperties2(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceQueueFamilyProperties2(void *args) +{ + struct vkGetPhysicalDeviceQueueFamilyProperties2_params *params = args; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceQueueFamilyProperties2(void *args) { struct vkGetPhysicalDeviceQueueFamilyProperties2_params *params = args; TRACE("%p, %p, %p\n", params->physicalDevice, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); @@ -9240,7 +13385,21 @@ static NTSTATUS wine_vkGetPhysicalDeviceQueueFamilyProperties2(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetPhysicalDeviceQueueFamilyProperties2KHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceQueueFamilyProperties2KHR(void *args) +{ + struct vkGetPhysicalDeviceQueueFamilyProperties2KHR_params *params = args; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceQueueFamilyProperties2KHR(void *args) { struct vkGetPhysicalDeviceQueueFamilyProperties2KHR_params *params = args; TRACE("%p, %p, %p\n", params->physicalDevice, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); @@ -9248,7 +13407,21 @@ static NTSTATUS wine_vkGetPhysicalDeviceQueueFamilyProperties2KHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetPhysicalDeviceSparseImageFormatProperties(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceSparseImageFormatProperties(void *args) +{ + struct vkGetPhysicalDeviceSparseImageFormatProperties_params *params = args; + TRACE("%p, %#x, %#x, %#x, %#x, %#x, %p, %p\n", params->physicalDevice, params->format, params->type, params->samples, params->usage, params->tiling, params->pPropertyCount, params->pProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSparseImageFormatProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->type, params->samples, params->usage, params->tiling, params->pPropertyCount, params->pProperties); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceSparseImageFormatProperties(void *args) { struct vkGetPhysicalDeviceSparseImageFormatProperties_params *params = args; TRACE("%p, %#x, %#x, %#x, %#x, %#x, %p, %p\n", params->physicalDevice, params->format, params->type, params->samples, params->usage, params->tiling, params->pPropertyCount, params->pProperties); @@ -9256,7 +13429,21 @@ static NTSTATUS wine_vkGetPhysicalDeviceSparseImageFormatProperties(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetPhysicalDeviceSparseImageFormatProperties2(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceSparseImageFormatProperties2(void *args) +{ + struct vkGetPhysicalDeviceSparseImageFormatProperties2_params *params = args; + TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pFormatInfo, params->pPropertyCount, params->pProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSparseImageFormatProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFormatInfo, params->pPropertyCount, params->pProperties); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceSparseImageFormatProperties2(void *args) { struct vkGetPhysicalDeviceSparseImageFormatProperties2_params *params = args; TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pFormatInfo, params->pPropertyCount, params->pProperties); @@ -9264,7 +13451,21 @@ static NTSTATUS wine_vkGetPhysicalDeviceSparseImageFormatProperties2(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetPhysicalDeviceSparseImageFormatProperties2KHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceSparseImageFormatProperties2KHR(void *args) +{ + struct vkGetPhysicalDeviceSparseImageFormatProperties2KHR_params *params = args; + TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pFormatInfo, params->pPropertyCount, params->pProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSparseImageFormatProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFormatInfo, params->pPropertyCount, params->pProperties); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceSparseImageFormatProperties2KHR(void *args) { struct vkGetPhysicalDeviceSparseImageFormatProperties2KHR_params *params = args; TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pFormatInfo, params->pPropertyCount, params->pProperties); @@ -9272,114 +13473,256 @@ static NTSTATUS wine_vkGetPhysicalDeviceSparseImageFormatProperties2KHR(void *ar return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(void *args) +{ + struct vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV_params *params = args; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pCombinationCount, params->pCombinations); + return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pCombinationCount, params->pCombinations); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(void *args) { struct vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV_params *params = args; TRACE("%p, %p, %p\n", params->physicalDevice, params->pCombinationCount, params->pCombinations); return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pCombinationCount, params->pCombinations); } +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) { -#if defined(USE_STRUCT_CONVERSION) VkResult result; - VkPhysicalDeviceSurfaceInfo2KHR_host pSurfaceInfo_host; + VkPhysicalDeviceSurfaceInfo2KHR pSurfaceInfo_host; convert_VkPhysicalDeviceSurfaceInfo2KHR_win_to_host(pSurfaceInfo, &pSurfaceInfo_host); result = wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilities2KHR(wine_phys_dev_from_handle(physicalDevice)->phys_dev, &pSurfaceInfo_host, pSurfaceCapabilities); return result; -#else +} + +#else /* USE_STRUCT_CONVERSION */ + +VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) +{ VkResult result; - VkPhysicalDeviceSurfaceInfo2KHR pSurfaceInfo_host; + VkPhysicalDeviceSurfaceInfo2KHR_host pSurfaceInfo_host; convert_VkPhysicalDeviceSurfaceInfo2KHR_win_to_host(pSurfaceInfo, &pSurfaceInfo_host); result = wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilities2KHR(wine_phys_dev_from_handle(physicalDevice)->phys_dev, &pSurfaceInfo_host, pSurfaceCapabilities); return result; -#endif } +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) +{ + return wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(wine_phys_dev_from_handle(physicalDevice)->phys_dev, wine_surface_from_handle(surface)->driver_surface, pSurfaceCapabilities); +} + +#else /* USE_STRUCT_CONVERSION */ + VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) { return wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(wine_phys_dev_from_handle(physicalDevice)->phys_dev, wine_surface_from_handle(surface)->driver_surface, pSurfaceCapabilities); } -static NTSTATUS wine_vkGetPhysicalDeviceSurfaceFormats2KHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceSurfaceFormats2KHR(void *args) { struct vkGetPhysicalDeviceSurfaceFormats2KHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; - VkPhysicalDeviceSurfaceInfo2KHR_host pSurfaceInfo_host; + VkPhysicalDeviceSurfaceInfo2KHR pSurfaceInfo_host; TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pSurfaceInfo, params->pSurfaceFormatCount, params->pSurfaceFormats); convert_VkPhysicalDeviceSurfaceInfo2KHR_win_to_host(params->pSurfaceInfo, &pSurfaceInfo_host); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceFormats2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, &pSurfaceInfo_host, params->pSurfaceFormatCount, params->pSurfaceFormats); return result; -#else +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceFormats2KHR(void *args) +{ + struct vkGetPhysicalDeviceSurfaceFormats2KHR_params *params = args; VkResult result; - VkPhysicalDeviceSurfaceInfo2KHR pSurfaceInfo_host; + VkPhysicalDeviceSurfaceInfo2KHR_host pSurfaceInfo_host; TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pSurfaceInfo, params->pSurfaceFormatCount, params->pSurfaceFormats); convert_VkPhysicalDeviceSurfaceInfo2KHR_win_to_host(params->pSurfaceInfo, &pSurfaceInfo_host); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceFormats2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, &pSurfaceInfo_host, params->pSurfaceFormatCount, params->pSurfaceFormats); return result; -#endif } -static NTSTATUS wine_vkGetPhysicalDeviceSurfaceFormatsKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceSurfaceFormatsKHR(void *args) +{ + struct vkGetPhysicalDeviceSurfaceFormatsKHR_params *params = args; + TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pSurfaceFormatCount, params->pSurfaceFormats); + return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceFormatsKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pSurfaceFormatCount, params->pSurfaceFormats); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceFormatsKHR(void *args) { struct vkGetPhysicalDeviceSurfaceFormatsKHR_params *params = args; TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pSurfaceFormatCount, params->pSurfaceFormats); return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceFormatsKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pSurfaceFormatCount, params->pSurfaceFormats); } -static NTSTATUS wine_vkGetPhysicalDeviceSurfacePresentModesKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceSurfacePresentModesKHR(void *args) +{ + struct vkGetPhysicalDeviceSurfacePresentModesKHR_params *params = args; + TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pPresentModeCount, params->pPresentModes); + return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfacePresentModesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pPresentModeCount, params->pPresentModes); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceSurfacePresentModesKHR(void *args) { struct vkGetPhysicalDeviceSurfacePresentModesKHR_params *params = args; TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pPresentModeCount, params->pPresentModes); return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfacePresentModesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pPresentModeCount, params->pPresentModes); } -static NTSTATUS wine_vkGetPhysicalDeviceSurfaceSupportKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceSurfaceSupportKHR(void *args) +{ + struct vkGetPhysicalDeviceSurfaceSupportKHR_params *params = args; + TRACE("%p, %u, 0x%s, %p\n", params->physicalDevice, params->queueFamilyIndex, wine_dbgstr_longlong(params->surface), params->pSupported); + return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceSupportKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex, wine_surface_from_handle(params->surface)->driver_surface, params->pSupported); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceSupportKHR(void *args) { struct vkGetPhysicalDeviceSurfaceSupportKHR_params *params = args; TRACE("%p, %u, 0x%s, %p\n", params->physicalDevice, params->queueFamilyIndex, wine_dbgstr_longlong(params->surface), params->pSupported); return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceSupportKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex, wine_surface_from_handle(params->surface)->driver_surface, params->pSupported); } -static NTSTATUS wine_vkGetPhysicalDeviceToolProperties(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceToolProperties(void *args) +{ + struct vkGetPhysicalDeviceToolProperties_params *params = args; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pToolCount, params->pToolProperties); + return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceToolProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pToolCount, params->pToolProperties); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceToolProperties(void *args) { struct vkGetPhysicalDeviceToolProperties_params *params = args; TRACE("%p, %p, %p\n", params->physicalDevice, params->pToolCount, params->pToolProperties); return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceToolProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pToolCount, params->pToolProperties); } -static NTSTATUS wine_vkGetPhysicalDeviceToolPropertiesEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceToolPropertiesEXT(void *args) +{ + struct vkGetPhysicalDeviceToolPropertiesEXT_params *params = args; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pToolCount, params->pToolProperties); + return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceToolPropertiesEXT(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pToolCount, params->pToolProperties); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceToolPropertiesEXT(void *args) { struct vkGetPhysicalDeviceToolPropertiesEXT_params *params = args; TRACE("%p, %p, %p\n", params->physicalDevice, params->pToolCount, params->pToolProperties); return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceToolPropertiesEXT(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pToolCount, params->pToolProperties); } -static NTSTATUS wine_vkGetPhysicalDeviceWin32PresentationSupportKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceWin32PresentationSupportKHR(void *args) +{ + struct vkGetPhysicalDeviceWin32PresentationSupportKHR_params *params = args; + TRACE("%p, %u\n", params->physicalDevice, params->queueFamilyIndex); + return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceWin32PresentationSupportKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceWin32PresentationSupportKHR(void *args) { struct vkGetPhysicalDeviceWin32PresentationSupportKHR_params *params = args; TRACE("%p, %u\n", params->physicalDevice, params->queueFamilyIndex); return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceWin32PresentationSupportKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex); } -static NTSTATUS wine_vkGetPipelineCacheData(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPipelineCacheData(void *args) +{ + struct vkGetPipelineCacheData_params *params = args; + TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->pDataSize, params->pData); + return wine_device_from_handle(params->device)->funcs.p_vkGetPipelineCacheData(wine_device_from_handle(params->device)->device, params->pipelineCache, params->pDataSize, params->pData); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPipelineCacheData(void *args) { struct vkGetPipelineCacheData_params *params = args; TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->pDataSize, params->pData); return wine_device_from_handle(params->device)->funcs.p_vkGetPipelineCacheData(wine_device_from_handle(params->device)->device, params->pipelineCache, params->pDataSize, params->pData); } -static NTSTATUS wine_vkGetPipelineExecutableInternalRepresentationsKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPipelineExecutableInternalRepresentationsKHR(void *args) +{ + struct vkGetPipelineExecutableInternalRepresentationsKHR_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pExecutableInfo, params->pInternalRepresentationCount, params->pInternalRepresentations); + return wine_device_from_handle(params->device)->funcs.p_vkGetPipelineExecutableInternalRepresentationsKHR(wine_device_from_handle(params->device)->device, params->pExecutableInfo, params->pInternalRepresentationCount, params->pInternalRepresentations); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPipelineExecutableInternalRepresentationsKHR(void *args) { struct vkGetPipelineExecutableInternalRepresentationsKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkPipelineExecutableInfoKHR_host pExecutableInfo_host; TRACE("%p, %p, %p, %p\n", params->device, params->pExecutableInfo, params->pInternalRepresentationCount, params->pInternalRepresentations); @@ -9388,16 +13731,24 @@ static NTSTATUS wine_vkGetPipelineExecutableInternalRepresentationsKHR(void *arg result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelineExecutableInternalRepresentationsKHR(wine_device_from_handle(params->device)->device, &pExecutableInfo_host, params->pInternalRepresentationCount, params->pInternalRepresentations); return result; -#else - TRACE("%p, %p, %p, %p\n", params->device, params->pExecutableInfo, params->pInternalRepresentationCount, params->pInternalRepresentations); - return wine_device_from_handle(params->device)->funcs.p_vkGetPipelineExecutableInternalRepresentationsKHR(wine_device_from_handle(params->device)->device, params->pExecutableInfo, params->pInternalRepresentationCount, params->pInternalRepresentations); -#endif } -static NTSTATUS wine_vkGetPipelineExecutablePropertiesKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPipelineExecutablePropertiesKHR(void *args) +{ + struct vkGetPipelineExecutablePropertiesKHR_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pPipelineInfo, params->pExecutableCount, params->pProperties); + return wine_device_from_handle(params->device)->funcs.p_vkGetPipelineExecutablePropertiesKHR(wine_device_from_handle(params->device)->device, params->pPipelineInfo, params->pExecutableCount, params->pProperties); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPipelineExecutablePropertiesKHR(void *args) { struct vkGetPipelineExecutablePropertiesKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkPipelineInfoKHR_host pPipelineInfo_host; TRACE("%p, %p, %p, %p\n", params->device, params->pPipelineInfo, params->pExecutableCount, params->pProperties); @@ -9406,16 +13757,24 @@ static NTSTATUS wine_vkGetPipelineExecutablePropertiesKHR(void *args) result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelineExecutablePropertiesKHR(wine_device_from_handle(params->device)->device, &pPipelineInfo_host, params->pExecutableCount, params->pProperties); return result; -#else - TRACE("%p, %p, %p, %p\n", params->device, params->pPipelineInfo, params->pExecutableCount, params->pProperties); - return wine_device_from_handle(params->device)->funcs.p_vkGetPipelineExecutablePropertiesKHR(wine_device_from_handle(params->device)->device, params->pPipelineInfo, params->pExecutableCount, params->pProperties); -#endif } -static NTSTATUS wine_vkGetPipelineExecutableStatisticsKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPipelineExecutableStatisticsKHR(void *args) +{ + struct vkGetPipelineExecutableStatisticsKHR_params *params = args; + TRACE("%p, %p, %p, %p\n", params->device, params->pExecutableInfo, params->pStatisticCount, params->pStatistics); + return wine_device_from_handle(params->device)->funcs.p_vkGetPipelineExecutableStatisticsKHR(wine_device_from_handle(params->device)->device, params->pExecutableInfo, params->pStatisticCount, params->pStatistics); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPipelineExecutableStatisticsKHR(void *args) { struct vkGetPipelineExecutableStatisticsKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkPipelineExecutableInfoKHR_host pExecutableInfo_host; TRACE("%p, %p, %p, %p\n", params->device, params->pExecutableInfo, params->pStatisticCount, params->pStatistics); @@ -9424,16 +13783,24 @@ static NTSTATUS wine_vkGetPipelineExecutableStatisticsKHR(void *args) result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelineExecutableStatisticsKHR(wine_device_from_handle(params->device)->device, &pExecutableInfo_host, params->pStatisticCount, params->pStatistics); return result; -#else - TRACE("%p, %p, %p, %p\n", params->device, params->pExecutableInfo, params->pStatisticCount, params->pStatistics); - return wine_device_from_handle(params->device)->funcs.p_vkGetPipelineExecutableStatisticsKHR(wine_device_from_handle(params->device)->device, params->pExecutableInfo, params->pStatisticCount, params->pStatistics); -#endif } -static NTSTATUS wine_vkGetPipelinePropertiesEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPipelinePropertiesEXT(void *args) +{ + struct vkGetPipelinePropertiesEXT_params *params = args; + TRACE("%p, %p, %p\n", params->device, params->pPipelineInfo, params->pPipelineProperties); + return wine_device_from_handle(params->device)->funcs.p_vkGetPipelinePropertiesEXT(wine_device_from_handle(params->device)->device, params->pPipelineInfo, params->pPipelineProperties); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPipelinePropertiesEXT(void *args) { struct vkGetPipelinePropertiesEXT_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkPipelineInfoEXT_host pPipelineInfo_host; TRACE("%p, %p, %p\n", params->device, params->pPipelineInfo, params->pPipelineProperties); @@ -9442,13 +13809,23 @@ static NTSTATUS wine_vkGetPipelinePropertiesEXT(void *args) result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelinePropertiesEXT(wine_device_from_handle(params->device)->device, &pPipelineInfo_host, params->pPipelineProperties); return result; -#else - TRACE("%p, %p, %p\n", params->device, params->pPipelineInfo, params->pPipelineProperties); - return wine_device_from_handle(params->device)->funcs.p_vkGetPipelinePropertiesEXT(wine_device_from_handle(params->device)->device, params->pPipelineInfo, params->pPipelineProperties); -#endif } -static NTSTATUS wine_vkGetPrivateData(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPrivateData(void *args) +{ + struct vkGetPrivateData_params *params = args; + TRACE("%p, %#x, 0x%s, 0x%s, %p\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), params->pData); + wine_device_from_handle(params->device)->funcs.p_vkGetPrivateData(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->pData); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPrivateData(void *args) { struct vkGetPrivateData_params *params = args; TRACE("%p, %#x, 0x%s, 0x%s, %p\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), params->pData); @@ -9456,7 +13833,21 @@ static NTSTATUS wine_vkGetPrivateData(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetPrivateDataEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPrivateDataEXT(void *args) +{ + struct vkGetPrivateDataEXT_params *params = args; + TRACE("%p, %#x, 0x%s, 0x%s, %p\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), params->pData); + wine_device_from_handle(params->device)->funcs.p_vkGetPrivateDataEXT(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->pData); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPrivateDataEXT(void *args) { struct vkGetPrivateDataEXT_params *params = args; TRACE("%p, %#x, 0x%s, 0x%s, %p\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), params->pData); @@ -9464,14 +13855,41 @@ static NTSTATUS wine_vkGetPrivateDataEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetQueryPoolResults(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetQueryPoolResults(void *args) +{ + struct vkGetQueryPoolResults_params *params = args; + TRACE("%p, 0x%s, %u, %u, 0x%s, %p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount, wine_dbgstr_longlong(params->dataSize), params->pData, wine_dbgstr_longlong(params->stride), params->flags); + return wine_device_from_handle(params->device)->funcs.p_vkGetQueryPoolResults(wine_device_from_handle(params->device)->device, params->queryPool, params->firstQuery, params->queryCount, params->dataSize, params->pData, params->stride, params->flags); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetQueryPoolResults(void *args) { struct vkGetQueryPoolResults_params *params = args; TRACE("%p, 0x%s, %u, %u, 0x%s, %p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount, wine_dbgstr_longlong(params->dataSize), params->pData, wine_dbgstr_longlong(params->stride), params->flags); return wine_device_from_handle(params->device)->funcs.p_vkGetQueryPoolResults(wine_device_from_handle(params->device)->device, params->queryPool, params->firstQuery, params->queryCount, params->dataSize, params->pData, params->stride, params->flags); } -static NTSTATUS wine_vkGetQueueCheckpointData2NV(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetQueueCheckpointData2NV(void *args) +{ + struct vkGetQueueCheckpointData2NV_params *params = args; + TRACE("%p, %p, %p\n", params->queue, params->pCheckpointDataCount, params->pCheckpointData); + wine_queue_from_handle(params->queue)->device->funcs.p_vkGetQueueCheckpointData2NV(wine_queue_from_handle(params->queue)->queue, params->pCheckpointDataCount, params->pCheckpointData); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetQueueCheckpointData2NV(void *args) { struct vkGetQueueCheckpointData2NV_params *params = args; TRACE("%p, %p, %p\n", params->queue, params->pCheckpointDataCount, params->pCheckpointData); @@ -9479,7 +13897,21 @@ static NTSTATUS wine_vkGetQueueCheckpointData2NV(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetQueueCheckpointDataNV(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetQueueCheckpointDataNV(void *args) +{ + struct vkGetQueueCheckpointDataNV_params *params = args; + TRACE("%p, %p, %p\n", params->queue, params->pCheckpointDataCount, params->pCheckpointData); + wine_queue_from_handle(params->queue)->device->funcs.p_vkGetQueueCheckpointDataNV(wine_queue_from_handle(params->queue)->queue, params->pCheckpointDataCount, params->pCheckpointData); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetQueueCheckpointDataNV(void *args) { struct vkGetQueueCheckpointDataNV_params *params = args; TRACE("%p, %p, %p\n", params->queue, params->pCheckpointDataCount, params->pCheckpointData); @@ -9487,35 +13919,101 @@ static NTSTATUS wine_vkGetQueueCheckpointDataNV(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(void *args) +{ + struct vkGetRayTracingCaptureReplayShaderGroupHandlesKHR_params *params = args; + TRACE("%p, 0x%s, %u, %u, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->firstGroup, params->groupCount, wine_dbgstr_longlong(params->dataSize), params->pData); + return wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(void *args) { struct vkGetRayTracingCaptureReplayShaderGroupHandlesKHR_params *params = args; TRACE("%p, 0x%s, %u, %u, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->firstGroup, params->groupCount, wine_dbgstr_longlong(params->dataSize), params->pData); return wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); } -static NTSTATUS wine_vkGetRayTracingShaderGroupHandlesKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetRayTracingShaderGroupHandlesKHR(void *args) +{ + struct vkGetRayTracingShaderGroupHandlesKHR_params *params = args; + TRACE("%p, 0x%s, %u, %u, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->firstGroup, params->groupCount, wine_dbgstr_longlong(params->dataSize), params->pData); + return wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupHandlesKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetRayTracingShaderGroupHandlesKHR(void *args) { struct vkGetRayTracingShaderGroupHandlesKHR_params *params = args; TRACE("%p, 0x%s, %u, %u, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->firstGroup, params->groupCount, wine_dbgstr_longlong(params->dataSize), params->pData); return wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupHandlesKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); } -static NTSTATUS wine_vkGetRayTracingShaderGroupHandlesNV(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetRayTracingShaderGroupHandlesNV(void *args) +{ + struct vkGetRayTracingShaderGroupHandlesNV_params *params = args; + TRACE("%p, 0x%s, %u, %u, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->firstGroup, params->groupCount, wine_dbgstr_longlong(params->dataSize), params->pData); + return wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupHandlesNV(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetRayTracingShaderGroupHandlesNV(void *args) { struct vkGetRayTracingShaderGroupHandlesNV_params *params = args; TRACE("%p, 0x%s, %u, %u, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->firstGroup, params->groupCount, wine_dbgstr_longlong(params->dataSize), params->pData); return wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupHandlesNV(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); } -static NTSTATUS wine_vkGetRayTracingShaderGroupStackSizeKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetRayTracingShaderGroupStackSizeKHR(void *args) +{ + struct vkGetRayTracingShaderGroupStackSizeKHR_params *params = args; + TRACE("%p, 0x%s, %u, %#x\n", params->device, wine_dbgstr_longlong(params->pipeline), params->group, params->groupShader); + return wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupStackSizeKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->group, params->groupShader); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetRayTracingShaderGroupStackSizeKHR(void *args) { struct vkGetRayTracingShaderGroupStackSizeKHR_params *params = args; TRACE("%p, 0x%s, %u, %#x\n", params->device, wine_dbgstr_longlong(params->pipeline), params->group, params->groupShader); return wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupStackSizeKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->group, params->groupShader); } -static NTSTATUS wine_vkGetRenderAreaGranularity(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetRenderAreaGranularity(void *args) +{ + struct vkGetRenderAreaGranularity_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->renderPass), params->pGranularity); + wine_device_from_handle(params->device)->funcs.p_vkGetRenderAreaGranularity(wine_device_from_handle(params->device)->device, params->renderPass, params->pGranularity); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetRenderAreaGranularity(void *args) { struct vkGetRenderAreaGranularity_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->renderPass), params->pGranularity); @@ -9523,28 +14021,81 @@ static NTSTATUS wine_vkGetRenderAreaGranularity(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetSemaphoreCounterValue(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetSemaphoreCounterValue(void *args) +{ + struct vkGetSemaphoreCounterValue_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->semaphore), params->pValue); + return wine_device_from_handle(params->device)->funcs.p_vkGetSemaphoreCounterValue(wine_device_from_handle(params->device)->device, params->semaphore, params->pValue); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetSemaphoreCounterValue(void *args) { struct vkGetSemaphoreCounterValue_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->semaphore), params->pValue); return wine_device_from_handle(params->device)->funcs.p_vkGetSemaphoreCounterValue(wine_device_from_handle(params->device)->device, params->semaphore, params->pValue); } -static NTSTATUS wine_vkGetSemaphoreCounterValueKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetSemaphoreCounterValueKHR(void *args) +{ + struct vkGetSemaphoreCounterValueKHR_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->semaphore), params->pValue); + return wine_device_from_handle(params->device)->funcs.p_vkGetSemaphoreCounterValueKHR(wine_device_from_handle(params->device)->device, params->semaphore, params->pValue); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetSemaphoreCounterValueKHR(void *args) { struct vkGetSemaphoreCounterValueKHR_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->semaphore), params->pValue); return wine_device_from_handle(params->device)->funcs.p_vkGetSemaphoreCounterValueKHR(wine_device_from_handle(params->device)->device, params->semaphore, params->pValue); } -static NTSTATUS wine_vkGetShaderInfoAMD(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetShaderInfoAMD(void *args) +{ + struct vkGetShaderInfoAMD_params *params = args; + TRACE("%p, 0x%s, %#x, %#x, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->shaderStage, params->infoType, params->pInfoSize, params->pInfo); + return wine_device_from_handle(params->device)->funcs.p_vkGetShaderInfoAMD(wine_device_from_handle(params->device)->device, params->pipeline, params->shaderStage, params->infoType, params->pInfoSize, params->pInfo); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetShaderInfoAMD(void *args) { struct vkGetShaderInfoAMD_params *params = args; TRACE("%p, 0x%s, %#x, %#x, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->shaderStage, params->infoType, params->pInfoSize, params->pInfo); return wine_device_from_handle(params->device)->funcs.p_vkGetShaderInfoAMD(wine_device_from_handle(params->device)->device, params->pipeline, params->shaderStage, params->infoType, params->pInfoSize, params->pInfo); } -static NTSTATUS wine_vkGetShaderModuleCreateInfoIdentifierEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetShaderModuleCreateInfoIdentifierEXT(void *args) +{ + struct vkGetShaderModuleCreateInfoIdentifierEXT_params *params = args; + TRACE("%p, %p, %p\n", params->device, params->pCreateInfo, params->pIdentifier); + wine_device_from_handle(params->device)->funcs.p_vkGetShaderModuleCreateInfoIdentifierEXT(wine_device_from_handle(params->device)->device, params->pCreateInfo, params->pIdentifier); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetShaderModuleCreateInfoIdentifierEXT(void *args) { struct vkGetShaderModuleCreateInfoIdentifierEXT_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pCreateInfo, params->pIdentifier); @@ -9552,7 +14103,21 @@ static NTSTATUS wine_vkGetShaderModuleCreateInfoIdentifierEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetShaderModuleIdentifierEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetShaderModuleIdentifierEXT(void *args) +{ + struct vkGetShaderModuleIdentifierEXT_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->shaderModule), params->pIdentifier); + wine_device_from_handle(params->device)->funcs.p_vkGetShaderModuleIdentifierEXT(wine_device_from_handle(params->device)->device, params->shaderModule, params->pIdentifier); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetShaderModuleIdentifierEXT(void *args) { struct vkGetShaderModuleIdentifierEXT_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->shaderModule), params->pIdentifier); @@ -9560,31 +14125,82 @@ static NTSTATUS wine_vkGetShaderModuleIdentifierEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkGetSwapchainImagesKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetSwapchainImagesKHR(void *args) +{ + struct vkGetSwapchainImagesKHR_params *params = args; + TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->swapchain), params->pSwapchainImageCount, params->pSwapchainImages); + return wine_device_from_handle(params->device)->funcs.p_vkGetSwapchainImagesKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->pSwapchainImageCount, params->pSwapchainImages); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetSwapchainImagesKHR(void *args) { struct vkGetSwapchainImagesKHR_params *params = args; TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->swapchain), params->pSwapchainImageCount, params->pSwapchainImages); return wine_device_from_handle(params->device)->funcs.p_vkGetSwapchainImagesKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->pSwapchainImageCount, params->pSwapchainImages); } -static NTSTATUS wine_vkGetValidationCacheDataEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetValidationCacheDataEXT(void *args) +{ + struct vkGetValidationCacheDataEXT_params *params = args; + TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->validationCache), params->pDataSize, params->pData); + return wine_device_from_handle(params->device)->funcs.p_vkGetValidationCacheDataEXT(wine_device_from_handle(params->device)->device, params->validationCache, params->pDataSize, params->pData); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetValidationCacheDataEXT(void *args) { struct vkGetValidationCacheDataEXT_params *params = args; TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->validationCache), params->pDataSize, params->pData); return wine_device_from_handle(params->device)->funcs.p_vkGetValidationCacheDataEXT(wine_device_from_handle(params->device)->device, params->validationCache, params->pDataSize, params->pData); } -static NTSTATUS wine_vkInitializePerformanceApiINTEL(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkInitializePerformanceApiINTEL(void *args) +{ + struct vkInitializePerformanceApiINTEL_params *params = args; + TRACE("%p, %p\n", params->device, params->pInitializeInfo); + return wine_device_from_handle(params->device)->funcs.p_vkInitializePerformanceApiINTEL(wine_device_from_handle(params->device)->device, params->pInitializeInfo); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkInitializePerformanceApiINTEL(void *args) { struct vkInitializePerformanceApiINTEL_params *params = args; TRACE("%p, %p\n", params->device, params->pInitializeInfo); return wine_device_from_handle(params->device)->funcs.p_vkInitializePerformanceApiINTEL(wine_device_from_handle(params->device)->device, params->pInitializeInfo); } -static NTSTATUS wine_vkInvalidateMappedMemoryRanges(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkInvalidateMappedMemoryRanges(void *args) +{ + struct vkInvalidateMappedMemoryRanges_params *params = args; + TRACE("%p, %u, %p\n", params->device, params->memoryRangeCount, params->pMemoryRanges); + return wine_device_from_handle(params->device)->funcs.p_vkInvalidateMappedMemoryRanges(wine_device_from_handle(params->device)->device, params->memoryRangeCount, params->pMemoryRanges); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkInvalidateMappedMemoryRanges(void *args) { struct vkInvalidateMappedMemoryRanges_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkMappedMemoryRange_host *pMemoryRanges_host; TRACE("%p, %u, %p\n", params->device, params->memoryRangeCount, params->pMemoryRanges); @@ -9594,34 +14210,83 @@ static NTSTATUS wine_vkInvalidateMappedMemoryRanges(void *args) free_VkMappedMemoryRange_array(pMemoryRanges_host, params->memoryRangeCount); return result; -#else - TRACE("%p, %u, %p\n", params->device, params->memoryRangeCount, params->pMemoryRanges); - return wine_device_from_handle(params->device)->funcs.p_vkInvalidateMappedMemoryRanges(wine_device_from_handle(params->device)->device, params->memoryRangeCount, params->pMemoryRanges); -#endif } -static NTSTATUS wine_vkMapMemory(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkMapMemory(void *args) +{ + struct vkMapMemory_params *params = args; + TRACE("%p, 0x%s, 0x%s, 0x%s, %#x, %p\n", params->device, wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->size), params->flags, params->ppData); + return wine_device_from_handle(params->device)->funcs.p_vkMapMemory(wine_device_from_handle(params->device)->device, params->memory, params->offset, params->size, params->flags, params->ppData); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkMapMemory(void *args) { struct vkMapMemory_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, %#x, %p\n", params->device, wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->size), params->flags, params->ppData); return wine_device_from_handle(params->device)->funcs.p_vkMapMemory(wine_device_from_handle(params->device)->device, params->memory, params->offset, params->size, params->flags, params->ppData); } -static NTSTATUS wine_vkMergePipelineCaches(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkMergePipelineCaches(void *args) +{ + struct vkMergePipelineCaches_params *params = args; + TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->dstCache), params->srcCacheCount, params->pSrcCaches); + return wine_device_from_handle(params->device)->funcs.p_vkMergePipelineCaches(wine_device_from_handle(params->device)->device, params->dstCache, params->srcCacheCount, params->pSrcCaches); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkMergePipelineCaches(void *args) { struct vkMergePipelineCaches_params *params = args; TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->dstCache), params->srcCacheCount, params->pSrcCaches); return wine_device_from_handle(params->device)->funcs.p_vkMergePipelineCaches(wine_device_from_handle(params->device)->device, params->dstCache, params->srcCacheCount, params->pSrcCaches); } -static NTSTATUS wine_vkMergeValidationCachesEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkMergeValidationCachesEXT(void *args) +{ + struct vkMergeValidationCachesEXT_params *params = args; + TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->dstCache), params->srcCacheCount, params->pSrcCaches); + return wine_device_from_handle(params->device)->funcs.p_vkMergeValidationCachesEXT(wine_device_from_handle(params->device)->device, params->dstCache, params->srcCacheCount, params->pSrcCaches); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkMergeValidationCachesEXT(void *args) { struct vkMergeValidationCachesEXT_params *params = args; TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->dstCache), params->srcCacheCount, params->pSrcCaches); return wine_device_from_handle(params->device)->funcs.p_vkMergeValidationCachesEXT(wine_device_from_handle(params->device)->device, params->dstCache, params->srcCacheCount, params->pSrcCaches); } -static NTSTATUS wine_vkQueueBeginDebugUtilsLabelEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkQueueBeginDebugUtilsLabelEXT(void *args) +{ + struct vkQueueBeginDebugUtilsLabelEXT_params *params = args; + TRACE("%p, %p\n", params->queue, params->pLabelInfo); + wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueBeginDebugUtilsLabelEXT(wine_queue_from_handle(params->queue)->queue, params->pLabelInfo); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkQueueBeginDebugUtilsLabelEXT(void *args) { struct vkQueueBeginDebugUtilsLabelEXT_params *params = args; TRACE("%p, %p\n", params->queue, params->pLabelInfo); @@ -9629,10 +14294,22 @@ static NTSTATUS wine_vkQueueBeginDebugUtilsLabelEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkQueueBindSparse(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkQueueBindSparse(void *args) +{ + struct vkQueueBindSparse_params *params = args; + TRACE("%p, %u, %p, 0x%s\n", params->queue, params->bindInfoCount, params->pBindInfo, wine_dbgstr_longlong(params->fence)); + return wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueBindSparse(wine_queue_from_handle(params->queue)->queue, params->bindInfoCount, params->pBindInfo, params->fence); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkQueueBindSparse(void *args) { struct vkQueueBindSparse_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkBindSparseInfo_host *pBindInfo_host; TRACE("%p, %u, %p, 0x%s\n", params->queue, params->bindInfoCount, params->pBindInfo, wine_dbgstr_longlong(params->fence)); @@ -9642,13 +14319,23 @@ static NTSTATUS wine_vkQueueBindSparse(void *args) free_VkBindSparseInfo_array(pBindInfo_host, params->bindInfoCount); return result; -#else - TRACE("%p, %u, %p, 0x%s\n", params->queue, params->bindInfoCount, params->pBindInfo, wine_dbgstr_longlong(params->fence)); - return wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueBindSparse(wine_queue_from_handle(params->queue)->queue, params->bindInfoCount, params->pBindInfo, params->fence); -#endif } -static NTSTATUS wine_vkQueueEndDebugUtilsLabelEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkQueueEndDebugUtilsLabelEXT(void *args) +{ + struct vkQueueEndDebugUtilsLabelEXT_params *params = args; + TRACE("%p\n", params->queue); + wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueEndDebugUtilsLabelEXT(wine_queue_from_handle(params->queue)->queue); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkQueueEndDebugUtilsLabelEXT(void *args) { struct vkQueueEndDebugUtilsLabelEXT_params *params = args; TRACE("%p\n", params->queue); @@ -9656,7 +14343,21 @@ static NTSTATUS wine_vkQueueEndDebugUtilsLabelEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkQueueInsertDebugUtilsLabelEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkQueueInsertDebugUtilsLabelEXT(void *args) +{ + struct vkQueueInsertDebugUtilsLabelEXT_params *params = args; + TRACE("%p, %p\n", params->queue, params->pLabelInfo); + wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueInsertDebugUtilsLabelEXT(wine_queue_from_handle(params->queue)->queue, params->pLabelInfo); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkQueueInsertDebugUtilsLabelEXT(void *args) { struct vkQueueInsertDebugUtilsLabelEXT_params *params = args; TRACE("%p, %p\n", params->queue, params->pLabelInfo); @@ -9664,21 +14365,67 @@ static NTSTATUS wine_vkQueueInsertDebugUtilsLabelEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkQueuePresentKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkQueuePresentKHR(void *args) +{ + struct vkQueuePresentKHR_params *params = args; + TRACE("%p, %p\n", params->queue, params->pPresentInfo); + return wine_queue_from_handle(params->queue)->device->funcs.p_vkQueuePresentKHR(wine_queue_from_handle(params->queue)->queue, params->pPresentInfo); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkQueuePresentKHR(void *args) { struct vkQueuePresentKHR_params *params = args; TRACE("%p, %p\n", params->queue, params->pPresentInfo); return wine_queue_from_handle(params->queue)->device->funcs.p_vkQueuePresentKHR(wine_queue_from_handle(params->queue)->queue, params->pPresentInfo); } -static NTSTATUS wine_vkQueueSetPerformanceConfigurationINTEL(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkQueueSetPerformanceConfigurationINTEL(void *args) +{ + struct vkQueueSetPerformanceConfigurationINTEL_params *params = args; + TRACE("%p, 0x%s\n", params->queue, wine_dbgstr_longlong(params->configuration)); + return wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueSetPerformanceConfigurationINTEL(wine_queue_from_handle(params->queue)->queue, params->configuration); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkQueueSetPerformanceConfigurationINTEL(void *args) { struct vkQueueSetPerformanceConfigurationINTEL_params *params = args; TRACE("%p, 0x%s\n", params->queue, wine_dbgstr_longlong(params->configuration)); return wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueSetPerformanceConfigurationINTEL(wine_queue_from_handle(params->queue)->queue, params->configuration); } -static NTSTATUS wine_vkQueueSubmit(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkQueueSubmit(void *args) +{ + struct vkQueueSubmit_params *params = args; + VkResult result; + VkSubmitInfo *pSubmits_host; + TRACE("%p, %u, %p, 0x%s\n", params->queue, params->submitCount, params->pSubmits, wine_dbgstr_longlong(params->fence)); + + pSubmits_host = convert_VkSubmitInfo_array_win_to_host(params->pSubmits, params->submitCount); + result = wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueSubmit(wine_queue_from_handle(params->queue)->queue, params->submitCount, pSubmits_host, params->fence); + + free_VkSubmitInfo_array(pSubmits_host, params->submitCount); + return result; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkQueueSubmit(void *args) { struct vkQueueSubmit_params *params = args; VkResult result; @@ -9692,12 +14439,15 @@ static NTSTATUS wine_vkQueueSubmit(void *args) return result; } -static NTSTATUS wine_vkQueueSubmit2(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkQueueSubmit2(void *args) { struct vkQueueSubmit2_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; - VkSubmitInfo2_host *pSubmits_host; + VkSubmitInfo2 *pSubmits_host; TRACE("%p, %u, %p, 0x%s\n", params->queue, params->submitCount, params->pSubmits, wine_dbgstr_longlong(params->fence)); pSubmits_host = convert_VkSubmitInfo2_array_win_to_host(params->pSubmits, params->submitCount); @@ -9705,9 +14455,15 @@ static NTSTATUS wine_vkQueueSubmit2(void *args) free_VkSubmitInfo2_array(pSubmits_host, params->submitCount); return result; -#else +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkQueueSubmit2(void *args) +{ + struct vkQueueSubmit2_params *params = args; VkResult result; - VkSubmitInfo2 *pSubmits_host; + VkSubmitInfo2_host *pSubmits_host; TRACE("%p, %u, %p, 0x%s\n", params->queue, params->submitCount, params->pSubmits, wine_dbgstr_longlong(params->fence)); pSubmits_host = convert_VkSubmitInfo2_array_win_to_host(params->pSubmits, params->submitCount); @@ -9715,15 +14471,17 @@ static NTSTATUS wine_vkQueueSubmit2(void *args) free_VkSubmitInfo2_array(pSubmits_host, params->submitCount); return result; -#endif } -static NTSTATUS wine_vkQueueSubmit2KHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkQueueSubmit2KHR(void *args) { struct vkQueueSubmit2KHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; - VkSubmitInfo2_host *pSubmits_host; + VkSubmitInfo2 *pSubmits_host; TRACE("%p, %u, %p, 0x%s\n", params->queue, params->submitCount, params->pSubmits, wine_dbgstr_longlong(params->fence)); pSubmits_host = convert_VkSubmitInfo2_array_win_to_host(params->pSubmits, params->submitCount); @@ -9731,9 +14489,15 @@ static NTSTATUS wine_vkQueueSubmit2KHR(void *args) free_VkSubmitInfo2_array(pSubmits_host, params->submitCount); return result; -#else +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkQueueSubmit2KHR(void *args) +{ + struct vkQueueSubmit2KHR_params *params = args; VkResult result; - VkSubmitInfo2 *pSubmits_host; + VkSubmitInfo2_host *pSubmits_host; TRACE("%p, %u, %p, 0x%s\n", params->queue, params->submitCount, params->pSubmits, wine_dbgstr_longlong(params->fence)); pSubmits_host = convert_VkSubmitInfo2_array_win_to_host(params->pSubmits, params->submitCount); @@ -9741,24 +14505,63 @@ static NTSTATUS wine_vkQueueSubmit2KHR(void *args) free_VkSubmitInfo2_array(pSubmits_host, params->submitCount); return result; -#endif } -static NTSTATUS wine_vkQueueWaitIdle(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkQueueWaitIdle(void *args) +{ + struct vkQueueWaitIdle_params *params = args; + TRACE("%p\n", params->queue); + return wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueWaitIdle(wine_queue_from_handle(params->queue)->queue); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkQueueWaitIdle(void *args) { struct vkQueueWaitIdle_params *params = args; TRACE("%p\n", params->queue); return wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueWaitIdle(wine_queue_from_handle(params->queue)->queue); } -static NTSTATUS wine_vkReleasePerformanceConfigurationINTEL(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkReleasePerformanceConfigurationINTEL(void *args) +{ + struct vkReleasePerformanceConfigurationINTEL_params *params = args; + TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->configuration)); + return wine_device_from_handle(params->device)->funcs.p_vkReleasePerformanceConfigurationINTEL(wine_device_from_handle(params->device)->device, params->configuration); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkReleasePerformanceConfigurationINTEL(void *args) { struct vkReleasePerformanceConfigurationINTEL_params *params = args; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->configuration)); return wine_device_from_handle(params->device)->funcs.p_vkReleasePerformanceConfigurationINTEL(wine_device_from_handle(params->device)->device, params->configuration); } -static NTSTATUS wine_vkReleaseProfilingLockKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkReleaseProfilingLockKHR(void *args) +{ + struct vkReleaseProfilingLockKHR_params *params = args; + TRACE("%p\n", params->device); + wine_device_from_handle(params->device)->funcs.p_vkReleaseProfilingLockKHR(wine_device_from_handle(params->device)->device); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkReleaseProfilingLockKHR(void *args) { struct vkReleaseProfilingLockKHR_params *params = args; TRACE("%p\n", params->device); @@ -9766,42 +14569,121 @@ static NTSTATUS wine_vkReleaseProfilingLockKHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkResetCommandBuffer(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkResetCommandBuffer(void *args) +{ + struct vkResetCommandBuffer_params *params = args; + TRACE("%p, %#x\n", params->commandBuffer, params->flags); + return wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkResetCommandBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->flags); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkResetCommandBuffer(void *args) { struct vkResetCommandBuffer_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->flags); return wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkResetCommandBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->flags); } -static NTSTATUS wine_vkResetCommandPool(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkResetCommandPool(void *args) +{ + struct vkResetCommandPool_params *params = args; + TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->commandPool), params->flags); + return wine_device_from_handle(params->device)->funcs.p_vkResetCommandPool(wine_device_from_handle(params->device)->device, wine_cmd_pool_from_handle(params->commandPool)->command_pool, params->flags); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkResetCommandPool(void *args) { struct vkResetCommandPool_params *params = args; TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->commandPool), params->flags); return wine_device_from_handle(params->device)->funcs.p_vkResetCommandPool(wine_device_from_handle(params->device)->device, wine_cmd_pool_from_handle(params->commandPool)->command_pool, params->flags); } -static NTSTATUS wine_vkResetDescriptorPool(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkResetDescriptorPool(void *args) +{ + struct vkResetDescriptorPool_params *params = args; + TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->descriptorPool), params->flags); + return wine_device_from_handle(params->device)->funcs.p_vkResetDescriptorPool(wine_device_from_handle(params->device)->device, params->descriptorPool, params->flags); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkResetDescriptorPool(void *args) { struct vkResetDescriptorPool_params *params = args; TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->descriptorPool), params->flags); return wine_device_from_handle(params->device)->funcs.p_vkResetDescriptorPool(wine_device_from_handle(params->device)->device, params->descriptorPool, params->flags); } -static NTSTATUS wine_vkResetEvent(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkResetEvent(void *args) +{ + struct vkResetEvent_params *params = args; + TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->event)); + return wine_device_from_handle(params->device)->funcs.p_vkResetEvent(wine_device_from_handle(params->device)->device, params->event); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkResetEvent(void *args) { struct vkResetEvent_params *params = args; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->event)); return wine_device_from_handle(params->device)->funcs.p_vkResetEvent(wine_device_from_handle(params->device)->device, params->event); } -static NTSTATUS wine_vkResetFences(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkResetFences(void *args) +{ + struct vkResetFences_params *params = args; + TRACE("%p, %u, %p\n", params->device, params->fenceCount, params->pFences); + return wine_device_from_handle(params->device)->funcs.p_vkResetFences(wine_device_from_handle(params->device)->device, params->fenceCount, params->pFences); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkResetFences(void *args) { struct vkResetFences_params *params = args; TRACE("%p, %u, %p\n", params->device, params->fenceCount, params->pFences); return wine_device_from_handle(params->device)->funcs.p_vkResetFences(wine_device_from_handle(params->device)->device, params->fenceCount, params->pFences); } -static NTSTATUS wine_vkResetQueryPool(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkResetQueryPool(void *args) +{ + struct vkResetQueryPool_params *params = args; + TRACE("%p, 0x%s, %u, %u\n", params->device, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount); + wine_device_from_handle(params->device)->funcs.p_vkResetQueryPool(wine_device_from_handle(params->device)->device, params->queryPool, params->firstQuery, params->queryCount); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkResetQueryPool(void *args) { struct vkResetQueryPool_params *params = args; TRACE("%p, 0x%s, %u, %u\n", params->device, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount); @@ -9809,7 +14691,21 @@ static NTSTATUS wine_vkResetQueryPool(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkResetQueryPoolEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkResetQueryPoolEXT(void *args) +{ + struct vkResetQueryPoolEXT_params *params = args; + TRACE("%p, 0x%s, %u, %u\n", params->device, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount); + wine_device_from_handle(params->device)->funcs.p_vkResetQueryPoolEXT(wine_device_from_handle(params->device)->device, params->queryPool, params->firstQuery, params->queryCount); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkResetQueryPoolEXT(void *args) { struct vkResetQueryPoolEXT_params *params = args; TRACE("%p, 0x%s, %u, %u\n", params->device, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount); @@ -9817,87 +14713,168 @@ static NTSTATUS wine_vkResetQueryPoolEXT(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkSetDebugUtilsObjectNameEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkSetDebugUtilsObjectNameEXT(void *args) { struct vkSetDebugUtilsObjectNameEXT_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; - VkDebugUtilsObjectNameInfoEXT_host pNameInfo_host; + VkDebugUtilsObjectNameInfoEXT pNameInfo_host; TRACE("%p, %p\n", params->device, params->pNameInfo); convert_VkDebugUtilsObjectNameInfoEXT_win_to_host(params->pNameInfo, &pNameInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkSetDebugUtilsObjectNameEXT(wine_device_from_handle(params->device)->device, &pNameInfo_host); return result; -#else +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkSetDebugUtilsObjectNameEXT(void *args) +{ + struct vkSetDebugUtilsObjectNameEXT_params *params = args; VkResult result; - VkDebugUtilsObjectNameInfoEXT pNameInfo_host; + VkDebugUtilsObjectNameInfoEXT_host pNameInfo_host; TRACE("%p, %p\n", params->device, params->pNameInfo); convert_VkDebugUtilsObjectNameInfoEXT_win_to_host(params->pNameInfo, &pNameInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkSetDebugUtilsObjectNameEXT(wine_device_from_handle(params->device)->device, &pNameInfo_host); return result; -#endif } -static NTSTATUS wine_vkSetDebugUtilsObjectTagEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkSetDebugUtilsObjectTagEXT(void *args) { struct vkSetDebugUtilsObjectTagEXT_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; - VkDebugUtilsObjectTagInfoEXT_host pTagInfo_host; + VkDebugUtilsObjectTagInfoEXT pTagInfo_host; TRACE("%p, %p\n", params->device, params->pTagInfo); convert_VkDebugUtilsObjectTagInfoEXT_win_to_host(params->pTagInfo, &pTagInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkSetDebugUtilsObjectTagEXT(wine_device_from_handle(params->device)->device, &pTagInfo_host); return result; -#else +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkSetDebugUtilsObjectTagEXT(void *args) +{ + struct vkSetDebugUtilsObjectTagEXT_params *params = args; VkResult result; - VkDebugUtilsObjectTagInfoEXT pTagInfo_host; + VkDebugUtilsObjectTagInfoEXT_host pTagInfo_host; TRACE("%p, %p\n", params->device, params->pTagInfo); convert_VkDebugUtilsObjectTagInfoEXT_win_to_host(params->pTagInfo, &pTagInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkSetDebugUtilsObjectTagEXT(wine_device_from_handle(params->device)->device, &pTagInfo_host); return result; -#endif } -static NTSTATUS wine_vkSetDeviceMemoryPriorityEXT(void *args) -{ - struct vkSetDeviceMemoryPriorityEXT_params *params = args; - TRACE("%p, 0x%s, %f\n", params->device, wine_dbgstr_longlong(params->memory), params->priority); - wine_device_from_handle(params->device)->funcs.p_vkSetDeviceMemoryPriorityEXT(wine_device_from_handle(params->device)->device, params->memory, params->priority); - return STATUS_SUCCESS; -} +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkSetDeviceMemoryPriorityEXT(void *args) +{ + struct vkSetDeviceMemoryPriorityEXT_params *params = args; + TRACE("%p, 0x%s, %f\n", params->device, wine_dbgstr_longlong(params->memory), params->priority); + wine_device_from_handle(params->device)->funcs.p_vkSetDeviceMemoryPriorityEXT(wine_device_from_handle(params->device)->device, params->memory, params->priority); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkSetDeviceMemoryPriorityEXT(void *args) +{ + struct vkSetDeviceMemoryPriorityEXT_params *params = args; + TRACE("%p, 0x%s, %f\n", params->device, wine_dbgstr_longlong(params->memory), params->priority); + wine_device_from_handle(params->device)->funcs.p_vkSetDeviceMemoryPriorityEXT(wine_device_from_handle(params->device)->device, params->memory, params->priority); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkSetEvent(void *args) +{ + struct vkSetEvent_params *params = args; + TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->event)); + return wine_device_from_handle(params->device)->funcs.p_vkSetEvent(wine_device_from_handle(params->device)->device, params->event); +} + +#else /* USE_STRUCT_CONVERSION */ -static NTSTATUS wine_vkSetEvent(void *args) +static NTSTATUS thunk32_vkSetEvent(void *args) { struct vkSetEvent_params *params = args; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->event)); return wine_device_from_handle(params->device)->funcs.p_vkSetEvent(wine_device_from_handle(params->device)->device, params->event); } -static NTSTATUS wine_vkSetPrivateData(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkSetPrivateData(void *args) +{ + struct vkSetPrivateData_params *params = args; + TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), wine_dbgstr_longlong(params->data)); + return wine_device_from_handle(params->device)->funcs.p_vkSetPrivateData(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->data); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkSetPrivateData(void *args) { struct vkSetPrivateData_params *params = args; TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), wine_dbgstr_longlong(params->data)); return wine_device_from_handle(params->device)->funcs.p_vkSetPrivateData(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->data); } -static NTSTATUS wine_vkSetPrivateDataEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkSetPrivateDataEXT(void *args) +{ + struct vkSetPrivateDataEXT_params *params = args; + TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), wine_dbgstr_longlong(params->data)); + return wine_device_from_handle(params->device)->funcs.p_vkSetPrivateDataEXT(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->data); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkSetPrivateDataEXT(void *args) { struct vkSetPrivateDataEXT_params *params = args; TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), wine_dbgstr_longlong(params->data)); return wine_device_from_handle(params->device)->funcs.p_vkSetPrivateDataEXT(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->data); } -static NTSTATUS wine_vkSignalSemaphore(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkSignalSemaphore(void *args) +{ + struct vkSignalSemaphore_params *params = args; + TRACE("%p, %p\n", params->device, params->pSignalInfo); + return wine_device_from_handle(params->device)->funcs.p_vkSignalSemaphore(wine_device_from_handle(params->device)->device, params->pSignalInfo); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkSignalSemaphore(void *args) { struct vkSignalSemaphore_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkSemaphoreSignalInfo_host pSignalInfo_host; TRACE("%p, %p\n", params->device, params->pSignalInfo); @@ -9906,16 +14883,24 @@ static NTSTATUS wine_vkSignalSemaphore(void *args) result = wine_device_from_handle(params->device)->funcs.p_vkSignalSemaphore(wine_device_from_handle(params->device)->device, &pSignalInfo_host); return result; -#else +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkSignalSemaphoreKHR(void *args) +{ + struct vkSignalSemaphoreKHR_params *params = args; TRACE("%p, %p\n", params->device, params->pSignalInfo); - return wine_device_from_handle(params->device)->funcs.p_vkSignalSemaphore(wine_device_from_handle(params->device)->device, params->pSignalInfo); -#endif + return wine_device_from_handle(params->device)->funcs.p_vkSignalSemaphoreKHR(wine_device_from_handle(params->device)->device, params->pSignalInfo); } -static NTSTATUS wine_vkSignalSemaphoreKHR(void *args) +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkSignalSemaphoreKHR(void *args) { struct vkSignalSemaphoreKHR_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkResult result; VkSemaphoreSignalInfo_host pSignalInfo_host; TRACE("%p, %p\n", params->device, params->pSignalInfo); @@ -9924,17 +14909,16 @@ static NTSTATUS wine_vkSignalSemaphoreKHR(void *args) result = wine_device_from_handle(params->device)->funcs.p_vkSignalSemaphoreKHR(wine_device_from_handle(params->device)->device, &pSignalInfo_host); return result; -#else - TRACE("%p, %p\n", params->device, params->pSignalInfo); - return wine_device_from_handle(params->device)->funcs.p_vkSignalSemaphoreKHR(wine_device_from_handle(params->device)->device, params->pSignalInfo); -#endif } -static NTSTATUS wine_vkSubmitDebugUtilsMessageEXT(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkSubmitDebugUtilsMessageEXT(void *args) { struct vkSubmitDebugUtilsMessageEXT_params *params = args; -#if defined(USE_STRUCT_CONVERSION) - VkDebugUtilsMessengerCallbackDataEXT_host pCallbackData_host; + VkDebugUtilsMessengerCallbackDataEXT pCallbackData_host; TRACE("%p, %#x, %#x, %p\n", params->instance, params->messageSeverity, params->messageTypes, params->pCallbackData); convert_VkDebugUtilsMessengerCallbackDataEXT_win_to_host(params->pCallbackData, &pCallbackData_host); @@ -9942,8 +14926,14 @@ static NTSTATUS wine_vkSubmitDebugUtilsMessageEXT(void *args) free_VkDebugUtilsMessengerCallbackDataEXT(&pCallbackData_host); return STATUS_SUCCESS; -#else - VkDebugUtilsMessengerCallbackDataEXT pCallbackData_host; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkSubmitDebugUtilsMessageEXT(void *args) +{ + struct vkSubmitDebugUtilsMessageEXT_params *params = args; + VkDebugUtilsMessengerCallbackDataEXT_host pCallbackData_host; TRACE("%p, %#x, %#x, %p\n", params->instance, params->messageSeverity, params->messageTypes, params->pCallbackData); convert_VkDebugUtilsMessengerCallbackDataEXT_win_to_host(params->pCallbackData, &pCallbackData_host); @@ -9951,10 +14941,23 @@ static NTSTATUS wine_vkSubmitDebugUtilsMessageEXT(void *args) free_VkDebugUtilsMessengerCallbackDataEXT(&pCallbackData_host); return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkTrimCommandPool(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkTrimCommandPool(void *args) +{ + struct vkTrimCommandPool_params *params = args; + TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->commandPool), params->flags); + wine_device_from_handle(params->device)->funcs.p_vkTrimCommandPool(wine_device_from_handle(params->device)->device, wine_cmd_pool_from_handle(params->commandPool)->command_pool, params->flags); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkTrimCommandPool(void *args) { struct vkTrimCommandPool_params *params = args; TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->commandPool), params->flags); @@ -9962,7 +14965,21 @@ static NTSTATUS wine_vkTrimCommandPool(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkTrimCommandPoolKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkTrimCommandPoolKHR(void *args) +{ + struct vkTrimCommandPoolKHR_params *params = args; + TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->commandPool), params->flags); + wine_device_from_handle(params->device)->funcs.p_vkTrimCommandPoolKHR(wine_device_from_handle(params->device)->device, wine_cmd_pool_from_handle(params->commandPool)->command_pool, params->flags); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkTrimCommandPoolKHR(void *args) { struct vkTrimCommandPoolKHR_params *params = args; TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->commandPool), params->flags); @@ -9970,7 +14987,21 @@ static NTSTATUS wine_vkTrimCommandPoolKHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkUninitializePerformanceApiINTEL(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkUninitializePerformanceApiINTEL(void *args) +{ + struct vkUninitializePerformanceApiINTEL_params *params = args; + TRACE("%p\n", params->device); + wine_device_from_handle(params->device)->funcs.p_vkUninitializePerformanceApiINTEL(wine_device_from_handle(params->device)->device); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkUninitializePerformanceApiINTEL(void *args) { struct vkUninitializePerformanceApiINTEL_params *params = args; TRACE("%p\n", params->device); @@ -9978,7 +15009,21 @@ static NTSTATUS wine_vkUninitializePerformanceApiINTEL(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkUnmapMemory(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkUnmapMemory(void *args) +{ + struct vkUnmapMemory_params *params = args; + TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->memory)); + wine_device_from_handle(params->device)->funcs.p_vkUnmapMemory(wine_device_from_handle(params->device)->device, params->memory); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkUnmapMemory(void *args) { struct vkUnmapMemory_params *params = args; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->memory)); @@ -9986,7 +15031,21 @@ static NTSTATUS wine_vkUnmapMemory(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkUpdateDescriptorSetWithTemplate(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkUpdateDescriptorSetWithTemplate(void *args) +{ + struct vkUpdateDescriptorSetWithTemplate_params *params = args; + TRACE("%p, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSet), wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pData); + wine_device_from_handle(params->device)->funcs.p_vkUpdateDescriptorSetWithTemplate(wine_device_from_handle(params->device)->device, params->descriptorSet, params->descriptorUpdateTemplate, params->pData); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkUpdateDescriptorSetWithTemplate(void *args) { struct vkUpdateDescriptorSetWithTemplate_params *params = args; TRACE("%p, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSet), wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pData); @@ -9994,7 +15053,21 @@ static NTSTATUS wine_vkUpdateDescriptorSetWithTemplate(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkUpdateDescriptorSetWithTemplateKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkUpdateDescriptorSetWithTemplateKHR(void *args) +{ + struct vkUpdateDescriptorSetWithTemplateKHR_params *params = args; + TRACE("%p, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSet), wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pData); + wine_device_from_handle(params->device)->funcs.p_vkUpdateDescriptorSetWithTemplateKHR(wine_device_from_handle(params->device)->device, params->descriptorSet, params->descriptorUpdateTemplate, params->pData); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkUpdateDescriptorSetWithTemplateKHR(void *args) { struct vkUpdateDescriptorSetWithTemplateKHR_params *params = args; TRACE("%p, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSet), wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pData); @@ -10002,10 +15075,23 @@ static NTSTATUS wine_vkUpdateDescriptorSetWithTemplateKHR(void *args) return STATUS_SUCCESS; } -static NTSTATUS wine_vkUpdateDescriptorSets(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkUpdateDescriptorSets(void *args) +{ + struct vkUpdateDescriptorSets_params *params = args; + TRACE("%p, %u, %p, %u, %p\n", params->device, params->descriptorWriteCount, params->pDescriptorWrites, params->descriptorCopyCount, params->pDescriptorCopies); + wine_device_from_handle(params->device)->funcs.p_vkUpdateDescriptorSets(wine_device_from_handle(params->device)->device, params->descriptorWriteCount, params->pDescriptorWrites, params->descriptorCopyCount, params->pDescriptorCopies); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkUpdateDescriptorSets(void *args) { struct vkUpdateDescriptorSets_params *params = args; -#if defined(USE_STRUCT_CONVERSION) VkWriteDescriptorSet_host *pDescriptorWrites_host; VkCopyDescriptorSet_host *pDescriptorCopies_host; TRACE("%p, %u, %p, %u, %p\n", params->device, params->descriptorWriteCount, params->pDescriptorWrites, params->descriptorCopyCount, params->pDescriptorCopies); @@ -10017,48 +15103,110 @@ static NTSTATUS wine_vkUpdateDescriptorSets(void *args) free_VkWriteDescriptorSet_array(pDescriptorWrites_host, params->descriptorWriteCount); free_VkCopyDescriptorSet_array(pDescriptorCopies_host, params->descriptorCopyCount); return STATUS_SUCCESS; -#else - TRACE("%p, %u, %p, %u, %p\n", params->device, params->descriptorWriteCount, params->pDescriptorWrites, params->descriptorCopyCount, params->pDescriptorCopies); - wine_device_from_handle(params->device)->funcs.p_vkUpdateDescriptorSets(wine_device_from_handle(params->device)->device, params->descriptorWriteCount, params->pDescriptorWrites, params->descriptorCopyCount, params->pDescriptorCopies); - return STATUS_SUCCESS; -#endif } -static NTSTATUS wine_vkWaitForFences(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkWaitForFences(void *args) +{ + struct vkWaitForFences_params *params = args; + TRACE("%p, %u, %p, %u, 0x%s\n", params->device, params->fenceCount, params->pFences, params->waitAll, wine_dbgstr_longlong(params->timeout)); + return wine_device_from_handle(params->device)->funcs.p_vkWaitForFences(wine_device_from_handle(params->device)->device, params->fenceCount, params->pFences, params->waitAll, params->timeout); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkWaitForFences(void *args) { struct vkWaitForFences_params *params = args; TRACE("%p, %u, %p, %u, 0x%s\n", params->device, params->fenceCount, params->pFences, params->waitAll, wine_dbgstr_longlong(params->timeout)); return wine_device_from_handle(params->device)->funcs.p_vkWaitForFences(wine_device_from_handle(params->device)->device, params->fenceCount, params->pFences, params->waitAll, params->timeout); } -static NTSTATUS wine_vkWaitForPresentKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkWaitForPresentKHR(void *args) +{ + struct vkWaitForPresentKHR_params *params = args; + TRACE("%p, 0x%s, 0x%s, 0x%s\n", params->device, wine_dbgstr_longlong(params->swapchain), wine_dbgstr_longlong(params->presentId), wine_dbgstr_longlong(params->timeout)); + return wine_device_from_handle(params->device)->funcs.p_vkWaitForPresentKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->presentId, params->timeout); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkWaitForPresentKHR(void *args) { struct vkWaitForPresentKHR_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s\n", params->device, wine_dbgstr_longlong(params->swapchain), wine_dbgstr_longlong(params->presentId), wine_dbgstr_longlong(params->timeout)); return wine_device_from_handle(params->device)->funcs.p_vkWaitForPresentKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->presentId, params->timeout); } -static NTSTATUS wine_vkWaitSemaphores(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkWaitSemaphores(void *args) +{ + struct vkWaitSemaphores_params *params = args; + TRACE("%p, %p, 0x%s\n", params->device, params->pWaitInfo, wine_dbgstr_longlong(params->timeout)); + return wine_device_from_handle(params->device)->funcs.p_vkWaitSemaphores(wine_device_from_handle(params->device)->device, params->pWaitInfo, params->timeout); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkWaitSemaphores(void *args) { struct vkWaitSemaphores_params *params = args; TRACE("%p, %p, 0x%s\n", params->device, params->pWaitInfo, wine_dbgstr_longlong(params->timeout)); return wine_device_from_handle(params->device)->funcs.p_vkWaitSemaphores(wine_device_from_handle(params->device)->device, params->pWaitInfo, params->timeout); } -static NTSTATUS wine_vkWaitSemaphoresKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkWaitSemaphoresKHR(void *args) +{ + struct vkWaitSemaphoresKHR_params *params = args; + TRACE("%p, %p, 0x%s\n", params->device, params->pWaitInfo, wine_dbgstr_longlong(params->timeout)); + return wine_device_from_handle(params->device)->funcs.p_vkWaitSemaphoresKHR(wine_device_from_handle(params->device)->device, params->pWaitInfo, params->timeout); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkWaitSemaphoresKHR(void *args) { struct vkWaitSemaphoresKHR_params *params = args; TRACE("%p, %p, 0x%s\n", params->device, params->pWaitInfo, wine_dbgstr_longlong(params->timeout)); return wine_device_from_handle(params->device)->funcs.p_vkWaitSemaphoresKHR(wine_device_from_handle(params->device)->device, params->pWaitInfo, params->timeout); } -static NTSTATUS wine_vkWriteAccelerationStructuresPropertiesKHR(void *args) +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkWriteAccelerationStructuresPropertiesKHR(void *args) +{ + struct vkWriteAccelerationStructuresPropertiesKHR_params *params = args; + TRACE("%p, %u, %p, %#x, 0x%s, %p, 0x%s\n", params->device, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, wine_dbgstr_longlong(params->dataSize), params->pData, wine_dbgstr_longlong(params->stride)); + return wine_device_from_handle(params->device)->funcs.p_vkWriteAccelerationStructuresPropertiesKHR(wine_device_from_handle(params->device)->device, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, params->dataSize, params->pData, params->stride); +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkWriteAccelerationStructuresPropertiesKHR(void *args) { struct vkWriteAccelerationStructuresPropertiesKHR_params *params = args; TRACE("%p, %u, %p, %#x, 0x%s, %p, 0x%s\n", params->device, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, wine_dbgstr_longlong(params->dataSize), params->pData, wine_dbgstr_longlong(params->stride)); return wine_device_from_handle(params->device)->funcs.p_vkWriteAccelerationStructuresPropertiesKHR(wine_device_from_handle(params->device)->device, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, params->dataSize, params->pData, params->stride); } +#endif /* USE_STRUCT_CONVERSION */ + static const char * const vk_device_extensions[] = { "VK_AMD_buffer_marker", @@ -10367,474 +15515,948 @@ uint64_t wine_vk_unwrap_handle(VkObjectType type, uint64_t handle) } } +#if !defined(USE_STRUCT_CONVERSION) + +const unixlib_entry_t __wine_unix_call_funcs[] = +{ + init_vulkan, + vk_is_available_instance_function, + vk_is_available_device_function, + thunk64_vkAcquireNextImage2KHR, + thunk64_vkAcquireNextImageKHR, + thunk64_vkAcquirePerformanceConfigurationINTEL, + thunk64_vkAcquireProfilingLockKHR, + wine_vkAllocateCommandBuffers, + thunk64_vkAllocateDescriptorSets, + thunk64_vkAllocateMemory, + thunk64_vkBeginCommandBuffer, + thunk64_vkBindAccelerationStructureMemoryNV, + thunk64_vkBindBufferMemory, + thunk64_vkBindBufferMemory2, + thunk64_vkBindBufferMemory2KHR, + thunk64_vkBindImageMemory, + thunk64_vkBindImageMemory2, + thunk64_vkBindImageMemory2KHR, + thunk64_vkBuildAccelerationStructuresKHR, + thunk64_vkCmdBeginConditionalRenderingEXT, + thunk64_vkCmdBeginDebugUtilsLabelEXT, + thunk64_vkCmdBeginQuery, + thunk64_vkCmdBeginQueryIndexedEXT, + thunk64_vkCmdBeginRenderPass, + thunk64_vkCmdBeginRenderPass2, + thunk64_vkCmdBeginRenderPass2KHR, + thunk64_vkCmdBeginRendering, + thunk64_vkCmdBeginRenderingKHR, + thunk64_vkCmdBeginTransformFeedbackEXT, + thunk64_vkCmdBindDescriptorSets, + thunk64_vkCmdBindIndexBuffer, + thunk64_vkCmdBindInvocationMaskHUAWEI, + thunk64_vkCmdBindPipeline, + thunk64_vkCmdBindPipelineShaderGroupNV, + thunk64_vkCmdBindShadingRateImageNV, + thunk64_vkCmdBindTransformFeedbackBuffersEXT, + thunk64_vkCmdBindVertexBuffers, + thunk64_vkCmdBindVertexBuffers2, + thunk64_vkCmdBindVertexBuffers2EXT, + thunk64_vkCmdBlitImage, + thunk64_vkCmdBlitImage2, + thunk64_vkCmdBlitImage2KHR, + thunk64_vkCmdBuildAccelerationStructureNV, + thunk64_vkCmdBuildAccelerationStructuresIndirectKHR, + thunk64_vkCmdBuildAccelerationStructuresKHR, + thunk64_vkCmdClearAttachments, + thunk64_vkCmdClearColorImage, + thunk64_vkCmdClearDepthStencilImage, + thunk64_vkCmdCopyAccelerationStructureKHR, + thunk64_vkCmdCopyAccelerationStructureNV, + thunk64_vkCmdCopyAccelerationStructureToMemoryKHR, + thunk64_vkCmdCopyBuffer, + thunk64_vkCmdCopyBuffer2, + thunk64_vkCmdCopyBuffer2KHR, + thunk64_vkCmdCopyBufferToImage, + thunk64_vkCmdCopyBufferToImage2, + thunk64_vkCmdCopyBufferToImage2KHR, + thunk64_vkCmdCopyImage, + thunk64_vkCmdCopyImage2, + thunk64_vkCmdCopyImage2KHR, + thunk64_vkCmdCopyImageToBuffer, + thunk64_vkCmdCopyImageToBuffer2, + thunk64_vkCmdCopyImageToBuffer2KHR, + thunk64_vkCmdCopyMemoryToAccelerationStructureKHR, + thunk64_vkCmdCopyQueryPoolResults, + thunk64_vkCmdCuLaunchKernelNVX, + thunk64_vkCmdDebugMarkerBeginEXT, + thunk64_vkCmdDebugMarkerEndEXT, + thunk64_vkCmdDebugMarkerInsertEXT, + thunk64_vkCmdDispatch, + thunk64_vkCmdDispatchBase, + thunk64_vkCmdDispatchBaseKHR, + thunk64_vkCmdDispatchIndirect, + thunk64_vkCmdDraw, + thunk64_vkCmdDrawIndexed, + thunk64_vkCmdDrawIndexedIndirect, + thunk64_vkCmdDrawIndexedIndirectCount, + thunk64_vkCmdDrawIndexedIndirectCountAMD, + thunk64_vkCmdDrawIndexedIndirectCountKHR, + thunk64_vkCmdDrawIndirect, + thunk64_vkCmdDrawIndirectByteCountEXT, + thunk64_vkCmdDrawIndirectCount, + thunk64_vkCmdDrawIndirectCountAMD, + thunk64_vkCmdDrawIndirectCountKHR, + thunk64_vkCmdDrawMeshTasksEXT, + thunk64_vkCmdDrawMeshTasksIndirectCountEXT, + thunk64_vkCmdDrawMeshTasksIndirectCountNV, + thunk64_vkCmdDrawMeshTasksIndirectEXT, + thunk64_vkCmdDrawMeshTasksIndirectNV, + thunk64_vkCmdDrawMeshTasksNV, + thunk64_vkCmdDrawMultiEXT, + thunk64_vkCmdDrawMultiIndexedEXT, + thunk64_vkCmdEndConditionalRenderingEXT, + thunk64_vkCmdEndDebugUtilsLabelEXT, + thunk64_vkCmdEndQuery, + thunk64_vkCmdEndQueryIndexedEXT, + thunk64_vkCmdEndRenderPass, + thunk64_vkCmdEndRenderPass2, + thunk64_vkCmdEndRenderPass2KHR, + thunk64_vkCmdEndRendering, + thunk64_vkCmdEndRenderingKHR, + thunk64_vkCmdEndTransformFeedbackEXT, + thunk64_vkCmdExecuteCommands, + thunk64_vkCmdExecuteGeneratedCommandsNV, + thunk64_vkCmdFillBuffer, + thunk64_vkCmdInsertDebugUtilsLabelEXT, + thunk64_vkCmdNextSubpass, + thunk64_vkCmdNextSubpass2, + thunk64_vkCmdNextSubpass2KHR, + thunk64_vkCmdPipelineBarrier, + thunk64_vkCmdPipelineBarrier2, + thunk64_vkCmdPipelineBarrier2KHR, + thunk64_vkCmdPreprocessGeneratedCommandsNV, + thunk64_vkCmdPushConstants, + thunk64_vkCmdPushDescriptorSetKHR, + thunk64_vkCmdPushDescriptorSetWithTemplateKHR, + thunk64_vkCmdResetEvent, + thunk64_vkCmdResetEvent2, + thunk64_vkCmdResetEvent2KHR, + thunk64_vkCmdResetQueryPool, + thunk64_vkCmdResolveImage, + thunk64_vkCmdResolveImage2, + thunk64_vkCmdResolveImage2KHR, + thunk64_vkCmdSetBlendConstants, + thunk64_vkCmdSetCheckpointNV, + thunk64_vkCmdSetCoarseSampleOrderNV, + thunk64_vkCmdSetColorWriteEnableEXT, + thunk64_vkCmdSetCullMode, + thunk64_vkCmdSetCullModeEXT, + thunk64_vkCmdSetDepthBias, + thunk64_vkCmdSetDepthBiasEnable, + thunk64_vkCmdSetDepthBiasEnableEXT, + thunk64_vkCmdSetDepthBounds, + thunk64_vkCmdSetDepthBoundsTestEnable, + thunk64_vkCmdSetDepthBoundsTestEnableEXT, + thunk64_vkCmdSetDepthCompareOp, + thunk64_vkCmdSetDepthCompareOpEXT, + thunk64_vkCmdSetDepthTestEnable, + thunk64_vkCmdSetDepthTestEnableEXT, + thunk64_vkCmdSetDepthWriteEnable, + thunk64_vkCmdSetDepthWriteEnableEXT, + thunk64_vkCmdSetDeviceMask, + thunk64_vkCmdSetDeviceMaskKHR, + thunk64_vkCmdSetDiscardRectangleEXT, + thunk64_vkCmdSetEvent, + thunk64_vkCmdSetEvent2, + thunk64_vkCmdSetEvent2KHR, + thunk64_vkCmdSetExclusiveScissorNV, + thunk64_vkCmdSetFragmentShadingRateEnumNV, + thunk64_vkCmdSetFragmentShadingRateKHR, + thunk64_vkCmdSetFrontFace, + thunk64_vkCmdSetFrontFaceEXT, + thunk64_vkCmdSetLineStippleEXT, + thunk64_vkCmdSetLineWidth, + thunk64_vkCmdSetLogicOpEXT, + thunk64_vkCmdSetPatchControlPointsEXT, + thunk64_vkCmdSetPerformanceMarkerINTEL, + thunk64_vkCmdSetPerformanceOverrideINTEL, + thunk64_vkCmdSetPerformanceStreamMarkerINTEL, + thunk64_vkCmdSetPrimitiveRestartEnable, + thunk64_vkCmdSetPrimitiveRestartEnableEXT, + thunk64_vkCmdSetPrimitiveTopology, + thunk64_vkCmdSetPrimitiveTopologyEXT, + thunk64_vkCmdSetRasterizerDiscardEnable, + thunk64_vkCmdSetRasterizerDiscardEnableEXT, + thunk64_vkCmdSetRayTracingPipelineStackSizeKHR, + thunk64_vkCmdSetSampleLocationsEXT, + thunk64_vkCmdSetScissor, + thunk64_vkCmdSetScissorWithCount, + thunk64_vkCmdSetScissorWithCountEXT, + thunk64_vkCmdSetStencilCompareMask, + thunk64_vkCmdSetStencilOp, + thunk64_vkCmdSetStencilOpEXT, + thunk64_vkCmdSetStencilReference, + thunk64_vkCmdSetStencilTestEnable, + thunk64_vkCmdSetStencilTestEnableEXT, + thunk64_vkCmdSetStencilWriteMask, + thunk64_vkCmdSetVertexInputEXT, + thunk64_vkCmdSetViewport, + thunk64_vkCmdSetViewportShadingRatePaletteNV, + thunk64_vkCmdSetViewportWScalingNV, + thunk64_vkCmdSetViewportWithCount, + thunk64_vkCmdSetViewportWithCountEXT, + thunk64_vkCmdSubpassShadingHUAWEI, + thunk64_vkCmdTraceRaysIndirect2KHR, + thunk64_vkCmdTraceRaysIndirectKHR, + thunk64_vkCmdTraceRaysKHR, + thunk64_vkCmdTraceRaysNV, + thunk64_vkCmdUpdateBuffer, + thunk64_vkCmdWaitEvents, + thunk64_vkCmdWaitEvents2, + thunk64_vkCmdWaitEvents2KHR, + thunk64_vkCmdWriteAccelerationStructuresPropertiesKHR, + thunk64_vkCmdWriteAccelerationStructuresPropertiesNV, + thunk64_vkCmdWriteBufferMarker2AMD, + thunk64_vkCmdWriteBufferMarkerAMD, + thunk64_vkCmdWriteTimestamp, + thunk64_vkCmdWriteTimestamp2, + thunk64_vkCmdWriteTimestamp2KHR, + thunk64_vkCompileDeferredNV, + thunk64_vkCopyAccelerationStructureKHR, + thunk64_vkCopyAccelerationStructureToMemoryKHR, + thunk64_vkCopyMemoryToAccelerationStructureKHR, + thunk64_vkCreateAccelerationStructureKHR, + thunk64_vkCreateAccelerationStructureNV, + thunk64_vkCreateBuffer, + thunk64_vkCreateBufferView, + wine_vkCreateCommandPool, + wine_vkCreateComputePipelines, + thunk64_vkCreateCuFunctionNVX, + thunk64_vkCreateCuModuleNVX, + wine_vkCreateDebugReportCallbackEXT, + wine_vkCreateDebugUtilsMessengerEXT, + thunk64_vkCreateDeferredOperationKHR, + thunk64_vkCreateDescriptorPool, + thunk64_vkCreateDescriptorSetLayout, + thunk64_vkCreateDescriptorUpdateTemplate, + thunk64_vkCreateDescriptorUpdateTemplateKHR, + wine_vkCreateDevice, + thunk64_vkCreateEvent, + thunk64_vkCreateFence, + thunk64_vkCreateFramebuffer, + wine_vkCreateGraphicsPipelines, + thunk64_vkCreateImage, + thunk64_vkCreateImageView, + thunk64_vkCreateIndirectCommandsLayoutNV, + wine_vkCreateInstance, + thunk64_vkCreatePipelineCache, + thunk64_vkCreatePipelineLayout, + thunk64_vkCreatePrivateDataSlot, + thunk64_vkCreatePrivateDataSlotEXT, + thunk64_vkCreateQueryPool, + wine_vkCreateRayTracingPipelinesKHR, + wine_vkCreateRayTracingPipelinesNV, + thunk64_vkCreateRenderPass, + thunk64_vkCreateRenderPass2, + thunk64_vkCreateRenderPass2KHR, + thunk64_vkCreateSampler, + thunk64_vkCreateSamplerYcbcrConversion, + thunk64_vkCreateSamplerYcbcrConversionKHR, + thunk64_vkCreateSemaphore, + thunk64_vkCreateShaderModule, + thunk64_vkCreateSwapchainKHR, + thunk64_vkCreateValidationCacheEXT, + wine_vkCreateWin32SurfaceKHR, + thunk64_vkDebugMarkerSetObjectNameEXT, + thunk64_vkDebugMarkerSetObjectTagEXT, + thunk64_vkDebugReportMessageEXT, + thunk64_vkDeferredOperationJoinKHR, + thunk64_vkDestroyAccelerationStructureKHR, + thunk64_vkDestroyAccelerationStructureNV, + thunk64_vkDestroyBuffer, + thunk64_vkDestroyBufferView, + wine_vkDestroyCommandPool, + thunk64_vkDestroyCuFunctionNVX, + thunk64_vkDestroyCuModuleNVX, + wine_vkDestroyDebugReportCallbackEXT, + wine_vkDestroyDebugUtilsMessengerEXT, + thunk64_vkDestroyDeferredOperationKHR, + thunk64_vkDestroyDescriptorPool, + thunk64_vkDestroyDescriptorSetLayout, + thunk64_vkDestroyDescriptorUpdateTemplate, + thunk64_vkDestroyDescriptorUpdateTemplateKHR, + wine_vkDestroyDevice, + thunk64_vkDestroyEvent, + thunk64_vkDestroyFence, + thunk64_vkDestroyFramebuffer, + thunk64_vkDestroyImage, + thunk64_vkDestroyImageView, + thunk64_vkDestroyIndirectCommandsLayoutNV, + wine_vkDestroyInstance, + thunk64_vkDestroyPipeline, + thunk64_vkDestroyPipelineCache, + thunk64_vkDestroyPipelineLayout, + thunk64_vkDestroyPrivateDataSlot, + thunk64_vkDestroyPrivateDataSlotEXT, + thunk64_vkDestroyQueryPool, + thunk64_vkDestroyRenderPass, + thunk64_vkDestroySampler, + thunk64_vkDestroySamplerYcbcrConversion, + thunk64_vkDestroySamplerYcbcrConversionKHR, + thunk64_vkDestroySemaphore, + thunk64_vkDestroyShaderModule, + wine_vkDestroySurfaceKHR, + thunk64_vkDestroySwapchainKHR, + thunk64_vkDestroyValidationCacheEXT, + thunk64_vkDeviceWaitIdle, + thunk64_vkEndCommandBuffer, + wine_vkEnumerateDeviceExtensionProperties, + wine_vkEnumerateDeviceLayerProperties, + wine_vkEnumerateInstanceExtensionProperties, + wine_vkEnumerateInstanceVersion, + wine_vkEnumeratePhysicalDeviceGroups, + wine_vkEnumeratePhysicalDeviceGroupsKHR, + thunk64_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR, + wine_vkEnumeratePhysicalDevices, + thunk64_vkFlushMappedMemoryRanges, + wine_vkFreeCommandBuffers, + thunk64_vkFreeDescriptorSets, + thunk64_vkFreeMemory, + thunk64_vkGetAccelerationStructureBuildSizesKHR, + thunk64_vkGetAccelerationStructureDeviceAddressKHR, + thunk64_vkGetAccelerationStructureHandleNV, + thunk64_vkGetAccelerationStructureMemoryRequirementsNV, + thunk64_vkGetBufferDeviceAddress, + thunk64_vkGetBufferDeviceAddressEXT, + thunk64_vkGetBufferDeviceAddressKHR, + thunk64_vkGetBufferMemoryRequirements, + thunk64_vkGetBufferMemoryRequirements2, + thunk64_vkGetBufferMemoryRequirements2KHR, + thunk64_vkGetBufferOpaqueCaptureAddress, + thunk64_vkGetBufferOpaqueCaptureAddressKHR, + wine_vkGetCalibratedTimestampsEXT, + thunk64_vkGetDeferredOperationMaxConcurrencyKHR, + thunk64_vkGetDeferredOperationResultKHR, + thunk64_vkGetDescriptorSetHostMappingVALVE, + thunk64_vkGetDescriptorSetLayoutHostMappingInfoVALVE, + thunk64_vkGetDescriptorSetLayoutSupport, + thunk64_vkGetDescriptorSetLayoutSupportKHR, + thunk64_vkGetDeviceAccelerationStructureCompatibilityKHR, + thunk64_vkGetDeviceBufferMemoryRequirements, + thunk64_vkGetDeviceBufferMemoryRequirementsKHR, + thunk64_vkGetDeviceGroupPeerMemoryFeatures, + thunk64_vkGetDeviceGroupPeerMemoryFeaturesKHR, + thunk64_vkGetDeviceGroupPresentCapabilitiesKHR, + thunk64_vkGetDeviceGroupSurfacePresentModesKHR, + thunk64_vkGetDeviceImageMemoryRequirements, + thunk64_vkGetDeviceImageMemoryRequirementsKHR, + thunk64_vkGetDeviceImageSparseMemoryRequirements, + thunk64_vkGetDeviceImageSparseMemoryRequirementsKHR, + thunk64_vkGetDeviceMemoryCommitment, + thunk64_vkGetDeviceMemoryOpaqueCaptureAddress, + thunk64_vkGetDeviceMemoryOpaqueCaptureAddressKHR, + wine_vkGetDeviceQueue, + wine_vkGetDeviceQueue2, + thunk64_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI, + thunk64_vkGetDynamicRenderingTilePropertiesQCOM, + thunk64_vkGetEventStatus, + thunk64_vkGetFenceStatus, + thunk64_vkGetFramebufferTilePropertiesQCOM, + thunk64_vkGetGeneratedCommandsMemoryRequirementsNV, + thunk64_vkGetImageMemoryRequirements, + thunk64_vkGetImageMemoryRequirements2, + thunk64_vkGetImageMemoryRequirements2KHR, + thunk64_vkGetImageSparseMemoryRequirements, + thunk64_vkGetImageSparseMemoryRequirements2, + thunk64_vkGetImageSparseMemoryRequirements2KHR, + thunk64_vkGetImageSubresourceLayout, + thunk64_vkGetImageSubresourceLayout2EXT, + thunk64_vkGetImageViewAddressNVX, + thunk64_vkGetImageViewHandleNVX, + thunk64_vkGetMemoryHostPointerPropertiesEXT, + thunk64_vkGetPerformanceParameterINTEL, + wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT, + thunk64_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV, + wine_vkGetPhysicalDeviceExternalBufferProperties, + wine_vkGetPhysicalDeviceExternalBufferPropertiesKHR, + wine_vkGetPhysicalDeviceExternalFenceProperties, + wine_vkGetPhysicalDeviceExternalFencePropertiesKHR, + wine_vkGetPhysicalDeviceExternalSemaphoreProperties, + wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR, + thunk64_vkGetPhysicalDeviceFeatures, + thunk64_vkGetPhysicalDeviceFeatures2, + thunk64_vkGetPhysicalDeviceFeatures2KHR, + thunk64_vkGetPhysicalDeviceFormatProperties, + thunk64_vkGetPhysicalDeviceFormatProperties2, + thunk64_vkGetPhysicalDeviceFormatProperties2KHR, + thunk64_vkGetPhysicalDeviceFragmentShadingRatesKHR, + thunk64_vkGetPhysicalDeviceImageFormatProperties, + wine_vkGetPhysicalDeviceImageFormatProperties2, + wine_vkGetPhysicalDeviceImageFormatProperties2KHR, + thunk64_vkGetPhysicalDeviceMemoryProperties, + thunk64_vkGetPhysicalDeviceMemoryProperties2, + thunk64_vkGetPhysicalDeviceMemoryProperties2KHR, + thunk64_vkGetPhysicalDeviceMultisamplePropertiesEXT, + thunk64_vkGetPhysicalDevicePresentRectanglesKHR, + thunk64_vkGetPhysicalDeviceProperties, + thunk64_vkGetPhysicalDeviceProperties2, + thunk64_vkGetPhysicalDeviceProperties2KHR, + thunk64_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR, + thunk64_vkGetPhysicalDeviceQueueFamilyProperties, + thunk64_vkGetPhysicalDeviceQueueFamilyProperties2, + thunk64_vkGetPhysicalDeviceQueueFamilyProperties2KHR, + thunk64_vkGetPhysicalDeviceSparseImageFormatProperties, + thunk64_vkGetPhysicalDeviceSparseImageFormatProperties2, + thunk64_vkGetPhysicalDeviceSparseImageFormatProperties2KHR, + thunk64_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV, + wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR, + wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR, + thunk64_vkGetPhysicalDeviceSurfaceFormats2KHR, + thunk64_vkGetPhysicalDeviceSurfaceFormatsKHR, + thunk64_vkGetPhysicalDeviceSurfacePresentModesKHR, + thunk64_vkGetPhysicalDeviceSurfaceSupportKHR, + thunk64_vkGetPhysicalDeviceToolProperties, + thunk64_vkGetPhysicalDeviceToolPropertiesEXT, + thunk64_vkGetPhysicalDeviceWin32PresentationSupportKHR, + thunk64_vkGetPipelineCacheData, + thunk64_vkGetPipelineExecutableInternalRepresentationsKHR, + thunk64_vkGetPipelineExecutablePropertiesKHR, + thunk64_vkGetPipelineExecutableStatisticsKHR, + thunk64_vkGetPipelinePropertiesEXT, + thunk64_vkGetPrivateData, + thunk64_vkGetPrivateDataEXT, + thunk64_vkGetQueryPoolResults, + thunk64_vkGetQueueCheckpointData2NV, + thunk64_vkGetQueueCheckpointDataNV, + thunk64_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR, + thunk64_vkGetRayTracingShaderGroupHandlesKHR, + thunk64_vkGetRayTracingShaderGroupHandlesNV, + thunk64_vkGetRayTracingShaderGroupStackSizeKHR, + thunk64_vkGetRenderAreaGranularity, + thunk64_vkGetSemaphoreCounterValue, + thunk64_vkGetSemaphoreCounterValueKHR, + thunk64_vkGetShaderInfoAMD, + thunk64_vkGetShaderModuleCreateInfoIdentifierEXT, + thunk64_vkGetShaderModuleIdentifierEXT, + thunk64_vkGetSwapchainImagesKHR, + thunk64_vkGetValidationCacheDataEXT, + thunk64_vkInitializePerformanceApiINTEL, + thunk64_vkInvalidateMappedMemoryRanges, + thunk64_vkMapMemory, + thunk64_vkMergePipelineCaches, + thunk64_vkMergeValidationCachesEXT, + thunk64_vkQueueBeginDebugUtilsLabelEXT, + thunk64_vkQueueBindSparse, + thunk64_vkQueueEndDebugUtilsLabelEXT, + thunk64_vkQueueInsertDebugUtilsLabelEXT, + thunk64_vkQueuePresentKHR, + thunk64_vkQueueSetPerformanceConfigurationINTEL, + thunk64_vkQueueSubmit, + thunk64_vkQueueSubmit2, + thunk64_vkQueueSubmit2KHR, + thunk64_vkQueueWaitIdle, + thunk64_vkReleasePerformanceConfigurationINTEL, + thunk64_vkReleaseProfilingLockKHR, + thunk64_vkResetCommandBuffer, + thunk64_vkResetCommandPool, + thunk64_vkResetDescriptorPool, + thunk64_vkResetEvent, + thunk64_vkResetFences, + thunk64_vkResetQueryPool, + thunk64_vkResetQueryPoolEXT, + thunk64_vkSetDebugUtilsObjectNameEXT, + thunk64_vkSetDebugUtilsObjectTagEXT, + thunk64_vkSetDeviceMemoryPriorityEXT, + thunk64_vkSetEvent, + thunk64_vkSetPrivateData, + thunk64_vkSetPrivateDataEXT, + thunk64_vkSignalSemaphore, + thunk64_vkSignalSemaphoreKHR, + thunk64_vkSubmitDebugUtilsMessageEXT, + thunk64_vkTrimCommandPool, + thunk64_vkTrimCommandPoolKHR, + thunk64_vkUninitializePerformanceApiINTEL, + thunk64_vkUnmapMemory, + thunk64_vkUpdateDescriptorSetWithTemplate, + thunk64_vkUpdateDescriptorSetWithTemplateKHR, + thunk64_vkUpdateDescriptorSets, + thunk64_vkWaitForFences, + thunk64_vkWaitForPresentKHR, + thunk64_vkWaitSemaphores, + thunk64_vkWaitSemaphoresKHR, + thunk64_vkWriteAccelerationStructuresPropertiesKHR, +}; +C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == unix_count); + +#else /* USE_STRUCT_CONVERSION) */ + const unixlib_entry_t __wine_unix_call_funcs[] = { init_vulkan, vk_is_available_instance_function, vk_is_available_device_function, - wine_vkAcquireNextImage2KHR, - wine_vkAcquireNextImageKHR, - wine_vkAcquirePerformanceConfigurationINTEL, - wine_vkAcquireProfilingLockKHR, + thunk32_vkAcquireNextImage2KHR, + thunk32_vkAcquireNextImageKHR, + thunk32_vkAcquirePerformanceConfigurationINTEL, + thunk32_vkAcquireProfilingLockKHR, wine_vkAllocateCommandBuffers, - wine_vkAllocateDescriptorSets, - wine_vkAllocateMemory, - wine_vkBeginCommandBuffer, - wine_vkBindAccelerationStructureMemoryNV, - wine_vkBindBufferMemory, - wine_vkBindBufferMemory2, - wine_vkBindBufferMemory2KHR, - wine_vkBindImageMemory, - wine_vkBindImageMemory2, - wine_vkBindImageMemory2KHR, - wine_vkBuildAccelerationStructuresKHR, - wine_vkCmdBeginConditionalRenderingEXT, - wine_vkCmdBeginDebugUtilsLabelEXT, - wine_vkCmdBeginQuery, - wine_vkCmdBeginQueryIndexedEXT, - wine_vkCmdBeginRenderPass, - wine_vkCmdBeginRenderPass2, - wine_vkCmdBeginRenderPass2KHR, - wine_vkCmdBeginRendering, - wine_vkCmdBeginRenderingKHR, - wine_vkCmdBeginTransformFeedbackEXT, - wine_vkCmdBindDescriptorSets, - wine_vkCmdBindIndexBuffer, - wine_vkCmdBindInvocationMaskHUAWEI, - wine_vkCmdBindPipeline, - wine_vkCmdBindPipelineShaderGroupNV, - wine_vkCmdBindShadingRateImageNV, - wine_vkCmdBindTransformFeedbackBuffersEXT, - wine_vkCmdBindVertexBuffers, - wine_vkCmdBindVertexBuffers2, - wine_vkCmdBindVertexBuffers2EXT, - wine_vkCmdBlitImage, - wine_vkCmdBlitImage2, - wine_vkCmdBlitImage2KHR, - wine_vkCmdBuildAccelerationStructureNV, - wine_vkCmdBuildAccelerationStructuresIndirectKHR, - wine_vkCmdBuildAccelerationStructuresKHR, - wine_vkCmdClearAttachments, - wine_vkCmdClearColorImage, - wine_vkCmdClearDepthStencilImage, - wine_vkCmdCopyAccelerationStructureKHR, - wine_vkCmdCopyAccelerationStructureNV, - wine_vkCmdCopyAccelerationStructureToMemoryKHR, - wine_vkCmdCopyBuffer, - wine_vkCmdCopyBuffer2, - wine_vkCmdCopyBuffer2KHR, - wine_vkCmdCopyBufferToImage, - wine_vkCmdCopyBufferToImage2, - wine_vkCmdCopyBufferToImage2KHR, - wine_vkCmdCopyImage, - wine_vkCmdCopyImage2, - wine_vkCmdCopyImage2KHR, - wine_vkCmdCopyImageToBuffer, - wine_vkCmdCopyImageToBuffer2, - wine_vkCmdCopyImageToBuffer2KHR, - wine_vkCmdCopyMemoryToAccelerationStructureKHR, - wine_vkCmdCopyQueryPoolResults, - wine_vkCmdCuLaunchKernelNVX, - wine_vkCmdDebugMarkerBeginEXT, - wine_vkCmdDebugMarkerEndEXT, - wine_vkCmdDebugMarkerInsertEXT, - wine_vkCmdDispatch, - wine_vkCmdDispatchBase, - wine_vkCmdDispatchBaseKHR, - wine_vkCmdDispatchIndirect, - wine_vkCmdDraw, - wine_vkCmdDrawIndexed, - wine_vkCmdDrawIndexedIndirect, - wine_vkCmdDrawIndexedIndirectCount, - wine_vkCmdDrawIndexedIndirectCountAMD, - wine_vkCmdDrawIndexedIndirectCountKHR, - wine_vkCmdDrawIndirect, - wine_vkCmdDrawIndirectByteCountEXT, - wine_vkCmdDrawIndirectCount, - wine_vkCmdDrawIndirectCountAMD, - wine_vkCmdDrawIndirectCountKHR, - wine_vkCmdDrawMeshTasksEXT, - wine_vkCmdDrawMeshTasksIndirectCountEXT, - wine_vkCmdDrawMeshTasksIndirectCountNV, - wine_vkCmdDrawMeshTasksIndirectEXT, - wine_vkCmdDrawMeshTasksIndirectNV, - wine_vkCmdDrawMeshTasksNV, - wine_vkCmdDrawMultiEXT, - wine_vkCmdDrawMultiIndexedEXT, - wine_vkCmdEndConditionalRenderingEXT, - wine_vkCmdEndDebugUtilsLabelEXT, - wine_vkCmdEndQuery, - wine_vkCmdEndQueryIndexedEXT, - wine_vkCmdEndRenderPass, - wine_vkCmdEndRenderPass2, - wine_vkCmdEndRenderPass2KHR, - wine_vkCmdEndRendering, - wine_vkCmdEndRenderingKHR, - wine_vkCmdEndTransformFeedbackEXT, - wine_vkCmdExecuteCommands, - wine_vkCmdExecuteGeneratedCommandsNV, - wine_vkCmdFillBuffer, - wine_vkCmdInsertDebugUtilsLabelEXT, - wine_vkCmdNextSubpass, - wine_vkCmdNextSubpass2, - wine_vkCmdNextSubpass2KHR, - wine_vkCmdPipelineBarrier, - wine_vkCmdPipelineBarrier2, - wine_vkCmdPipelineBarrier2KHR, - wine_vkCmdPreprocessGeneratedCommandsNV, - wine_vkCmdPushConstants, - wine_vkCmdPushDescriptorSetKHR, - wine_vkCmdPushDescriptorSetWithTemplateKHR, - wine_vkCmdResetEvent, - wine_vkCmdResetEvent2, - wine_vkCmdResetEvent2KHR, - wine_vkCmdResetQueryPool, - wine_vkCmdResolveImage, - wine_vkCmdResolveImage2, - wine_vkCmdResolveImage2KHR, - wine_vkCmdSetBlendConstants, - wine_vkCmdSetCheckpointNV, - wine_vkCmdSetCoarseSampleOrderNV, - wine_vkCmdSetColorWriteEnableEXT, - wine_vkCmdSetCullMode, - wine_vkCmdSetCullModeEXT, - wine_vkCmdSetDepthBias, - wine_vkCmdSetDepthBiasEnable, - wine_vkCmdSetDepthBiasEnableEXT, - wine_vkCmdSetDepthBounds, - wine_vkCmdSetDepthBoundsTestEnable, - wine_vkCmdSetDepthBoundsTestEnableEXT, - wine_vkCmdSetDepthCompareOp, - wine_vkCmdSetDepthCompareOpEXT, - wine_vkCmdSetDepthTestEnable, - wine_vkCmdSetDepthTestEnableEXT, - wine_vkCmdSetDepthWriteEnable, - wine_vkCmdSetDepthWriteEnableEXT, - wine_vkCmdSetDeviceMask, - wine_vkCmdSetDeviceMaskKHR, - wine_vkCmdSetDiscardRectangleEXT, - wine_vkCmdSetEvent, - wine_vkCmdSetEvent2, - wine_vkCmdSetEvent2KHR, - wine_vkCmdSetExclusiveScissorNV, - wine_vkCmdSetFragmentShadingRateEnumNV, - wine_vkCmdSetFragmentShadingRateKHR, - wine_vkCmdSetFrontFace, - wine_vkCmdSetFrontFaceEXT, - wine_vkCmdSetLineStippleEXT, - wine_vkCmdSetLineWidth, - wine_vkCmdSetLogicOpEXT, - wine_vkCmdSetPatchControlPointsEXT, - wine_vkCmdSetPerformanceMarkerINTEL, - wine_vkCmdSetPerformanceOverrideINTEL, - wine_vkCmdSetPerformanceStreamMarkerINTEL, - wine_vkCmdSetPrimitiveRestartEnable, - wine_vkCmdSetPrimitiveRestartEnableEXT, - wine_vkCmdSetPrimitiveTopology, - wine_vkCmdSetPrimitiveTopologyEXT, - wine_vkCmdSetRasterizerDiscardEnable, - wine_vkCmdSetRasterizerDiscardEnableEXT, - wine_vkCmdSetRayTracingPipelineStackSizeKHR, - wine_vkCmdSetSampleLocationsEXT, - wine_vkCmdSetScissor, - wine_vkCmdSetScissorWithCount, - wine_vkCmdSetScissorWithCountEXT, - wine_vkCmdSetStencilCompareMask, - wine_vkCmdSetStencilOp, - wine_vkCmdSetStencilOpEXT, - wine_vkCmdSetStencilReference, - wine_vkCmdSetStencilTestEnable, - wine_vkCmdSetStencilTestEnableEXT, - wine_vkCmdSetStencilWriteMask, - wine_vkCmdSetVertexInputEXT, - wine_vkCmdSetViewport, - wine_vkCmdSetViewportShadingRatePaletteNV, - wine_vkCmdSetViewportWScalingNV, - wine_vkCmdSetViewportWithCount, - wine_vkCmdSetViewportWithCountEXT, - wine_vkCmdSubpassShadingHUAWEI, - wine_vkCmdTraceRaysIndirect2KHR, - wine_vkCmdTraceRaysIndirectKHR, - wine_vkCmdTraceRaysKHR, - wine_vkCmdTraceRaysNV, - wine_vkCmdUpdateBuffer, - wine_vkCmdWaitEvents, - wine_vkCmdWaitEvents2, - wine_vkCmdWaitEvents2KHR, - wine_vkCmdWriteAccelerationStructuresPropertiesKHR, - wine_vkCmdWriteAccelerationStructuresPropertiesNV, - wine_vkCmdWriteBufferMarker2AMD, - wine_vkCmdWriteBufferMarkerAMD, - wine_vkCmdWriteTimestamp, - wine_vkCmdWriteTimestamp2, - wine_vkCmdWriteTimestamp2KHR, - wine_vkCompileDeferredNV, - wine_vkCopyAccelerationStructureKHR, - wine_vkCopyAccelerationStructureToMemoryKHR, - wine_vkCopyMemoryToAccelerationStructureKHR, - wine_vkCreateAccelerationStructureKHR, - wine_vkCreateAccelerationStructureNV, - wine_vkCreateBuffer, - wine_vkCreateBufferView, + thunk32_vkAllocateDescriptorSets, + thunk32_vkAllocateMemory, + thunk32_vkBeginCommandBuffer, + thunk32_vkBindAccelerationStructureMemoryNV, + thunk32_vkBindBufferMemory, + thunk32_vkBindBufferMemory2, + thunk32_vkBindBufferMemory2KHR, + thunk32_vkBindImageMemory, + thunk32_vkBindImageMemory2, + thunk32_vkBindImageMemory2KHR, + thunk32_vkBuildAccelerationStructuresKHR, + thunk32_vkCmdBeginConditionalRenderingEXT, + thunk32_vkCmdBeginDebugUtilsLabelEXT, + thunk32_vkCmdBeginQuery, + thunk32_vkCmdBeginQueryIndexedEXT, + thunk32_vkCmdBeginRenderPass, + thunk32_vkCmdBeginRenderPass2, + thunk32_vkCmdBeginRenderPass2KHR, + thunk32_vkCmdBeginRendering, + thunk32_vkCmdBeginRenderingKHR, + thunk32_vkCmdBeginTransformFeedbackEXT, + thunk32_vkCmdBindDescriptorSets, + thunk32_vkCmdBindIndexBuffer, + thunk32_vkCmdBindInvocationMaskHUAWEI, + thunk32_vkCmdBindPipeline, + thunk32_vkCmdBindPipelineShaderGroupNV, + thunk32_vkCmdBindShadingRateImageNV, + thunk32_vkCmdBindTransformFeedbackBuffersEXT, + thunk32_vkCmdBindVertexBuffers, + thunk32_vkCmdBindVertexBuffers2, + thunk32_vkCmdBindVertexBuffers2EXT, + thunk32_vkCmdBlitImage, + thunk32_vkCmdBlitImage2, + thunk32_vkCmdBlitImage2KHR, + thunk32_vkCmdBuildAccelerationStructureNV, + thunk32_vkCmdBuildAccelerationStructuresIndirectKHR, + thunk32_vkCmdBuildAccelerationStructuresKHR, + thunk32_vkCmdClearAttachments, + thunk32_vkCmdClearColorImage, + thunk32_vkCmdClearDepthStencilImage, + thunk32_vkCmdCopyAccelerationStructureKHR, + thunk32_vkCmdCopyAccelerationStructureNV, + thunk32_vkCmdCopyAccelerationStructureToMemoryKHR, + thunk32_vkCmdCopyBuffer, + thunk32_vkCmdCopyBuffer2, + thunk32_vkCmdCopyBuffer2KHR, + thunk32_vkCmdCopyBufferToImage, + thunk32_vkCmdCopyBufferToImage2, + thunk32_vkCmdCopyBufferToImage2KHR, + thunk32_vkCmdCopyImage, + thunk32_vkCmdCopyImage2, + thunk32_vkCmdCopyImage2KHR, + thunk32_vkCmdCopyImageToBuffer, + thunk32_vkCmdCopyImageToBuffer2, + thunk32_vkCmdCopyImageToBuffer2KHR, + thunk32_vkCmdCopyMemoryToAccelerationStructureKHR, + thunk32_vkCmdCopyQueryPoolResults, + thunk32_vkCmdCuLaunchKernelNVX, + thunk32_vkCmdDebugMarkerBeginEXT, + thunk32_vkCmdDebugMarkerEndEXT, + thunk32_vkCmdDebugMarkerInsertEXT, + thunk32_vkCmdDispatch, + thunk32_vkCmdDispatchBase, + thunk32_vkCmdDispatchBaseKHR, + thunk32_vkCmdDispatchIndirect, + thunk32_vkCmdDraw, + thunk32_vkCmdDrawIndexed, + thunk32_vkCmdDrawIndexedIndirect, + thunk32_vkCmdDrawIndexedIndirectCount, + thunk32_vkCmdDrawIndexedIndirectCountAMD, + thunk32_vkCmdDrawIndexedIndirectCountKHR, + thunk32_vkCmdDrawIndirect, + thunk32_vkCmdDrawIndirectByteCountEXT, + thunk32_vkCmdDrawIndirectCount, + thunk32_vkCmdDrawIndirectCountAMD, + thunk32_vkCmdDrawIndirectCountKHR, + thunk32_vkCmdDrawMeshTasksEXT, + thunk32_vkCmdDrawMeshTasksIndirectCountEXT, + thunk32_vkCmdDrawMeshTasksIndirectCountNV, + thunk32_vkCmdDrawMeshTasksIndirectEXT, + thunk32_vkCmdDrawMeshTasksIndirectNV, + thunk32_vkCmdDrawMeshTasksNV, + thunk32_vkCmdDrawMultiEXT, + thunk32_vkCmdDrawMultiIndexedEXT, + thunk32_vkCmdEndConditionalRenderingEXT, + thunk32_vkCmdEndDebugUtilsLabelEXT, + thunk32_vkCmdEndQuery, + thunk32_vkCmdEndQueryIndexedEXT, + thunk32_vkCmdEndRenderPass, + thunk32_vkCmdEndRenderPass2, + thunk32_vkCmdEndRenderPass2KHR, + thunk32_vkCmdEndRendering, + thunk32_vkCmdEndRenderingKHR, + thunk32_vkCmdEndTransformFeedbackEXT, + thunk32_vkCmdExecuteCommands, + thunk32_vkCmdExecuteGeneratedCommandsNV, + thunk32_vkCmdFillBuffer, + thunk32_vkCmdInsertDebugUtilsLabelEXT, + thunk32_vkCmdNextSubpass, + thunk32_vkCmdNextSubpass2, + thunk32_vkCmdNextSubpass2KHR, + thunk32_vkCmdPipelineBarrier, + thunk32_vkCmdPipelineBarrier2, + thunk32_vkCmdPipelineBarrier2KHR, + thunk32_vkCmdPreprocessGeneratedCommandsNV, + thunk32_vkCmdPushConstants, + thunk32_vkCmdPushDescriptorSetKHR, + thunk32_vkCmdPushDescriptorSetWithTemplateKHR, + thunk32_vkCmdResetEvent, + thunk32_vkCmdResetEvent2, + thunk32_vkCmdResetEvent2KHR, + thunk32_vkCmdResetQueryPool, + thunk32_vkCmdResolveImage, + thunk32_vkCmdResolveImage2, + thunk32_vkCmdResolveImage2KHR, + thunk32_vkCmdSetBlendConstants, + thunk32_vkCmdSetCheckpointNV, + thunk32_vkCmdSetCoarseSampleOrderNV, + thunk32_vkCmdSetColorWriteEnableEXT, + thunk32_vkCmdSetCullMode, + thunk32_vkCmdSetCullModeEXT, + thunk32_vkCmdSetDepthBias, + thunk32_vkCmdSetDepthBiasEnable, + thunk32_vkCmdSetDepthBiasEnableEXT, + thunk32_vkCmdSetDepthBounds, + thunk32_vkCmdSetDepthBoundsTestEnable, + thunk32_vkCmdSetDepthBoundsTestEnableEXT, + thunk32_vkCmdSetDepthCompareOp, + thunk32_vkCmdSetDepthCompareOpEXT, + thunk32_vkCmdSetDepthTestEnable, + thunk32_vkCmdSetDepthTestEnableEXT, + thunk32_vkCmdSetDepthWriteEnable, + thunk32_vkCmdSetDepthWriteEnableEXT, + thunk32_vkCmdSetDeviceMask, + thunk32_vkCmdSetDeviceMaskKHR, + thunk32_vkCmdSetDiscardRectangleEXT, + thunk32_vkCmdSetEvent, + thunk32_vkCmdSetEvent2, + thunk32_vkCmdSetEvent2KHR, + thunk32_vkCmdSetExclusiveScissorNV, + thunk32_vkCmdSetFragmentShadingRateEnumNV, + thunk32_vkCmdSetFragmentShadingRateKHR, + thunk32_vkCmdSetFrontFace, + thunk32_vkCmdSetFrontFaceEXT, + thunk32_vkCmdSetLineStippleEXT, + thunk32_vkCmdSetLineWidth, + thunk32_vkCmdSetLogicOpEXT, + thunk32_vkCmdSetPatchControlPointsEXT, + thunk32_vkCmdSetPerformanceMarkerINTEL, + thunk32_vkCmdSetPerformanceOverrideINTEL, + thunk32_vkCmdSetPerformanceStreamMarkerINTEL, + thunk32_vkCmdSetPrimitiveRestartEnable, + thunk32_vkCmdSetPrimitiveRestartEnableEXT, + thunk32_vkCmdSetPrimitiveTopology, + thunk32_vkCmdSetPrimitiveTopologyEXT, + thunk32_vkCmdSetRasterizerDiscardEnable, + thunk32_vkCmdSetRasterizerDiscardEnableEXT, + thunk32_vkCmdSetRayTracingPipelineStackSizeKHR, + thunk32_vkCmdSetSampleLocationsEXT, + thunk32_vkCmdSetScissor, + thunk32_vkCmdSetScissorWithCount, + thunk32_vkCmdSetScissorWithCountEXT, + thunk32_vkCmdSetStencilCompareMask, + thunk32_vkCmdSetStencilOp, + thunk32_vkCmdSetStencilOpEXT, + thunk32_vkCmdSetStencilReference, + thunk32_vkCmdSetStencilTestEnable, + thunk32_vkCmdSetStencilTestEnableEXT, + thunk32_vkCmdSetStencilWriteMask, + thunk32_vkCmdSetVertexInputEXT, + thunk32_vkCmdSetViewport, + thunk32_vkCmdSetViewportShadingRatePaletteNV, + thunk32_vkCmdSetViewportWScalingNV, + thunk32_vkCmdSetViewportWithCount, + thunk32_vkCmdSetViewportWithCountEXT, + thunk32_vkCmdSubpassShadingHUAWEI, + thunk32_vkCmdTraceRaysIndirect2KHR, + thunk32_vkCmdTraceRaysIndirectKHR, + thunk32_vkCmdTraceRaysKHR, + thunk32_vkCmdTraceRaysNV, + thunk32_vkCmdUpdateBuffer, + thunk32_vkCmdWaitEvents, + thunk32_vkCmdWaitEvents2, + thunk32_vkCmdWaitEvents2KHR, + thunk32_vkCmdWriteAccelerationStructuresPropertiesKHR, + thunk32_vkCmdWriteAccelerationStructuresPropertiesNV, + thunk32_vkCmdWriteBufferMarker2AMD, + thunk32_vkCmdWriteBufferMarkerAMD, + thunk32_vkCmdWriteTimestamp, + thunk32_vkCmdWriteTimestamp2, + thunk32_vkCmdWriteTimestamp2KHR, + thunk32_vkCompileDeferredNV, + thunk32_vkCopyAccelerationStructureKHR, + thunk32_vkCopyAccelerationStructureToMemoryKHR, + thunk32_vkCopyMemoryToAccelerationStructureKHR, + thunk32_vkCreateAccelerationStructureKHR, + thunk32_vkCreateAccelerationStructureNV, + thunk32_vkCreateBuffer, + thunk32_vkCreateBufferView, wine_vkCreateCommandPool, wine_vkCreateComputePipelines, - wine_vkCreateCuFunctionNVX, - wine_vkCreateCuModuleNVX, + thunk32_vkCreateCuFunctionNVX, + thunk32_vkCreateCuModuleNVX, wine_vkCreateDebugReportCallbackEXT, wine_vkCreateDebugUtilsMessengerEXT, - wine_vkCreateDeferredOperationKHR, - wine_vkCreateDescriptorPool, - wine_vkCreateDescriptorSetLayout, - wine_vkCreateDescriptorUpdateTemplate, - wine_vkCreateDescriptorUpdateTemplateKHR, + thunk32_vkCreateDeferredOperationKHR, + thunk32_vkCreateDescriptorPool, + thunk32_vkCreateDescriptorSetLayout, + thunk32_vkCreateDescriptorUpdateTemplate, + thunk32_vkCreateDescriptorUpdateTemplateKHR, wine_vkCreateDevice, - wine_vkCreateEvent, - wine_vkCreateFence, - wine_vkCreateFramebuffer, + thunk32_vkCreateEvent, + thunk32_vkCreateFence, + thunk32_vkCreateFramebuffer, wine_vkCreateGraphicsPipelines, - wine_vkCreateImage, - wine_vkCreateImageView, - wine_vkCreateIndirectCommandsLayoutNV, + thunk32_vkCreateImage, + thunk32_vkCreateImageView, + thunk32_vkCreateIndirectCommandsLayoutNV, wine_vkCreateInstance, - wine_vkCreatePipelineCache, - wine_vkCreatePipelineLayout, - wine_vkCreatePrivateDataSlot, - wine_vkCreatePrivateDataSlotEXT, - wine_vkCreateQueryPool, + thunk32_vkCreatePipelineCache, + thunk32_vkCreatePipelineLayout, + thunk32_vkCreatePrivateDataSlot, + thunk32_vkCreatePrivateDataSlotEXT, + thunk32_vkCreateQueryPool, wine_vkCreateRayTracingPipelinesKHR, wine_vkCreateRayTracingPipelinesNV, - wine_vkCreateRenderPass, - wine_vkCreateRenderPass2, - wine_vkCreateRenderPass2KHR, - wine_vkCreateSampler, - wine_vkCreateSamplerYcbcrConversion, - wine_vkCreateSamplerYcbcrConversionKHR, - wine_vkCreateSemaphore, - wine_vkCreateShaderModule, - wine_vkCreateSwapchainKHR, - wine_vkCreateValidationCacheEXT, + thunk32_vkCreateRenderPass, + thunk32_vkCreateRenderPass2, + thunk32_vkCreateRenderPass2KHR, + thunk32_vkCreateSampler, + thunk32_vkCreateSamplerYcbcrConversion, + thunk32_vkCreateSamplerYcbcrConversionKHR, + thunk32_vkCreateSemaphore, + thunk32_vkCreateShaderModule, + thunk32_vkCreateSwapchainKHR, + thunk32_vkCreateValidationCacheEXT, wine_vkCreateWin32SurfaceKHR, - wine_vkDebugMarkerSetObjectNameEXT, - wine_vkDebugMarkerSetObjectTagEXT, - wine_vkDebugReportMessageEXT, - wine_vkDeferredOperationJoinKHR, - wine_vkDestroyAccelerationStructureKHR, - wine_vkDestroyAccelerationStructureNV, - wine_vkDestroyBuffer, - wine_vkDestroyBufferView, + thunk32_vkDebugMarkerSetObjectNameEXT, + thunk32_vkDebugMarkerSetObjectTagEXT, + thunk32_vkDebugReportMessageEXT, + thunk32_vkDeferredOperationJoinKHR, + thunk32_vkDestroyAccelerationStructureKHR, + thunk32_vkDestroyAccelerationStructureNV, + thunk32_vkDestroyBuffer, + thunk32_vkDestroyBufferView, wine_vkDestroyCommandPool, - wine_vkDestroyCuFunctionNVX, - wine_vkDestroyCuModuleNVX, + thunk32_vkDestroyCuFunctionNVX, + thunk32_vkDestroyCuModuleNVX, wine_vkDestroyDebugReportCallbackEXT, wine_vkDestroyDebugUtilsMessengerEXT, - wine_vkDestroyDeferredOperationKHR, - wine_vkDestroyDescriptorPool, - wine_vkDestroyDescriptorSetLayout, - wine_vkDestroyDescriptorUpdateTemplate, - wine_vkDestroyDescriptorUpdateTemplateKHR, + thunk32_vkDestroyDeferredOperationKHR, + thunk32_vkDestroyDescriptorPool, + thunk32_vkDestroyDescriptorSetLayout, + thunk32_vkDestroyDescriptorUpdateTemplate, + thunk32_vkDestroyDescriptorUpdateTemplateKHR, wine_vkDestroyDevice, - wine_vkDestroyEvent, - wine_vkDestroyFence, - wine_vkDestroyFramebuffer, - wine_vkDestroyImage, - wine_vkDestroyImageView, - wine_vkDestroyIndirectCommandsLayoutNV, + thunk32_vkDestroyEvent, + thunk32_vkDestroyFence, + thunk32_vkDestroyFramebuffer, + thunk32_vkDestroyImage, + thunk32_vkDestroyImageView, + thunk32_vkDestroyIndirectCommandsLayoutNV, wine_vkDestroyInstance, - wine_vkDestroyPipeline, - wine_vkDestroyPipelineCache, - wine_vkDestroyPipelineLayout, - wine_vkDestroyPrivateDataSlot, - wine_vkDestroyPrivateDataSlotEXT, - wine_vkDestroyQueryPool, - wine_vkDestroyRenderPass, - wine_vkDestroySampler, - wine_vkDestroySamplerYcbcrConversion, - wine_vkDestroySamplerYcbcrConversionKHR, - wine_vkDestroySemaphore, - wine_vkDestroyShaderModule, + thunk32_vkDestroyPipeline, + thunk32_vkDestroyPipelineCache, + thunk32_vkDestroyPipelineLayout, + thunk32_vkDestroyPrivateDataSlot, + thunk32_vkDestroyPrivateDataSlotEXT, + thunk32_vkDestroyQueryPool, + thunk32_vkDestroyRenderPass, + thunk32_vkDestroySampler, + thunk32_vkDestroySamplerYcbcrConversion, + thunk32_vkDestroySamplerYcbcrConversionKHR, + thunk32_vkDestroySemaphore, + thunk32_vkDestroyShaderModule, wine_vkDestroySurfaceKHR, - wine_vkDestroySwapchainKHR, - wine_vkDestroyValidationCacheEXT, - wine_vkDeviceWaitIdle, - wine_vkEndCommandBuffer, + thunk32_vkDestroySwapchainKHR, + thunk32_vkDestroyValidationCacheEXT, + thunk32_vkDeviceWaitIdle, + thunk32_vkEndCommandBuffer, wine_vkEnumerateDeviceExtensionProperties, wine_vkEnumerateDeviceLayerProperties, wine_vkEnumerateInstanceExtensionProperties, wine_vkEnumerateInstanceVersion, wine_vkEnumeratePhysicalDeviceGroups, wine_vkEnumeratePhysicalDeviceGroupsKHR, - wine_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR, + thunk32_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR, wine_vkEnumeratePhysicalDevices, - wine_vkFlushMappedMemoryRanges, + thunk32_vkFlushMappedMemoryRanges, wine_vkFreeCommandBuffers, - wine_vkFreeDescriptorSets, - wine_vkFreeMemory, - wine_vkGetAccelerationStructureBuildSizesKHR, - wine_vkGetAccelerationStructureDeviceAddressKHR, - wine_vkGetAccelerationStructureHandleNV, - wine_vkGetAccelerationStructureMemoryRequirementsNV, - wine_vkGetBufferDeviceAddress, - wine_vkGetBufferDeviceAddressEXT, - wine_vkGetBufferDeviceAddressKHR, - wine_vkGetBufferMemoryRequirements, - wine_vkGetBufferMemoryRequirements2, - wine_vkGetBufferMemoryRequirements2KHR, - wine_vkGetBufferOpaqueCaptureAddress, - wine_vkGetBufferOpaqueCaptureAddressKHR, + thunk32_vkFreeDescriptorSets, + thunk32_vkFreeMemory, + thunk32_vkGetAccelerationStructureBuildSizesKHR, + thunk32_vkGetAccelerationStructureDeviceAddressKHR, + thunk32_vkGetAccelerationStructureHandleNV, + thunk32_vkGetAccelerationStructureMemoryRequirementsNV, + thunk32_vkGetBufferDeviceAddress, + thunk32_vkGetBufferDeviceAddressEXT, + thunk32_vkGetBufferDeviceAddressKHR, + thunk32_vkGetBufferMemoryRequirements, + thunk32_vkGetBufferMemoryRequirements2, + thunk32_vkGetBufferMemoryRequirements2KHR, + thunk32_vkGetBufferOpaqueCaptureAddress, + thunk32_vkGetBufferOpaqueCaptureAddressKHR, wine_vkGetCalibratedTimestampsEXT, - wine_vkGetDeferredOperationMaxConcurrencyKHR, - wine_vkGetDeferredOperationResultKHR, - wine_vkGetDescriptorSetHostMappingVALVE, - wine_vkGetDescriptorSetLayoutHostMappingInfoVALVE, - wine_vkGetDescriptorSetLayoutSupport, - wine_vkGetDescriptorSetLayoutSupportKHR, - wine_vkGetDeviceAccelerationStructureCompatibilityKHR, - wine_vkGetDeviceBufferMemoryRequirements, - wine_vkGetDeviceBufferMemoryRequirementsKHR, - wine_vkGetDeviceGroupPeerMemoryFeatures, - wine_vkGetDeviceGroupPeerMemoryFeaturesKHR, - wine_vkGetDeviceGroupPresentCapabilitiesKHR, - wine_vkGetDeviceGroupSurfacePresentModesKHR, - wine_vkGetDeviceImageMemoryRequirements, - wine_vkGetDeviceImageMemoryRequirementsKHR, - wine_vkGetDeviceImageSparseMemoryRequirements, - wine_vkGetDeviceImageSparseMemoryRequirementsKHR, - wine_vkGetDeviceMemoryCommitment, - wine_vkGetDeviceMemoryOpaqueCaptureAddress, - wine_vkGetDeviceMemoryOpaqueCaptureAddressKHR, + thunk32_vkGetDeferredOperationMaxConcurrencyKHR, + thunk32_vkGetDeferredOperationResultKHR, + thunk32_vkGetDescriptorSetHostMappingVALVE, + thunk32_vkGetDescriptorSetLayoutHostMappingInfoVALVE, + thunk32_vkGetDescriptorSetLayoutSupport, + thunk32_vkGetDescriptorSetLayoutSupportKHR, + thunk32_vkGetDeviceAccelerationStructureCompatibilityKHR, + thunk32_vkGetDeviceBufferMemoryRequirements, + thunk32_vkGetDeviceBufferMemoryRequirementsKHR, + thunk32_vkGetDeviceGroupPeerMemoryFeatures, + thunk32_vkGetDeviceGroupPeerMemoryFeaturesKHR, + thunk32_vkGetDeviceGroupPresentCapabilitiesKHR, + thunk32_vkGetDeviceGroupSurfacePresentModesKHR, + thunk32_vkGetDeviceImageMemoryRequirements, + thunk32_vkGetDeviceImageMemoryRequirementsKHR, + thunk32_vkGetDeviceImageSparseMemoryRequirements, + thunk32_vkGetDeviceImageSparseMemoryRequirementsKHR, + thunk32_vkGetDeviceMemoryCommitment, + thunk32_vkGetDeviceMemoryOpaqueCaptureAddress, + thunk32_vkGetDeviceMemoryOpaqueCaptureAddressKHR, wine_vkGetDeviceQueue, wine_vkGetDeviceQueue2, - wine_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI, - wine_vkGetDynamicRenderingTilePropertiesQCOM, - wine_vkGetEventStatus, - wine_vkGetFenceStatus, - wine_vkGetFramebufferTilePropertiesQCOM, - wine_vkGetGeneratedCommandsMemoryRequirementsNV, - wine_vkGetImageMemoryRequirements, - wine_vkGetImageMemoryRequirements2, - wine_vkGetImageMemoryRequirements2KHR, - wine_vkGetImageSparseMemoryRequirements, - wine_vkGetImageSparseMemoryRequirements2, - wine_vkGetImageSparseMemoryRequirements2KHR, - wine_vkGetImageSubresourceLayout, - wine_vkGetImageSubresourceLayout2EXT, - wine_vkGetImageViewAddressNVX, - wine_vkGetImageViewHandleNVX, - wine_vkGetMemoryHostPointerPropertiesEXT, - wine_vkGetPerformanceParameterINTEL, + thunk32_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI, + thunk32_vkGetDynamicRenderingTilePropertiesQCOM, + thunk32_vkGetEventStatus, + thunk32_vkGetFenceStatus, + thunk32_vkGetFramebufferTilePropertiesQCOM, + thunk32_vkGetGeneratedCommandsMemoryRequirementsNV, + thunk32_vkGetImageMemoryRequirements, + thunk32_vkGetImageMemoryRequirements2, + thunk32_vkGetImageMemoryRequirements2KHR, + thunk32_vkGetImageSparseMemoryRequirements, + thunk32_vkGetImageSparseMemoryRequirements2, + thunk32_vkGetImageSparseMemoryRequirements2KHR, + thunk32_vkGetImageSubresourceLayout, + thunk32_vkGetImageSubresourceLayout2EXT, + thunk32_vkGetImageViewAddressNVX, + thunk32_vkGetImageViewHandleNVX, + thunk32_vkGetMemoryHostPointerPropertiesEXT, + thunk32_vkGetPerformanceParameterINTEL, wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT, - wine_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV, + thunk32_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV, wine_vkGetPhysicalDeviceExternalBufferProperties, wine_vkGetPhysicalDeviceExternalBufferPropertiesKHR, wine_vkGetPhysicalDeviceExternalFenceProperties, wine_vkGetPhysicalDeviceExternalFencePropertiesKHR, wine_vkGetPhysicalDeviceExternalSemaphoreProperties, wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR, - wine_vkGetPhysicalDeviceFeatures, - wine_vkGetPhysicalDeviceFeatures2, - wine_vkGetPhysicalDeviceFeatures2KHR, - wine_vkGetPhysicalDeviceFormatProperties, - wine_vkGetPhysicalDeviceFormatProperties2, - wine_vkGetPhysicalDeviceFormatProperties2KHR, - wine_vkGetPhysicalDeviceFragmentShadingRatesKHR, - wine_vkGetPhysicalDeviceImageFormatProperties, + thunk32_vkGetPhysicalDeviceFeatures, + thunk32_vkGetPhysicalDeviceFeatures2, + thunk32_vkGetPhysicalDeviceFeatures2KHR, + thunk32_vkGetPhysicalDeviceFormatProperties, + thunk32_vkGetPhysicalDeviceFormatProperties2, + thunk32_vkGetPhysicalDeviceFormatProperties2KHR, + thunk32_vkGetPhysicalDeviceFragmentShadingRatesKHR, + thunk32_vkGetPhysicalDeviceImageFormatProperties, wine_vkGetPhysicalDeviceImageFormatProperties2, wine_vkGetPhysicalDeviceImageFormatProperties2KHR, - wine_vkGetPhysicalDeviceMemoryProperties, - wine_vkGetPhysicalDeviceMemoryProperties2, - wine_vkGetPhysicalDeviceMemoryProperties2KHR, - wine_vkGetPhysicalDeviceMultisamplePropertiesEXT, - wine_vkGetPhysicalDevicePresentRectanglesKHR, - wine_vkGetPhysicalDeviceProperties, - wine_vkGetPhysicalDeviceProperties2, - wine_vkGetPhysicalDeviceProperties2KHR, - wine_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR, - wine_vkGetPhysicalDeviceQueueFamilyProperties, - wine_vkGetPhysicalDeviceQueueFamilyProperties2, - wine_vkGetPhysicalDeviceQueueFamilyProperties2KHR, - wine_vkGetPhysicalDeviceSparseImageFormatProperties, - wine_vkGetPhysicalDeviceSparseImageFormatProperties2, - wine_vkGetPhysicalDeviceSparseImageFormatProperties2KHR, - wine_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV, + thunk32_vkGetPhysicalDeviceMemoryProperties, + thunk32_vkGetPhysicalDeviceMemoryProperties2, + thunk32_vkGetPhysicalDeviceMemoryProperties2KHR, + thunk32_vkGetPhysicalDeviceMultisamplePropertiesEXT, + thunk32_vkGetPhysicalDevicePresentRectanglesKHR, + thunk32_vkGetPhysicalDeviceProperties, + thunk32_vkGetPhysicalDeviceProperties2, + thunk32_vkGetPhysicalDeviceProperties2KHR, + thunk32_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR, + thunk32_vkGetPhysicalDeviceQueueFamilyProperties, + thunk32_vkGetPhysicalDeviceQueueFamilyProperties2, + thunk32_vkGetPhysicalDeviceQueueFamilyProperties2KHR, + thunk32_vkGetPhysicalDeviceSparseImageFormatProperties, + thunk32_vkGetPhysicalDeviceSparseImageFormatProperties2, + thunk32_vkGetPhysicalDeviceSparseImageFormatProperties2KHR, + thunk32_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV, wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR, wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR, - wine_vkGetPhysicalDeviceSurfaceFormats2KHR, - wine_vkGetPhysicalDeviceSurfaceFormatsKHR, - wine_vkGetPhysicalDeviceSurfacePresentModesKHR, - wine_vkGetPhysicalDeviceSurfaceSupportKHR, - wine_vkGetPhysicalDeviceToolProperties, - wine_vkGetPhysicalDeviceToolPropertiesEXT, - wine_vkGetPhysicalDeviceWin32PresentationSupportKHR, - wine_vkGetPipelineCacheData, - wine_vkGetPipelineExecutableInternalRepresentationsKHR, - wine_vkGetPipelineExecutablePropertiesKHR, - wine_vkGetPipelineExecutableStatisticsKHR, - wine_vkGetPipelinePropertiesEXT, - wine_vkGetPrivateData, - wine_vkGetPrivateDataEXT, - wine_vkGetQueryPoolResults, - wine_vkGetQueueCheckpointData2NV, - wine_vkGetQueueCheckpointDataNV, - wine_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR, - wine_vkGetRayTracingShaderGroupHandlesKHR, - wine_vkGetRayTracingShaderGroupHandlesNV, - wine_vkGetRayTracingShaderGroupStackSizeKHR, - wine_vkGetRenderAreaGranularity, - wine_vkGetSemaphoreCounterValue, - wine_vkGetSemaphoreCounterValueKHR, - wine_vkGetShaderInfoAMD, - wine_vkGetShaderModuleCreateInfoIdentifierEXT, - wine_vkGetShaderModuleIdentifierEXT, - wine_vkGetSwapchainImagesKHR, - wine_vkGetValidationCacheDataEXT, - wine_vkInitializePerformanceApiINTEL, - wine_vkInvalidateMappedMemoryRanges, - wine_vkMapMemory, - wine_vkMergePipelineCaches, - wine_vkMergeValidationCachesEXT, - wine_vkQueueBeginDebugUtilsLabelEXT, - wine_vkQueueBindSparse, - wine_vkQueueEndDebugUtilsLabelEXT, - wine_vkQueueInsertDebugUtilsLabelEXT, - wine_vkQueuePresentKHR, - wine_vkQueueSetPerformanceConfigurationINTEL, - wine_vkQueueSubmit, - wine_vkQueueSubmit2, - wine_vkQueueSubmit2KHR, - wine_vkQueueWaitIdle, - wine_vkReleasePerformanceConfigurationINTEL, - wine_vkReleaseProfilingLockKHR, - wine_vkResetCommandBuffer, - wine_vkResetCommandPool, - wine_vkResetDescriptorPool, - wine_vkResetEvent, - wine_vkResetFences, - wine_vkResetQueryPool, - wine_vkResetQueryPoolEXT, - wine_vkSetDebugUtilsObjectNameEXT, - wine_vkSetDebugUtilsObjectTagEXT, - wine_vkSetDeviceMemoryPriorityEXT, - wine_vkSetEvent, - wine_vkSetPrivateData, - wine_vkSetPrivateDataEXT, - wine_vkSignalSemaphore, - wine_vkSignalSemaphoreKHR, - wine_vkSubmitDebugUtilsMessageEXT, - wine_vkTrimCommandPool, - wine_vkTrimCommandPoolKHR, - wine_vkUninitializePerformanceApiINTEL, - wine_vkUnmapMemory, - wine_vkUpdateDescriptorSetWithTemplate, - wine_vkUpdateDescriptorSetWithTemplateKHR, - wine_vkUpdateDescriptorSets, - wine_vkWaitForFences, - wine_vkWaitForPresentKHR, - wine_vkWaitSemaphores, - wine_vkWaitSemaphoresKHR, - wine_vkWriteAccelerationStructuresPropertiesKHR, + thunk32_vkGetPhysicalDeviceSurfaceFormats2KHR, + thunk32_vkGetPhysicalDeviceSurfaceFormatsKHR, + thunk32_vkGetPhysicalDeviceSurfacePresentModesKHR, + thunk32_vkGetPhysicalDeviceSurfaceSupportKHR, + thunk32_vkGetPhysicalDeviceToolProperties, + thunk32_vkGetPhysicalDeviceToolPropertiesEXT, + thunk32_vkGetPhysicalDeviceWin32PresentationSupportKHR, + thunk32_vkGetPipelineCacheData, + thunk32_vkGetPipelineExecutableInternalRepresentationsKHR, + thunk32_vkGetPipelineExecutablePropertiesKHR, + thunk32_vkGetPipelineExecutableStatisticsKHR, + thunk32_vkGetPipelinePropertiesEXT, + thunk32_vkGetPrivateData, + thunk32_vkGetPrivateDataEXT, + thunk32_vkGetQueryPoolResults, + thunk32_vkGetQueueCheckpointData2NV, + thunk32_vkGetQueueCheckpointDataNV, + thunk32_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR, + thunk32_vkGetRayTracingShaderGroupHandlesKHR, + thunk32_vkGetRayTracingShaderGroupHandlesNV, + thunk32_vkGetRayTracingShaderGroupStackSizeKHR, + thunk32_vkGetRenderAreaGranularity, + thunk32_vkGetSemaphoreCounterValue, + thunk32_vkGetSemaphoreCounterValueKHR, + thunk32_vkGetShaderInfoAMD, + thunk32_vkGetShaderModuleCreateInfoIdentifierEXT, + thunk32_vkGetShaderModuleIdentifierEXT, + thunk32_vkGetSwapchainImagesKHR, + thunk32_vkGetValidationCacheDataEXT, + thunk32_vkInitializePerformanceApiINTEL, + thunk32_vkInvalidateMappedMemoryRanges, + thunk32_vkMapMemory, + thunk32_vkMergePipelineCaches, + thunk32_vkMergeValidationCachesEXT, + thunk32_vkQueueBeginDebugUtilsLabelEXT, + thunk32_vkQueueBindSparse, + thunk32_vkQueueEndDebugUtilsLabelEXT, + thunk32_vkQueueInsertDebugUtilsLabelEXT, + thunk32_vkQueuePresentKHR, + thunk32_vkQueueSetPerformanceConfigurationINTEL, + thunk32_vkQueueSubmit, + thunk32_vkQueueSubmit2, + thunk32_vkQueueSubmit2KHR, + thunk32_vkQueueWaitIdle, + thunk32_vkReleasePerformanceConfigurationINTEL, + thunk32_vkReleaseProfilingLockKHR, + thunk32_vkResetCommandBuffer, + thunk32_vkResetCommandPool, + thunk32_vkResetDescriptorPool, + thunk32_vkResetEvent, + thunk32_vkResetFences, + thunk32_vkResetQueryPool, + thunk32_vkResetQueryPoolEXT, + thunk32_vkSetDebugUtilsObjectNameEXT, + thunk32_vkSetDebugUtilsObjectTagEXT, + thunk32_vkSetDeviceMemoryPriorityEXT, + thunk32_vkSetEvent, + thunk32_vkSetPrivateData, + thunk32_vkSetPrivateDataEXT, + thunk32_vkSignalSemaphore, + thunk32_vkSignalSemaphoreKHR, + thunk32_vkSubmitDebugUtilsMessageEXT, + thunk32_vkTrimCommandPool, + thunk32_vkTrimCommandPoolKHR, + thunk32_vkUninitializePerformanceApiINTEL, + thunk32_vkUnmapMemory, + thunk32_vkUpdateDescriptorSetWithTemplate, + thunk32_vkUpdateDescriptorSetWithTemplateKHR, + thunk32_vkUpdateDescriptorSets, + thunk32_vkWaitForFences, + thunk32_vkWaitForPresentKHR, + thunk32_vkWaitSemaphores, + thunk32_vkWaitSemaphoresKHR, + thunk32_vkWriteAccelerationStructuresPropertiesKHR, }; C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == unix_count); +#endif /* USE_STRUCT_CONVERSION) */ + NTSTATUS WINAPI vk_direct_unix_call(unixlib_handle_t handle, unsigned int code, void *params) { return __wine_unix_call_funcs[code](params); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/923
From: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 60 +- dlls/winevulkan/vulkan_thunks.c | 2294 ++++++++++++++++++++++++++++--- 2 files changed, 2092 insertions(+), 262 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 330fe86acda..52bd57b951d 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -754,27 +754,6 @@ class VkFunction(object): return proto - def body(self, params_prefix=""): - body = "" - - if not self.needs_private_thunk(): - body += " {0}".format(self.trace(params_prefix=params_prefix)) - - params = ", ".join([p.variable(conv=False, params_prefix=params_prefix) for p in self.params]) - - # Call the native Vulkan function. - body += " " - if self.returns_longlong(): - body += "{0}result = ".format(params_prefix) - elif self.type != "void": - body += "return " - body += "{0}.p_{1}({2});\n".format(self.params[0].dispatch_table(params_prefix), - self.name, params) - if self.type == "void" or self.returns_longlong(): - body += " return STATUS_SUCCESS;\n" - - return body - def loader_body(self): body = " struct {0}_params params;\n".format(self.name) for p in self.params: @@ -792,7 +771,7 @@ class VkFunction(object): body += " return params.result;\n" return body - def body_conversion(self, conv, params_prefix=""): + def body(self, conv, unwrap=True, params_prefix=""): body = "" result_prefix = "" @@ -809,7 +788,7 @@ class VkFunction(object): body += " {0}_host *{1}_host;\n".format(p.type, p.name) else: body += " {0}_host {1}_host;\n".format(p.type, p.name) - elif p.needs_unwrapping(): + elif unwrap and p.needs_unwrapping(): if p.is_dynamic_array(): body += " {0} *{1}_host;\n".format(p.type, p.name) else: @@ -820,7 +799,7 @@ class VkFunction(object): # Call any win_to_host conversion calls. for p in self.params: - if p.needs_input_conversion() and (p.needs_unwrapping() or conv): + if p.needs_input_conversion() and (conv or (unwrap and p.needs_unwrapping())): body += p.copy(Direction.INPUT, prefix=params_prefix) # Build list of parameters containing converted and non-converted parameters. @@ -839,15 +818,16 @@ class VkFunction(object): body += "\n" # Call any host_to_win conversion calls. - for p in self.params: - if not p.needs_output_conversion(): - continue + if conv: + for p in self.params: + if not p.output_conv: + continue - body += p.copy(Direction.OUTPUT, prefix=params_prefix) + body += p.copy(Direction.OUTPUT, prefix=params_prefix) # Perform any required cleanups. Most of these are for array functions. for p in self.params: - if p.needs_free() and (p.needs_unwrapping() or conv): + if p.needs_free() and (conv or (unwrap and p.needs_unwrapping())): body += p.free(prefix=params_prefix) # Finally return the result. @@ -898,20 +878,14 @@ class VkFunction(object): if prefix == "thunk_": thunk = self.prototype(prefix=prefix) thunk += "\n{\n" - params_prefix = "" - else: - thunk = "NTSTATUS {0}{1}(void *args)\n".format(prefix, self.name) - thunk += "{\n" - thunk += " struct {0}_params *params = args;\n".format(self.name) - params_prefix = "params->" - - if conv and self.needs_conversion(): - thunk += self.body_conversion(conv=True, params_prefix=params_prefix) - elif self.needs_unwrapping(): - thunk += self.body_conversion(conv=False, params_prefix=params_prefix) - else: - thunk += self.body(params_prefix=params_prefix) - + thunk += self.body(conv=conv) + thunk += "}\n\n" + return thunk + + thunk = "NTSTATUS {0}{1}(void *args)\n".format(prefix, self.name) + thunk += "{\n" + thunk += " struct {0}_params *params = args;\n".format(self.name) + thunk += self.body(conv=conv, unwrap=not self.needs_private_thunk(), params_prefix="params->") thunk += "}\n\n" return thunk diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 705677ee7b6..f186ed54b31 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -5283,8 +5283,12 @@ void free_VkInstanceCreateInfo_struct_chain(VkInstanceCreateInfo *s) static NTSTATUS thunk64_vkAcquireNextImage2KHR(void *args) { struct vkAcquireNextImage2KHR_params *params = args; + VkResult result; TRACE("%p, %p, %p\n", params->device, params->pAcquireInfo, params->pImageIndex); - return wine_device_from_handle(params->device)->funcs.p_vkAcquireNextImage2KHR(wine_device_from_handle(params->device)->device, params->pAcquireInfo, params->pImageIndex); + + result = wine_device_from_handle(params->device)->funcs.p_vkAcquireNextImage2KHR(wine_device_from_handle(params->device)->device, params->pAcquireInfo, params->pImageIndex); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -5309,8 +5313,12 @@ static NTSTATUS thunk32_vkAcquireNextImage2KHR(void *args) static NTSTATUS thunk64_vkAcquireNextImageKHR(void *args) { struct vkAcquireNextImageKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->swapchain), wine_dbgstr_longlong(params->timeout), wine_dbgstr_longlong(params->semaphore), wine_dbgstr_longlong(params->fence), params->pImageIndex); - return wine_device_from_handle(params->device)->funcs.p_vkAcquireNextImageKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->timeout, params->semaphore, params->fence, params->pImageIndex); + + result = wine_device_from_handle(params->device)->funcs.p_vkAcquireNextImageKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->timeout, params->semaphore, params->fence, params->pImageIndex); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -5318,8 +5326,12 @@ static NTSTATUS thunk64_vkAcquireNextImageKHR(void *args) static NTSTATUS thunk32_vkAcquireNextImageKHR(void *args) { struct vkAcquireNextImageKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->swapchain), wine_dbgstr_longlong(params->timeout), wine_dbgstr_longlong(params->semaphore), wine_dbgstr_longlong(params->fence), params->pImageIndex); - return wine_device_from_handle(params->device)->funcs.p_vkAcquireNextImageKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->timeout, params->semaphore, params->fence, params->pImageIndex); + + result = wine_device_from_handle(params->device)->funcs.p_vkAcquireNextImageKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->timeout, params->semaphore, params->fence, params->pImageIndex); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -5329,8 +5341,12 @@ static NTSTATUS thunk32_vkAcquireNextImageKHR(void *args) static NTSTATUS thunk64_vkAcquirePerformanceConfigurationINTEL(void *args) { struct vkAcquirePerformanceConfigurationINTEL_params *params = args; + VkResult result; TRACE("%p, %p, %p\n", params->device, params->pAcquireInfo, params->pConfiguration); - return wine_device_from_handle(params->device)->funcs.p_vkAcquirePerformanceConfigurationINTEL(wine_device_from_handle(params->device)->device, params->pAcquireInfo, params->pConfiguration); + + result = wine_device_from_handle(params->device)->funcs.p_vkAcquirePerformanceConfigurationINTEL(wine_device_from_handle(params->device)->device, params->pAcquireInfo, params->pConfiguration); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -5338,8 +5354,12 @@ static NTSTATUS thunk64_vkAcquirePerformanceConfigurationINTEL(void *args) static NTSTATUS thunk32_vkAcquirePerformanceConfigurationINTEL(void *args) { struct vkAcquirePerformanceConfigurationINTEL_params *params = args; + VkResult result; TRACE("%p, %p, %p\n", params->device, params->pAcquireInfo, params->pConfiguration); - return wine_device_from_handle(params->device)->funcs.p_vkAcquirePerformanceConfigurationINTEL(wine_device_from_handle(params->device)->device, params->pAcquireInfo, params->pConfiguration); + + result = wine_device_from_handle(params->device)->funcs.p_vkAcquirePerformanceConfigurationINTEL(wine_device_from_handle(params->device)->device, params->pAcquireInfo, params->pConfiguration); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -5349,8 +5369,12 @@ static NTSTATUS thunk32_vkAcquirePerformanceConfigurationINTEL(void *args) static NTSTATUS thunk64_vkAcquireProfilingLockKHR(void *args) { struct vkAcquireProfilingLockKHR_params *params = args; + VkResult result; TRACE("%p, %p\n", params->device, params->pInfo); - return wine_device_from_handle(params->device)->funcs.p_vkAcquireProfilingLockKHR(wine_device_from_handle(params->device)->device, params->pInfo); + + result = wine_device_from_handle(params->device)->funcs.p_vkAcquireProfilingLockKHR(wine_device_from_handle(params->device)->device, params->pInfo); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -5375,8 +5399,12 @@ static NTSTATUS thunk32_vkAcquireProfilingLockKHR(void *args) static NTSTATUS thunk64_vkAllocateDescriptorSets(void *args) { struct vkAllocateDescriptorSets_params *params = args; + VkResult result; TRACE("%p, %p, %p\n", params->device, params->pAllocateInfo, params->pDescriptorSets); - return wine_device_from_handle(params->device)->funcs.p_vkAllocateDescriptorSets(wine_device_from_handle(params->device)->device, params->pAllocateInfo, params->pDescriptorSets); + + result = wine_device_from_handle(params->device)->funcs.p_vkAllocateDescriptorSets(wine_device_from_handle(params->device)->device, params->pAllocateInfo, params->pDescriptorSets); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -5401,8 +5429,12 @@ static NTSTATUS thunk32_vkAllocateDescriptorSets(void *args) static NTSTATUS thunk64_vkAllocateMemory(void *args) { struct vkAllocateMemory_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pAllocateInfo, params->pAllocator, params->pMemory); - return wine_device_from_handle(params->device)->funcs.p_vkAllocateMemory(wine_device_from_handle(params->device)->device, params->pAllocateInfo, NULL, params->pMemory); + + result = wine_device_from_handle(params->device)->funcs.p_vkAllocateMemory(wine_device_from_handle(params->device)->device, params->pAllocateInfo, NULL, params->pMemory); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -5427,8 +5459,12 @@ static NTSTATUS thunk32_vkAllocateMemory(void *args) static NTSTATUS thunk64_vkBeginCommandBuffer(void *args) { struct vkBeginCommandBuffer_params *params = args; + VkResult result; TRACE("%p, %p\n", params->commandBuffer, params->pBeginInfo); - return wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkBeginCommandBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pBeginInfo); + + result = wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkBeginCommandBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pBeginInfo); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -5454,8 +5490,12 @@ static NTSTATUS thunk32_vkBeginCommandBuffer(void *args) static NTSTATUS thunk64_vkBindAccelerationStructureMemoryNV(void *args) { struct vkBindAccelerationStructureMemoryNV_params *params = args; + VkResult result; TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos); - return wine_device_from_handle(params->device)->funcs.p_vkBindAccelerationStructureMemoryNV(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); + + result = wine_device_from_handle(params->device)->funcs.p_vkBindAccelerationStructureMemoryNV(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -5481,8 +5521,12 @@ static NTSTATUS thunk32_vkBindAccelerationStructureMemoryNV(void *args) static NTSTATUS thunk64_vkBindBufferMemory(void *args) { struct vkBindBufferMemory_params *params = args; + VkResult result; TRACE("%p, 0x%s, 0x%s, 0x%s\n", params->device, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->memoryOffset)); - return wine_device_from_handle(params->device)->funcs.p_vkBindBufferMemory(wine_device_from_handle(params->device)->device, params->buffer, params->memory, params->memoryOffset); + + result = wine_device_from_handle(params->device)->funcs.p_vkBindBufferMemory(wine_device_from_handle(params->device)->device, params->buffer, params->memory, params->memoryOffset); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -5490,8 +5534,12 @@ static NTSTATUS thunk64_vkBindBufferMemory(void *args) static NTSTATUS thunk32_vkBindBufferMemory(void *args) { struct vkBindBufferMemory_params *params = args; + VkResult result; TRACE("%p, 0x%s, 0x%s, 0x%s\n", params->device, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->memoryOffset)); - return wine_device_from_handle(params->device)->funcs.p_vkBindBufferMemory(wine_device_from_handle(params->device)->device, params->buffer, params->memory, params->memoryOffset); + + result = wine_device_from_handle(params->device)->funcs.p_vkBindBufferMemory(wine_device_from_handle(params->device)->device, params->buffer, params->memory, params->memoryOffset); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -5501,8 +5549,12 @@ static NTSTATUS thunk32_vkBindBufferMemory(void *args) static NTSTATUS thunk64_vkBindBufferMemory2(void *args) { struct vkBindBufferMemory2_params *params = args; + VkResult result; TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos); - return wine_device_from_handle(params->device)->funcs.p_vkBindBufferMemory2(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); + + result = wine_device_from_handle(params->device)->funcs.p_vkBindBufferMemory2(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -5528,8 +5580,12 @@ static NTSTATUS thunk32_vkBindBufferMemory2(void *args) static NTSTATUS thunk64_vkBindBufferMemory2KHR(void *args) { struct vkBindBufferMemory2KHR_params *params = args; + VkResult result; TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos); - return wine_device_from_handle(params->device)->funcs.p_vkBindBufferMemory2KHR(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); + + result = wine_device_from_handle(params->device)->funcs.p_vkBindBufferMemory2KHR(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -5555,8 +5611,12 @@ static NTSTATUS thunk32_vkBindBufferMemory2KHR(void *args) static NTSTATUS thunk64_vkBindImageMemory(void *args) { struct vkBindImageMemory_params *params = args; + VkResult result; TRACE("%p, 0x%s, 0x%s, 0x%s\n", params->device, wine_dbgstr_longlong(params->image), wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->memoryOffset)); - return wine_device_from_handle(params->device)->funcs.p_vkBindImageMemory(wine_device_from_handle(params->device)->device, params->image, params->memory, params->memoryOffset); + + result = wine_device_from_handle(params->device)->funcs.p_vkBindImageMemory(wine_device_from_handle(params->device)->device, params->image, params->memory, params->memoryOffset); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -5564,8 +5624,12 @@ static NTSTATUS thunk64_vkBindImageMemory(void *args) static NTSTATUS thunk32_vkBindImageMemory(void *args) { struct vkBindImageMemory_params *params = args; + VkResult result; TRACE("%p, 0x%s, 0x%s, 0x%s\n", params->device, wine_dbgstr_longlong(params->image), wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->memoryOffset)); - return wine_device_from_handle(params->device)->funcs.p_vkBindImageMemory(wine_device_from_handle(params->device)->device, params->image, params->memory, params->memoryOffset); + + result = wine_device_from_handle(params->device)->funcs.p_vkBindImageMemory(wine_device_from_handle(params->device)->device, params->image, params->memory, params->memoryOffset); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -5575,8 +5639,12 @@ static NTSTATUS thunk32_vkBindImageMemory(void *args) static NTSTATUS thunk64_vkBindImageMemory2(void *args) { struct vkBindImageMemory2_params *params = args; + VkResult result; TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos); - return wine_device_from_handle(params->device)->funcs.p_vkBindImageMemory2(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); + + result = wine_device_from_handle(params->device)->funcs.p_vkBindImageMemory2(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -5602,8 +5670,12 @@ static NTSTATUS thunk32_vkBindImageMemory2(void *args) static NTSTATUS thunk64_vkBindImageMemory2KHR(void *args) { struct vkBindImageMemory2KHR_params *params = args; + VkResult result; TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos); - return wine_device_from_handle(params->device)->funcs.p_vkBindImageMemory2KHR(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); + + result = wine_device_from_handle(params->device)->funcs.p_vkBindImageMemory2KHR(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -5629,8 +5701,12 @@ static NTSTATUS thunk32_vkBindImageMemory2KHR(void *args) static NTSTATUS thunk64_vkBuildAccelerationStructuresKHR(void *args) { struct vkBuildAccelerationStructuresKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, %u, %p, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->infoCount, params->pInfos, params->ppBuildRangeInfos); - return wine_device_from_handle(params->device)->funcs.p_vkBuildAccelerationStructuresKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, params->infoCount, params->pInfos, params->ppBuildRangeInfos); + + result = wine_device_from_handle(params->device)->funcs.p_vkBuildAccelerationStructuresKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, params->infoCount, params->pInfos, params->ppBuildRangeInfos); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -5657,7 +5733,9 @@ static NTSTATUS thunk64_vkCmdBeginConditionalRenderingEXT(void *args) { struct vkCmdBeginConditionalRenderingEXT_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pConditionalRenderingBegin); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginConditionalRenderingEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pConditionalRenderingBegin); + return STATUS_SUCCESS; } @@ -5683,7 +5761,9 @@ static NTSTATUS thunk64_vkCmdBeginDebugUtilsLabelEXT(void *args) { struct vkCmdBeginDebugUtilsLabelEXT_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pLabelInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginDebugUtilsLabelEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pLabelInfo); + return STATUS_SUCCESS; } @@ -5693,7 +5773,9 @@ static NTSTATUS thunk32_vkCmdBeginDebugUtilsLabelEXT(void *args) { struct vkCmdBeginDebugUtilsLabelEXT_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pLabelInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginDebugUtilsLabelEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pLabelInfo); + return STATUS_SUCCESS; } @@ -5705,7 +5787,9 @@ static NTSTATUS thunk64_vkCmdBeginQuery(void *args) { struct vkCmdBeginQuery_params *params = args; TRACE("%p, 0x%s, %u, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query, params->flags); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginQuery(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->query, params->flags); + return STATUS_SUCCESS; } @@ -5715,7 +5799,9 @@ static NTSTATUS thunk32_vkCmdBeginQuery(void *args) { struct vkCmdBeginQuery_params *params = args; TRACE("%p, 0x%s, %u, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query, params->flags); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginQuery(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->query, params->flags); + return STATUS_SUCCESS; } @@ -5727,7 +5813,9 @@ static NTSTATUS thunk64_vkCmdBeginQueryIndexedEXT(void *args) { struct vkCmdBeginQueryIndexedEXT_params *params = args; TRACE("%p, 0x%s, %u, %#x, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query, params->flags, params->index); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginQueryIndexedEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->query, params->flags, params->index); + return STATUS_SUCCESS; } @@ -5737,7 +5825,9 @@ static NTSTATUS thunk32_vkCmdBeginQueryIndexedEXT(void *args) { struct vkCmdBeginQueryIndexedEXT_params *params = args; TRACE("%p, 0x%s, %u, %#x, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query, params->flags, params->index); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginQueryIndexedEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->query, params->flags, params->index); + return STATUS_SUCCESS; } @@ -5749,7 +5839,9 @@ static NTSTATUS thunk64_vkCmdBeginRenderPass(void *args) { struct vkCmdBeginRenderPass_params *params = args; TRACE("%p, %p, %#x\n", params->commandBuffer, params->pRenderPassBegin, params->contents); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderPass(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRenderPassBegin, params->contents); + return STATUS_SUCCESS; } @@ -5775,7 +5867,9 @@ static NTSTATUS thunk64_vkCmdBeginRenderPass2(void *args) { struct vkCmdBeginRenderPass2_params *params = args; TRACE("%p, %p, %p\n", params->commandBuffer, params->pRenderPassBegin, params->pSubpassBeginInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderPass2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRenderPassBegin, params->pSubpassBeginInfo); + return STATUS_SUCCESS; } @@ -5801,7 +5895,9 @@ static NTSTATUS thunk64_vkCmdBeginRenderPass2KHR(void *args) { struct vkCmdBeginRenderPass2KHR_params *params = args; TRACE("%p, %p, %p\n", params->commandBuffer, params->pRenderPassBegin, params->pSubpassBeginInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderPass2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRenderPassBegin, params->pSubpassBeginInfo); + return STATUS_SUCCESS; } @@ -5827,7 +5923,9 @@ static NTSTATUS thunk64_vkCmdBeginRendering(void *args) { struct vkCmdBeginRendering_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pRenderingInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRendering(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRenderingInfo); + return STATUS_SUCCESS; } @@ -5854,7 +5952,9 @@ static NTSTATUS thunk64_vkCmdBeginRenderingKHR(void *args) { struct vkCmdBeginRenderingKHR_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pRenderingInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderingKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRenderingInfo); + return STATUS_SUCCESS; } @@ -5881,7 +5981,9 @@ static NTSTATUS thunk64_vkCmdBeginTransformFeedbackEXT(void *args) { struct vkCmdBeginTransformFeedbackEXT_params *params = args; TRACE("%p, %u, %u, %p, %p\n", params->commandBuffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginTransformFeedbackEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets); + return STATUS_SUCCESS; } @@ -5891,7 +5993,9 @@ static NTSTATUS thunk32_vkCmdBeginTransformFeedbackEXT(void *args) { struct vkCmdBeginTransformFeedbackEXT_params *params = args; TRACE("%p, %u, %u, %p, %p\n", params->commandBuffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginTransformFeedbackEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets); + return STATUS_SUCCESS; } @@ -5903,7 +6007,9 @@ static NTSTATUS thunk64_vkCmdBindDescriptorSets(void *args) { struct vkCmdBindDescriptorSets_params *params = args; TRACE("%p, %#x, 0x%s, %u, %u, %p, %u, %p\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->layout), params->firstSet, params->descriptorSetCount, params->pDescriptorSets, params->dynamicOffsetCount, params->pDynamicOffsets); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindDescriptorSets(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineBindPoint, params->layout, params->firstSet, params->descriptorSetCount, params->pDescriptorSets, params->dynamicOffsetCount, params->pDynamicOffsets); + return STATUS_SUCCESS; } @@ -5913,7 +6019,9 @@ static NTSTATUS thunk32_vkCmdBindDescriptorSets(void *args) { struct vkCmdBindDescriptorSets_params *params = args; TRACE("%p, %#x, 0x%s, %u, %u, %p, %u, %p\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->layout), params->firstSet, params->descriptorSetCount, params->pDescriptorSets, params->dynamicOffsetCount, params->pDynamicOffsets); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindDescriptorSets(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineBindPoint, params->layout, params->firstSet, params->descriptorSetCount, params->pDescriptorSets, params->dynamicOffsetCount, params->pDynamicOffsets); + return STATUS_SUCCESS; } @@ -5925,7 +6033,9 @@ static NTSTATUS thunk64_vkCmdBindIndexBuffer(void *args) { struct vkCmdBindIndexBuffer_params *params = args; TRACE("%p, 0x%s, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->indexType); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindIndexBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->indexType); + return STATUS_SUCCESS; } @@ -5935,7 +6045,9 @@ static NTSTATUS thunk32_vkCmdBindIndexBuffer(void *args) { struct vkCmdBindIndexBuffer_params *params = args; TRACE("%p, 0x%s, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->indexType); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindIndexBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->indexType); + return STATUS_SUCCESS; } @@ -5947,7 +6059,9 @@ static NTSTATUS thunk64_vkCmdBindInvocationMaskHUAWEI(void *args) { struct vkCmdBindInvocationMaskHUAWEI_params *params = args; TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->imageView), params->imageLayout); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindInvocationMaskHUAWEI(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->imageView, params->imageLayout); + return STATUS_SUCCESS; } @@ -5957,7 +6071,9 @@ static NTSTATUS thunk32_vkCmdBindInvocationMaskHUAWEI(void *args) { struct vkCmdBindInvocationMaskHUAWEI_params *params = args; TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->imageView), params->imageLayout); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindInvocationMaskHUAWEI(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->imageView, params->imageLayout); + return STATUS_SUCCESS; } @@ -5969,7 +6085,9 @@ static NTSTATUS thunk64_vkCmdBindPipeline(void *args) { struct vkCmdBindPipeline_params *params = args; TRACE("%p, %#x, 0x%s\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->pipeline)); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindPipeline(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineBindPoint, params->pipeline); + return STATUS_SUCCESS; } @@ -5979,7 +6097,9 @@ static NTSTATUS thunk32_vkCmdBindPipeline(void *args) { struct vkCmdBindPipeline_params *params = args; TRACE("%p, %#x, 0x%s\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->pipeline)); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindPipeline(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineBindPoint, params->pipeline); + return STATUS_SUCCESS; } @@ -5991,7 +6111,9 @@ static NTSTATUS thunk64_vkCmdBindPipelineShaderGroupNV(void *args) { struct vkCmdBindPipelineShaderGroupNV_params *params = args; TRACE("%p, %#x, 0x%s, %u\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->pipeline), params->groupIndex); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindPipelineShaderGroupNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineBindPoint, params->pipeline, params->groupIndex); + return STATUS_SUCCESS; } @@ -6001,7 +6123,9 @@ static NTSTATUS thunk32_vkCmdBindPipelineShaderGroupNV(void *args) { struct vkCmdBindPipelineShaderGroupNV_params *params = args; TRACE("%p, %#x, 0x%s, %u\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->pipeline), params->groupIndex); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindPipelineShaderGroupNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineBindPoint, params->pipeline, params->groupIndex); + return STATUS_SUCCESS; } @@ -6013,7 +6137,9 @@ static NTSTATUS thunk64_vkCmdBindShadingRateImageNV(void *args) { struct vkCmdBindShadingRateImageNV_params *params = args; TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->imageView), params->imageLayout); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindShadingRateImageNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->imageView, params->imageLayout); + return STATUS_SUCCESS; } @@ -6023,7 +6149,9 @@ static NTSTATUS thunk32_vkCmdBindShadingRateImageNV(void *args) { struct vkCmdBindShadingRateImageNV_params *params = args; TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->imageView), params->imageLayout); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindShadingRateImageNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->imageView, params->imageLayout); + return STATUS_SUCCESS; } @@ -6035,7 +6163,9 @@ static NTSTATUS thunk64_vkCmdBindTransformFeedbackBuffersEXT(void *args) { struct vkCmdBindTransformFeedbackBuffersEXT_params *params = args; TRACE("%p, %u, %u, %p, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindTransformFeedbackBuffersEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes); + return STATUS_SUCCESS; } @@ -6045,7 +6175,9 @@ static NTSTATUS thunk32_vkCmdBindTransformFeedbackBuffersEXT(void *args) { struct vkCmdBindTransformFeedbackBuffersEXT_params *params = args; TRACE("%p, %u, %u, %p, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindTransformFeedbackBuffersEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes); + return STATUS_SUCCESS; } @@ -6057,7 +6189,9 @@ static NTSTATUS thunk64_vkCmdBindVertexBuffers(void *args) { struct vkCmdBindVertexBuffers_params *params = args; TRACE("%p, %u, %u, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindVertexBuffers(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets); + return STATUS_SUCCESS; } @@ -6067,7 +6201,9 @@ static NTSTATUS thunk32_vkCmdBindVertexBuffers(void *args) { struct vkCmdBindVertexBuffers_params *params = args; TRACE("%p, %u, %u, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindVertexBuffers(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets); + return STATUS_SUCCESS; } @@ -6079,7 +6215,9 @@ static NTSTATUS thunk64_vkCmdBindVertexBuffers2(void *args) { struct vkCmdBindVertexBuffers2_params *params = args; TRACE("%p, %u, %u, %p, %p, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindVertexBuffers2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides); + return STATUS_SUCCESS; } @@ -6089,7 +6227,9 @@ static NTSTATUS thunk32_vkCmdBindVertexBuffers2(void *args) { struct vkCmdBindVertexBuffers2_params *params = args; TRACE("%p, %u, %u, %p, %p, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindVertexBuffers2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides); + return STATUS_SUCCESS; } @@ -6101,7 +6241,9 @@ static NTSTATUS thunk64_vkCmdBindVertexBuffers2EXT(void *args) { struct vkCmdBindVertexBuffers2EXT_params *params = args; TRACE("%p, %u, %u, %p, %p, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindVertexBuffers2EXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides); + return STATUS_SUCCESS; } @@ -6111,7 +6253,9 @@ static NTSTATUS thunk32_vkCmdBindVertexBuffers2EXT(void *args) { struct vkCmdBindVertexBuffers2EXT_params *params = args; TRACE("%p, %u, %u, %p, %p, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindVertexBuffers2EXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides); + return STATUS_SUCCESS; } @@ -6123,7 +6267,9 @@ static NTSTATUS thunk64_vkCmdBlitImage(void *args) { struct vkCmdBlitImage_params *params = args; TRACE("%p, 0x%s, %#x, 0x%s, %#x, %u, %p, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions, params->filter); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBlitImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcImage, params->srcImageLayout, params->dstImage, params->dstImageLayout, params->regionCount, params->pRegions, params->filter); + return STATUS_SUCCESS; } @@ -6133,7 +6279,9 @@ static NTSTATUS thunk32_vkCmdBlitImage(void *args) { struct vkCmdBlitImage_params *params = args; TRACE("%p, 0x%s, %#x, 0x%s, %#x, %u, %p, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions, params->filter); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBlitImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcImage, params->srcImageLayout, params->dstImage, params->dstImageLayout, params->regionCount, params->pRegions, params->filter); + return STATUS_SUCCESS; } @@ -6145,7 +6293,9 @@ static NTSTATUS thunk64_vkCmdBlitImage2(void *args) { struct vkCmdBlitImage2_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pBlitImageInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBlitImage2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pBlitImageInfo); + return STATUS_SUCCESS; } @@ -6171,7 +6321,9 @@ static NTSTATUS thunk64_vkCmdBlitImage2KHR(void *args) { struct vkCmdBlitImage2KHR_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pBlitImageInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBlitImage2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pBlitImageInfo); + return STATUS_SUCCESS; } @@ -6197,7 +6349,9 @@ static NTSTATUS thunk64_vkCmdBuildAccelerationStructureNV(void *args) { struct vkCmdBuildAccelerationStructureNV_params *params = args; TRACE("%p, %p, 0x%s, 0x%s, %u, 0x%s, 0x%s, 0x%s, 0x%s\n", params->commandBuffer, params->pInfo, wine_dbgstr_longlong(params->instanceData), wine_dbgstr_longlong(params->instanceOffset), params->update, wine_dbgstr_longlong(params->dst), wine_dbgstr_longlong(params->src), wine_dbgstr_longlong(params->scratch), wine_dbgstr_longlong(params->scratchOffset)); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBuildAccelerationStructureNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pInfo, params->instanceData, params->instanceOffset, params->update, params->dst, params->src, params->scratch, params->scratchOffset); + return STATUS_SUCCESS; } @@ -6224,7 +6378,9 @@ static NTSTATUS thunk64_vkCmdBuildAccelerationStructuresIndirectKHR(void *args) { struct vkCmdBuildAccelerationStructuresIndirectKHR_params *params = args; TRACE("%p, %u, %p, %p, %p, %p\n", params->commandBuffer, params->infoCount, params->pInfos, params->pIndirectDeviceAddresses, params->pIndirectStrides, params->ppMaxPrimitiveCounts); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBuildAccelerationStructuresIndirectKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->infoCount, params->pInfos, params->pIndirectDeviceAddresses, params->pIndirectStrides, params->ppMaxPrimitiveCounts); + return STATUS_SUCCESS; } @@ -6251,7 +6407,9 @@ static NTSTATUS thunk64_vkCmdBuildAccelerationStructuresKHR(void *args) { struct vkCmdBuildAccelerationStructuresKHR_params *params = args; TRACE("%p, %u, %p, %p\n", params->commandBuffer, params->infoCount, params->pInfos, params->ppBuildRangeInfos); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBuildAccelerationStructuresKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->infoCount, params->pInfos, params->ppBuildRangeInfos); + return STATUS_SUCCESS; } @@ -6278,7 +6436,9 @@ static NTSTATUS thunk64_vkCmdClearAttachments(void *args) { struct vkCmdClearAttachments_params *params = args; TRACE("%p, %u, %p, %u, %p\n", params->commandBuffer, params->attachmentCount, params->pAttachments, params->rectCount, params->pRects); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdClearAttachments(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->attachmentCount, params->pAttachments, params->rectCount, params->pRects); + return STATUS_SUCCESS; } @@ -6288,7 +6448,9 @@ static NTSTATUS thunk32_vkCmdClearAttachments(void *args) { struct vkCmdClearAttachments_params *params = args; TRACE("%p, %u, %p, %u, %p\n", params->commandBuffer, params->attachmentCount, params->pAttachments, params->rectCount, params->pRects); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdClearAttachments(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->attachmentCount, params->pAttachments, params->rectCount, params->pRects); + return STATUS_SUCCESS; } @@ -6300,7 +6462,9 @@ static NTSTATUS thunk64_vkCmdClearColorImage(void *args) { struct vkCmdClearColorImage_params *params = args; TRACE("%p, 0x%s, %#x, %p, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->image), params->imageLayout, params->pColor, params->rangeCount, params->pRanges); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdClearColorImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->image, params->imageLayout, params->pColor, params->rangeCount, params->pRanges); + return STATUS_SUCCESS; } @@ -6310,7 +6474,9 @@ static NTSTATUS thunk32_vkCmdClearColorImage(void *args) { struct vkCmdClearColorImage_params *params = args; TRACE("%p, 0x%s, %#x, %p, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->image), params->imageLayout, params->pColor, params->rangeCount, params->pRanges); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdClearColorImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->image, params->imageLayout, params->pColor, params->rangeCount, params->pRanges); + return STATUS_SUCCESS; } @@ -6322,7 +6488,9 @@ static NTSTATUS thunk64_vkCmdClearDepthStencilImage(void *args) { struct vkCmdClearDepthStencilImage_params *params = args; TRACE("%p, 0x%s, %#x, %p, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->image), params->imageLayout, params->pDepthStencil, params->rangeCount, params->pRanges); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdClearDepthStencilImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->image, params->imageLayout, params->pDepthStencil, params->rangeCount, params->pRanges); + return STATUS_SUCCESS; } @@ -6332,7 +6500,9 @@ static NTSTATUS thunk32_vkCmdClearDepthStencilImage(void *args) { struct vkCmdClearDepthStencilImage_params *params = args; TRACE("%p, 0x%s, %#x, %p, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->image), params->imageLayout, params->pDepthStencil, params->rangeCount, params->pRanges); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdClearDepthStencilImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->image, params->imageLayout, params->pDepthStencil, params->rangeCount, params->pRanges); + return STATUS_SUCCESS; } @@ -6344,7 +6514,9 @@ static NTSTATUS thunk64_vkCmdCopyAccelerationStructureKHR(void *args) { struct vkCmdCopyAccelerationStructureKHR_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyAccelerationStructureKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pInfo); + return STATUS_SUCCESS; } @@ -6370,7 +6542,9 @@ static NTSTATUS thunk64_vkCmdCopyAccelerationStructureNV(void *args) { struct vkCmdCopyAccelerationStructureNV_params *params = args; TRACE("%p, 0x%s, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->dst), wine_dbgstr_longlong(params->src), params->mode); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyAccelerationStructureNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->dst, params->src, params->mode); + return STATUS_SUCCESS; } @@ -6380,7 +6554,9 @@ static NTSTATUS thunk32_vkCmdCopyAccelerationStructureNV(void *args) { struct vkCmdCopyAccelerationStructureNV_params *params = args; TRACE("%p, 0x%s, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->dst), wine_dbgstr_longlong(params->src), params->mode); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyAccelerationStructureNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->dst, params->src, params->mode); + return STATUS_SUCCESS; } @@ -6392,7 +6568,9 @@ static NTSTATUS thunk64_vkCmdCopyAccelerationStructureToMemoryKHR(void *args) { struct vkCmdCopyAccelerationStructureToMemoryKHR_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyAccelerationStructureToMemoryKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pInfo); + return STATUS_SUCCESS; } @@ -6418,7 +6596,9 @@ static NTSTATUS thunk64_vkCmdCopyBuffer(void *args) { struct vkCmdCopyBuffer_params *params = args; TRACE("%p, 0x%s, 0x%s, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcBuffer), wine_dbgstr_longlong(params->dstBuffer), params->regionCount, params->pRegions); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcBuffer, params->dstBuffer, params->regionCount, params->pRegions); + return STATUS_SUCCESS; } @@ -6445,7 +6625,9 @@ static NTSTATUS thunk64_vkCmdCopyBuffer2(void *args) { struct vkCmdCopyBuffer2_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pCopyBufferInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBuffer2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyBufferInfo); + return STATUS_SUCCESS; } @@ -6472,7 +6654,9 @@ static NTSTATUS thunk64_vkCmdCopyBuffer2KHR(void *args) { struct vkCmdCopyBuffer2KHR_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pCopyBufferInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBuffer2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyBufferInfo); + return STATUS_SUCCESS; } @@ -6499,7 +6683,9 @@ static NTSTATUS thunk64_vkCmdCopyBufferToImage(void *args) { struct vkCmdCopyBufferToImage_params *params = args; TRACE("%p, 0x%s, 0x%s, %#x, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcBuffer), wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBufferToImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcBuffer, params->dstImage, params->dstImageLayout, params->regionCount, params->pRegions); + return STATUS_SUCCESS; } @@ -6526,7 +6712,9 @@ static NTSTATUS thunk64_vkCmdCopyBufferToImage2(void *args) { struct vkCmdCopyBufferToImage2_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pCopyBufferToImageInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBufferToImage2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyBufferToImageInfo); + return STATUS_SUCCESS; } @@ -6553,7 +6741,9 @@ static NTSTATUS thunk64_vkCmdCopyBufferToImage2KHR(void *args) { struct vkCmdCopyBufferToImage2KHR_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pCopyBufferToImageInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBufferToImage2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyBufferToImageInfo); + return STATUS_SUCCESS; } @@ -6580,7 +6770,9 @@ static NTSTATUS thunk64_vkCmdCopyImage(void *args) { struct vkCmdCopyImage_params *params = args; TRACE("%p, 0x%s, %#x, 0x%s, %#x, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcImage, params->srcImageLayout, params->dstImage, params->dstImageLayout, params->regionCount, params->pRegions); + return STATUS_SUCCESS; } @@ -6590,7 +6782,9 @@ static NTSTATUS thunk32_vkCmdCopyImage(void *args) { struct vkCmdCopyImage_params *params = args; TRACE("%p, 0x%s, %#x, 0x%s, %#x, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcImage, params->srcImageLayout, params->dstImage, params->dstImageLayout, params->regionCount, params->pRegions); + return STATUS_SUCCESS; } @@ -6602,7 +6796,9 @@ static NTSTATUS thunk64_vkCmdCopyImage2(void *args) { struct vkCmdCopyImage2_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImage2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyImageInfo); + return STATUS_SUCCESS; } @@ -6628,7 +6824,9 @@ static NTSTATUS thunk64_vkCmdCopyImage2KHR(void *args) { struct vkCmdCopyImage2KHR_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImage2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyImageInfo); + return STATUS_SUCCESS; } @@ -6654,7 +6852,9 @@ static NTSTATUS thunk64_vkCmdCopyImageToBuffer(void *args) { struct vkCmdCopyImageToBuffer_params *params = args; TRACE("%p, 0x%s, %#x, 0x%s, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstBuffer), params->regionCount, params->pRegions); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImageToBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcImage, params->srcImageLayout, params->dstBuffer, params->regionCount, params->pRegions); + return STATUS_SUCCESS; } @@ -6681,7 +6881,9 @@ static NTSTATUS thunk64_vkCmdCopyImageToBuffer2(void *args) { struct vkCmdCopyImageToBuffer2_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageToBufferInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImageToBuffer2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyImageToBufferInfo); + return STATUS_SUCCESS; } @@ -6708,7 +6910,9 @@ static NTSTATUS thunk64_vkCmdCopyImageToBuffer2KHR(void *args) { struct vkCmdCopyImageToBuffer2KHR_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageToBufferInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImageToBuffer2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyImageToBufferInfo); + return STATUS_SUCCESS; } @@ -6735,7 +6939,9 @@ static NTSTATUS thunk64_vkCmdCopyMemoryToAccelerationStructureKHR(void *args) { struct vkCmdCopyMemoryToAccelerationStructureKHR_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyMemoryToAccelerationStructureKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pInfo); + return STATUS_SUCCESS; } @@ -6761,7 +6967,9 @@ static NTSTATUS thunk64_vkCmdCopyQueryPoolResults(void *args) { struct vkCmdCopyQueryPoolResults_params *params = args; TRACE("%p, 0x%s, %u, %u, 0x%s, 0x%s, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), wine_dbgstr_longlong(params->stride), params->flags); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyQueryPoolResults(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->firstQuery, params->queryCount, params->dstBuffer, params->dstOffset, params->stride, params->flags); + return STATUS_SUCCESS; } @@ -6771,7 +6979,9 @@ static NTSTATUS thunk32_vkCmdCopyQueryPoolResults(void *args) { struct vkCmdCopyQueryPoolResults_params *params = args; TRACE("%p, 0x%s, %u, %u, 0x%s, 0x%s, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), wine_dbgstr_longlong(params->stride), params->flags); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyQueryPoolResults(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->firstQuery, params->queryCount, params->dstBuffer, params->dstOffset, params->stride, params->flags); + return STATUS_SUCCESS; } @@ -6783,7 +6993,9 @@ static NTSTATUS thunk64_vkCmdCuLaunchKernelNVX(void *args) { struct vkCmdCuLaunchKernelNVX_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pLaunchInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCuLaunchKernelNVX(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pLaunchInfo); + return STATUS_SUCCESS; } @@ -6809,7 +7021,9 @@ static NTSTATUS thunk64_vkCmdDebugMarkerBeginEXT(void *args) { struct vkCmdDebugMarkerBeginEXT_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDebugMarkerBeginEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pMarkerInfo); + return STATUS_SUCCESS; } @@ -6819,7 +7033,9 @@ static NTSTATUS thunk32_vkCmdDebugMarkerBeginEXT(void *args) { struct vkCmdDebugMarkerBeginEXT_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDebugMarkerBeginEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pMarkerInfo); + return STATUS_SUCCESS; } @@ -6831,7 +7047,9 @@ static NTSTATUS thunk64_vkCmdDebugMarkerEndEXT(void *args) { struct vkCmdDebugMarkerEndEXT_params *params = args; TRACE("%p\n", params->commandBuffer); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDebugMarkerEndEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + return STATUS_SUCCESS; } @@ -6841,7 +7059,9 @@ static NTSTATUS thunk32_vkCmdDebugMarkerEndEXT(void *args) { struct vkCmdDebugMarkerEndEXT_params *params = args; TRACE("%p\n", params->commandBuffer); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDebugMarkerEndEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + return STATUS_SUCCESS; } @@ -6853,7 +7073,9 @@ static NTSTATUS thunk64_vkCmdDebugMarkerInsertEXT(void *args) { struct vkCmdDebugMarkerInsertEXT_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDebugMarkerInsertEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pMarkerInfo); + return STATUS_SUCCESS; } @@ -6863,7 +7085,9 @@ static NTSTATUS thunk32_vkCmdDebugMarkerInsertEXT(void *args) { struct vkCmdDebugMarkerInsertEXT_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDebugMarkerInsertEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pMarkerInfo); + return STATUS_SUCCESS; } @@ -6875,7 +7099,9 @@ static NTSTATUS thunk64_vkCmdDispatch(void *args) { struct vkCmdDispatch_params *params = args; TRACE("%p, %u, %u, %u\n", params->commandBuffer, params->groupCountX, params->groupCountY, params->groupCountZ); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDispatch(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->groupCountX, params->groupCountY, params->groupCountZ); + return STATUS_SUCCESS; } @@ -6885,7 +7111,9 @@ static NTSTATUS thunk32_vkCmdDispatch(void *args) { struct vkCmdDispatch_params *params = args; TRACE("%p, %u, %u, %u\n", params->commandBuffer, params->groupCountX, params->groupCountY, params->groupCountZ); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDispatch(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->groupCountX, params->groupCountY, params->groupCountZ); + return STATUS_SUCCESS; } @@ -6897,7 +7125,9 @@ static NTSTATUS thunk64_vkCmdDispatchBase(void *args) { struct vkCmdDispatchBase_params *params = args; TRACE("%p, %u, %u, %u, %u, %u, %u\n", params->commandBuffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDispatchBase(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ); + return STATUS_SUCCESS; } @@ -6907,7 +7137,9 @@ static NTSTATUS thunk32_vkCmdDispatchBase(void *args) { struct vkCmdDispatchBase_params *params = args; TRACE("%p, %u, %u, %u, %u, %u, %u\n", params->commandBuffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDispatchBase(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ); + return STATUS_SUCCESS; } @@ -6919,7 +7151,9 @@ static NTSTATUS thunk64_vkCmdDispatchBaseKHR(void *args) { struct vkCmdDispatchBaseKHR_params *params = args; TRACE("%p, %u, %u, %u, %u, %u, %u\n", params->commandBuffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDispatchBaseKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ); + return STATUS_SUCCESS; } @@ -6929,7 +7163,9 @@ static NTSTATUS thunk32_vkCmdDispatchBaseKHR(void *args) { struct vkCmdDispatchBaseKHR_params *params = args; TRACE("%p, %u, %u, %u, %u, %u, %u\n", params->commandBuffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDispatchBaseKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ); + return STATUS_SUCCESS; } @@ -6941,7 +7177,9 @@ static NTSTATUS thunk64_vkCmdDispatchIndirect(void *args) { struct vkCmdDispatchIndirect_params *params = args; TRACE("%p, 0x%s, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset)); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDispatchIndirect(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset); + return STATUS_SUCCESS; } @@ -6951,7 +7189,9 @@ static NTSTATUS thunk32_vkCmdDispatchIndirect(void *args) { struct vkCmdDispatchIndirect_params *params = args; TRACE("%p, 0x%s, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset)); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDispatchIndirect(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset); + return STATUS_SUCCESS; } @@ -6963,7 +7203,9 @@ static NTSTATUS thunk64_vkCmdDraw(void *args) { struct vkCmdDraw_params *params = args; TRACE("%p, %u, %u, %u, %u\n", params->commandBuffer, params->vertexCount, params->instanceCount, params->firstVertex, params->firstInstance); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDraw(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->vertexCount, params->instanceCount, params->firstVertex, params->firstInstance); + return STATUS_SUCCESS; } @@ -6973,7 +7215,9 @@ static NTSTATUS thunk32_vkCmdDraw(void *args) { struct vkCmdDraw_params *params = args; TRACE("%p, %u, %u, %u, %u\n", params->commandBuffer, params->vertexCount, params->instanceCount, params->firstVertex, params->firstInstance); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDraw(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->vertexCount, params->instanceCount, params->firstVertex, params->firstInstance); + return STATUS_SUCCESS; } @@ -6985,7 +7229,9 @@ static NTSTATUS thunk64_vkCmdDrawIndexed(void *args) { struct vkCmdDrawIndexed_params *params = args; TRACE("%p, %u, %u, %u, %d, %u\n", params->commandBuffer, params->indexCount, params->instanceCount, params->firstIndex, params->vertexOffset, params->firstInstance); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexed(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->indexCount, params->instanceCount, params->firstIndex, params->vertexOffset, params->firstInstance); + return STATUS_SUCCESS; } @@ -6995,7 +7241,9 @@ static NTSTATUS thunk32_vkCmdDrawIndexed(void *args) { struct vkCmdDrawIndexed_params *params = args; TRACE("%p, %u, %u, %u, %d, %u\n", params->commandBuffer, params->indexCount, params->instanceCount, params->firstIndex, params->vertexOffset, params->firstInstance); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexed(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->indexCount, params->instanceCount, params->firstIndex, params->vertexOffset, params->firstInstance); + return STATUS_SUCCESS; } @@ -7007,7 +7255,9 @@ static NTSTATUS thunk64_vkCmdDrawIndexedIndirect(void *args) { struct vkCmdDrawIndexedIndirect_params *params = args; TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexedIndirect(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->drawCount, params->stride); + return STATUS_SUCCESS; } @@ -7017,7 +7267,9 @@ static NTSTATUS thunk32_vkCmdDrawIndexedIndirect(void *args) { struct vkCmdDrawIndexedIndirect_params *params = args; TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexedIndirect(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->drawCount, params->stride); + return STATUS_SUCCESS; } @@ -7029,7 +7281,9 @@ static NTSTATUS thunk64_vkCmdDrawIndexedIndirectCount(void *args) { struct vkCmdDrawIndexedIndirectCount_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexedIndirectCount(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; } @@ -7039,7 +7293,9 @@ static NTSTATUS thunk32_vkCmdDrawIndexedIndirectCount(void *args) { struct vkCmdDrawIndexedIndirectCount_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexedIndirectCount(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; } @@ -7051,7 +7307,9 @@ static NTSTATUS thunk64_vkCmdDrawIndexedIndirectCountAMD(void *args) { struct vkCmdDrawIndexedIndirectCountAMD_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexedIndirectCountAMD(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; } @@ -7061,7 +7319,9 @@ static NTSTATUS thunk32_vkCmdDrawIndexedIndirectCountAMD(void *args) { struct vkCmdDrawIndexedIndirectCountAMD_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexedIndirectCountAMD(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; } @@ -7073,7 +7333,9 @@ static NTSTATUS thunk64_vkCmdDrawIndexedIndirectCountKHR(void *args) { struct vkCmdDrawIndexedIndirectCountKHR_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexedIndirectCountKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; } @@ -7083,7 +7345,9 @@ static NTSTATUS thunk32_vkCmdDrawIndexedIndirectCountKHR(void *args) { struct vkCmdDrawIndexedIndirectCountKHR_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexedIndirectCountKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; } @@ -7095,7 +7359,9 @@ static NTSTATUS thunk64_vkCmdDrawIndirect(void *args) { struct vkCmdDrawIndirect_params *params = args; TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirect(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->drawCount, params->stride); + return STATUS_SUCCESS; } @@ -7105,7 +7371,9 @@ static NTSTATUS thunk32_vkCmdDrawIndirect(void *args) { struct vkCmdDrawIndirect_params *params = args; TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirect(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->drawCount, params->stride); + return STATUS_SUCCESS; } @@ -7117,7 +7385,9 @@ static NTSTATUS thunk64_vkCmdDrawIndirectByteCountEXT(void *args) { struct vkCmdDrawIndirectByteCountEXT_params *params = args; TRACE("%p, %u, %u, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, params->instanceCount, params->firstInstance, wine_dbgstr_longlong(params->counterBuffer), wine_dbgstr_longlong(params->counterBufferOffset), params->counterOffset, params->vertexStride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectByteCountEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->instanceCount, params->firstInstance, params->counterBuffer, params->counterBufferOffset, params->counterOffset, params->vertexStride); + return STATUS_SUCCESS; } @@ -7127,7 +7397,9 @@ static NTSTATUS thunk32_vkCmdDrawIndirectByteCountEXT(void *args) { struct vkCmdDrawIndirectByteCountEXT_params *params = args; TRACE("%p, %u, %u, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, params->instanceCount, params->firstInstance, wine_dbgstr_longlong(params->counterBuffer), wine_dbgstr_longlong(params->counterBufferOffset), params->counterOffset, params->vertexStride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectByteCountEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->instanceCount, params->firstInstance, params->counterBuffer, params->counterBufferOffset, params->counterOffset, params->vertexStride); + return STATUS_SUCCESS; } @@ -7139,7 +7411,9 @@ static NTSTATUS thunk64_vkCmdDrawIndirectCount(void *args) { struct vkCmdDrawIndirectCount_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectCount(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; } @@ -7149,7 +7423,9 @@ static NTSTATUS thunk32_vkCmdDrawIndirectCount(void *args) { struct vkCmdDrawIndirectCount_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectCount(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; } @@ -7161,7 +7437,9 @@ static NTSTATUS thunk64_vkCmdDrawIndirectCountAMD(void *args) { struct vkCmdDrawIndirectCountAMD_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectCountAMD(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; } @@ -7171,7 +7449,9 @@ static NTSTATUS thunk32_vkCmdDrawIndirectCountAMD(void *args) { struct vkCmdDrawIndirectCountAMD_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectCountAMD(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; } @@ -7183,7 +7463,9 @@ static NTSTATUS thunk64_vkCmdDrawIndirectCountKHR(void *args) { struct vkCmdDrawIndirectCountKHR_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectCountKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; } @@ -7193,7 +7475,9 @@ static NTSTATUS thunk32_vkCmdDrawIndirectCountKHR(void *args) { struct vkCmdDrawIndirectCountKHR_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectCountKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; } @@ -7205,7 +7489,9 @@ static NTSTATUS thunk64_vkCmdDrawMeshTasksEXT(void *args) { struct vkCmdDrawMeshTasksEXT_params *params = args; TRACE("%p, %u, %u, %u\n", params->commandBuffer, params->groupCountX, params->groupCountY, params->groupCountZ); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->groupCountX, params->groupCountY, params->groupCountZ); + return STATUS_SUCCESS; } @@ -7215,7 +7501,9 @@ static NTSTATUS thunk32_vkCmdDrawMeshTasksEXT(void *args) { struct vkCmdDrawMeshTasksEXT_params *params = args; TRACE("%p, %u, %u, %u\n", params->commandBuffer, params->groupCountX, params->groupCountY, params->groupCountZ); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->groupCountX, params->groupCountY, params->groupCountZ); + return STATUS_SUCCESS; } @@ -7227,7 +7515,9 @@ static NTSTATUS thunk64_vkCmdDrawMeshTasksIndirectCountEXT(void *args) { struct vkCmdDrawMeshTasksIndirectCountEXT_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksIndirectCountEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; } @@ -7237,7 +7527,9 @@ static NTSTATUS thunk32_vkCmdDrawMeshTasksIndirectCountEXT(void *args) { struct vkCmdDrawMeshTasksIndirectCountEXT_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksIndirectCountEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; } @@ -7249,7 +7541,9 @@ static NTSTATUS thunk64_vkCmdDrawMeshTasksIndirectCountNV(void *args) { struct vkCmdDrawMeshTasksIndirectCountNV_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksIndirectCountNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; } @@ -7259,7 +7553,9 @@ static NTSTATUS thunk32_vkCmdDrawMeshTasksIndirectCountNV(void *args) { struct vkCmdDrawMeshTasksIndirectCountNV_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksIndirectCountNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); + return STATUS_SUCCESS; } @@ -7271,7 +7567,9 @@ static NTSTATUS thunk64_vkCmdDrawMeshTasksIndirectEXT(void *args) { struct vkCmdDrawMeshTasksIndirectEXT_params *params = args; TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksIndirectEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->drawCount, params->stride); + return STATUS_SUCCESS; } @@ -7281,7 +7579,9 @@ static NTSTATUS thunk32_vkCmdDrawMeshTasksIndirectEXT(void *args) { struct vkCmdDrawMeshTasksIndirectEXT_params *params = args; TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksIndirectEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->drawCount, params->stride); + return STATUS_SUCCESS; } @@ -7293,7 +7593,9 @@ static NTSTATUS thunk64_vkCmdDrawMeshTasksIndirectNV(void *args) { struct vkCmdDrawMeshTasksIndirectNV_params *params = args; TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksIndirectNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->drawCount, params->stride); + return STATUS_SUCCESS; } @@ -7303,7 +7605,9 @@ static NTSTATUS thunk32_vkCmdDrawMeshTasksIndirectNV(void *args) { struct vkCmdDrawMeshTasksIndirectNV_params *params = args; TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksIndirectNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->drawCount, params->stride); + return STATUS_SUCCESS; } @@ -7315,7 +7619,9 @@ static NTSTATUS thunk64_vkCmdDrawMeshTasksNV(void *args) { struct vkCmdDrawMeshTasksNV_params *params = args; TRACE("%p, %u, %u\n", params->commandBuffer, params->taskCount, params->firstTask); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->taskCount, params->firstTask); + return STATUS_SUCCESS; } @@ -7325,7 +7631,9 @@ static NTSTATUS thunk32_vkCmdDrawMeshTasksNV(void *args) { struct vkCmdDrawMeshTasksNV_params *params = args; TRACE("%p, %u, %u\n", params->commandBuffer, params->taskCount, params->firstTask); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->taskCount, params->firstTask); + return STATUS_SUCCESS; } @@ -7337,7 +7645,9 @@ static NTSTATUS thunk64_vkCmdDrawMultiEXT(void *args) { struct vkCmdDrawMultiEXT_params *params = args; TRACE("%p, %u, %p, %u, %u, %u\n", params->commandBuffer, params->drawCount, params->pVertexInfo, params->instanceCount, params->firstInstance, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMultiEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->drawCount, params->pVertexInfo, params->instanceCount, params->firstInstance, params->stride); + return STATUS_SUCCESS; } @@ -7347,7 +7657,9 @@ static NTSTATUS thunk32_vkCmdDrawMultiEXT(void *args) { struct vkCmdDrawMultiEXT_params *params = args; TRACE("%p, %u, %p, %u, %u, %u\n", params->commandBuffer, params->drawCount, params->pVertexInfo, params->instanceCount, params->firstInstance, params->stride); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMultiEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->drawCount, params->pVertexInfo, params->instanceCount, params->firstInstance, params->stride); + return STATUS_SUCCESS; } @@ -7359,7 +7671,9 @@ static NTSTATUS thunk64_vkCmdDrawMultiIndexedEXT(void *args) { struct vkCmdDrawMultiIndexedEXT_params *params = args; TRACE("%p, %u, %p, %u, %u, %u, %p\n", params->commandBuffer, params->drawCount, params->pIndexInfo, params->instanceCount, params->firstInstance, params->stride, params->pVertexOffset); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMultiIndexedEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->drawCount, params->pIndexInfo, params->instanceCount, params->firstInstance, params->stride, params->pVertexOffset); + return STATUS_SUCCESS; } @@ -7369,7 +7683,9 @@ static NTSTATUS thunk32_vkCmdDrawMultiIndexedEXT(void *args) { struct vkCmdDrawMultiIndexedEXT_params *params = args; TRACE("%p, %u, %p, %u, %u, %u, %p\n", params->commandBuffer, params->drawCount, params->pIndexInfo, params->instanceCount, params->firstInstance, params->stride, params->pVertexOffset); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMultiIndexedEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->drawCount, params->pIndexInfo, params->instanceCount, params->firstInstance, params->stride, params->pVertexOffset); + return STATUS_SUCCESS; } @@ -7381,7 +7697,9 @@ static NTSTATUS thunk64_vkCmdEndConditionalRenderingEXT(void *args) { struct vkCmdEndConditionalRenderingEXT_params *params = args; TRACE("%p\n", params->commandBuffer); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndConditionalRenderingEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + return STATUS_SUCCESS; } @@ -7391,7 +7709,9 @@ static NTSTATUS thunk32_vkCmdEndConditionalRenderingEXT(void *args) { struct vkCmdEndConditionalRenderingEXT_params *params = args; TRACE("%p\n", params->commandBuffer); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndConditionalRenderingEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + return STATUS_SUCCESS; } @@ -7403,7 +7723,9 @@ static NTSTATUS thunk64_vkCmdEndDebugUtilsLabelEXT(void *args) { struct vkCmdEndDebugUtilsLabelEXT_params *params = args; TRACE("%p\n", params->commandBuffer); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndDebugUtilsLabelEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + return STATUS_SUCCESS; } @@ -7413,7 +7735,9 @@ static NTSTATUS thunk32_vkCmdEndDebugUtilsLabelEXT(void *args) { struct vkCmdEndDebugUtilsLabelEXT_params *params = args; TRACE("%p\n", params->commandBuffer); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndDebugUtilsLabelEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + return STATUS_SUCCESS; } @@ -7425,7 +7749,9 @@ static NTSTATUS thunk64_vkCmdEndQuery(void *args) { struct vkCmdEndQuery_params *params = args; TRACE("%p, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndQuery(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->query); + return STATUS_SUCCESS; } @@ -7435,7 +7761,9 @@ static NTSTATUS thunk32_vkCmdEndQuery(void *args) { struct vkCmdEndQuery_params *params = args; TRACE("%p, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndQuery(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->query); + return STATUS_SUCCESS; } @@ -7447,7 +7775,9 @@ static NTSTATUS thunk64_vkCmdEndQueryIndexedEXT(void *args) { struct vkCmdEndQueryIndexedEXT_params *params = args; TRACE("%p, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query, params->index); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndQueryIndexedEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->query, params->index); + return STATUS_SUCCESS; } @@ -7457,7 +7787,9 @@ static NTSTATUS thunk32_vkCmdEndQueryIndexedEXT(void *args) { struct vkCmdEndQueryIndexedEXT_params *params = args; TRACE("%p, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query, params->index); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndQueryIndexedEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->query, params->index); + return STATUS_SUCCESS; } @@ -7469,7 +7801,9 @@ static NTSTATUS thunk64_vkCmdEndRenderPass(void *args) { struct vkCmdEndRenderPass_params *params = args; TRACE("%p\n", params->commandBuffer); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRenderPass(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + return STATUS_SUCCESS; } @@ -7479,7 +7813,9 @@ static NTSTATUS thunk32_vkCmdEndRenderPass(void *args) { struct vkCmdEndRenderPass_params *params = args; TRACE("%p\n", params->commandBuffer); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRenderPass(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + return STATUS_SUCCESS; } @@ -7491,7 +7827,9 @@ static NTSTATUS thunk64_vkCmdEndRenderPass2(void *args) { struct vkCmdEndRenderPass2_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pSubpassEndInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRenderPass2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSubpassEndInfo); + return STATUS_SUCCESS; } @@ -7501,7 +7839,9 @@ static NTSTATUS thunk32_vkCmdEndRenderPass2(void *args) { struct vkCmdEndRenderPass2_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pSubpassEndInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRenderPass2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSubpassEndInfo); + return STATUS_SUCCESS; } @@ -7513,7 +7853,9 @@ static NTSTATUS thunk64_vkCmdEndRenderPass2KHR(void *args) { struct vkCmdEndRenderPass2KHR_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pSubpassEndInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRenderPass2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSubpassEndInfo); + return STATUS_SUCCESS; } @@ -7523,7 +7865,9 @@ static NTSTATUS thunk32_vkCmdEndRenderPass2KHR(void *args) { struct vkCmdEndRenderPass2KHR_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pSubpassEndInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRenderPass2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSubpassEndInfo); + return STATUS_SUCCESS; } @@ -7535,7 +7879,9 @@ static NTSTATUS thunk64_vkCmdEndRendering(void *args) { struct vkCmdEndRendering_params *params = args; TRACE("%p\n", params->commandBuffer); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRendering(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + return STATUS_SUCCESS; } @@ -7545,7 +7891,9 @@ static NTSTATUS thunk32_vkCmdEndRendering(void *args) { struct vkCmdEndRendering_params *params = args; TRACE("%p\n", params->commandBuffer); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRendering(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + return STATUS_SUCCESS; } @@ -7557,7 +7905,9 @@ static NTSTATUS thunk64_vkCmdEndRenderingKHR(void *args) { struct vkCmdEndRenderingKHR_params *params = args; TRACE("%p\n", params->commandBuffer); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRenderingKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + return STATUS_SUCCESS; } @@ -7567,7 +7917,9 @@ static NTSTATUS thunk32_vkCmdEndRenderingKHR(void *args) { struct vkCmdEndRenderingKHR_params *params = args; TRACE("%p\n", params->commandBuffer); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRenderingKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + return STATUS_SUCCESS; } @@ -7579,7 +7931,9 @@ static NTSTATUS thunk64_vkCmdEndTransformFeedbackEXT(void *args) { struct vkCmdEndTransformFeedbackEXT_params *params = args; TRACE("%p, %u, %u, %p, %p\n", params->commandBuffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndTransformFeedbackEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets); + return STATUS_SUCCESS; } @@ -7589,7 +7943,9 @@ static NTSTATUS thunk32_vkCmdEndTransformFeedbackEXT(void *args) { struct vkCmdEndTransformFeedbackEXT_params *params = args; TRACE("%p, %u, %u, %p, %p\n", params->commandBuffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndTransformFeedbackEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets); + return STATUS_SUCCESS; } @@ -7633,7 +7989,9 @@ static NTSTATUS thunk64_vkCmdExecuteGeneratedCommandsNV(void *args) { struct vkCmdExecuteGeneratedCommandsNV_params *params = args; TRACE("%p, %u, %p\n", params->commandBuffer, params->isPreprocessed, params->pGeneratedCommandsInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdExecuteGeneratedCommandsNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->isPreprocessed, params->pGeneratedCommandsInfo); + return STATUS_SUCCESS; } @@ -7660,7 +8018,9 @@ static NTSTATUS thunk64_vkCmdFillBuffer(void *args) { struct vkCmdFillBuffer_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), wine_dbgstr_longlong(params->size), params->data); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdFillBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->dstBuffer, params->dstOffset, params->size, params->data); + return STATUS_SUCCESS; } @@ -7670,7 +8030,9 @@ static NTSTATUS thunk32_vkCmdFillBuffer(void *args) { struct vkCmdFillBuffer_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), wine_dbgstr_longlong(params->size), params->data); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdFillBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->dstBuffer, params->dstOffset, params->size, params->data); + return STATUS_SUCCESS; } @@ -7682,7 +8044,9 @@ static NTSTATUS thunk64_vkCmdInsertDebugUtilsLabelEXT(void *args) { struct vkCmdInsertDebugUtilsLabelEXT_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pLabelInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdInsertDebugUtilsLabelEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pLabelInfo); + return STATUS_SUCCESS; } @@ -7692,7 +8056,9 @@ static NTSTATUS thunk32_vkCmdInsertDebugUtilsLabelEXT(void *args) { struct vkCmdInsertDebugUtilsLabelEXT_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pLabelInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdInsertDebugUtilsLabelEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pLabelInfo); + return STATUS_SUCCESS; } @@ -7704,7 +8070,9 @@ static NTSTATUS thunk64_vkCmdNextSubpass(void *args) { struct vkCmdNextSubpass_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->contents); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdNextSubpass(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->contents); + return STATUS_SUCCESS; } @@ -7714,7 +8082,9 @@ static NTSTATUS thunk32_vkCmdNextSubpass(void *args) { struct vkCmdNextSubpass_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->contents); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdNextSubpass(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->contents); + return STATUS_SUCCESS; } @@ -7726,7 +8096,9 @@ static NTSTATUS thunk64_vkCmdNextSubpass2(void *args) { struct vkCmdNextSubpass2_params *params = args; TRACE("%p, %p, %p\n", params->commandBuffer, params->pSubpassBeginInfo, params->pSubpassEndInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdNextSubpass2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSubpassBeginInfo, params->pSubpassEndInfo); + return STATUS_SUCCESS; } @@ -7736,7 +8108,9 @@ static NTSTATUS thunk32_vkCmdNextSubpass2(void *args) { struct vkCmdNextSubpass2_params *params = args; TRACE("%p, %p, %p\n", params->commandBuffer, params->pSubpassBeginInfo, params->pSubpassEndInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdNextSubpass2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSubpassBeginInfo, params->pSubpassEndInfo); + return STATUS_SUCCESS; } @@ -7748,7 +8122,9 @@ static NTSTATUS thunk64_vkCmdNextSubpass2KHR(void *args) { struct vkCmdNextSubpass2KHR_params *params = args; TRACE("%p, %p, %p\n", params->commandBuffer, params->pSubpassBeginInfo, params->pSubpassEndInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdNextSubpass2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSubpassBeginInfo, params->pSubpassEndInfo); + return STATUS_SUCCESS; } @@ -7758,7 +8134,9 @@ static NTSTATUS thunk32_vkCmdNextSubpass2KHR(void *args) { struct vkCmdNextSubpass2KHR_params *params = args; TRACE("%p, %p, %p\n", params->commandBuffer, params->pSubpassBeginInfo, params->pSubpassEndInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdNextSubpass2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSubpassBeginInfo, params->pSubpassEndInfo); + return STATUS_SUCCESS; } @@ -7770,7 +8148,9 @@ static NTSTATUS thunk64_vkCmdPipelineBarrier(void *args) { struct vkCmdPipelineBarrier_params *params = args; TRACE("%p, %#x, %#x, %#x, %u, %p, %u, %p, %u, %p\n", params->commandBuffer, params->srcStageMask, params->dstStageMask, params->dependencyFlags, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, params->pBufferMemoryBarriers, params->imageMemoryBarrierCount, params->pImageMemoryBarriers); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPipelineBarrier(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcStageMask, params->dstStageMask, params->dependencyFlags, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, params->pBufferMemoryBarriers, params->imageMemoryBarrierCount, params->pImageMemoryBarriers); + return STATUS_SUCCESS; } @@ -7800,7 +8180,9 @@ static NTSTATUS thunk64_vkCmdPipelineBarrier2(void *args) { struct vkCmdPipelineBarrier2_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pDependencyInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPipelineBarrier2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pDependencyInfo); + return STATUS_SUCCESS; } @@ -7827,7 +8209,9 @@ static NTSTATUS thunk64_vkCmdPipelineBarrier2KHR(void *args) { struct vkCmdPipelineBarrier2KHR_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pDependencyInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPipelineBarrier2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pDependencyInfo); + return STATUS_SUCCESS; } @@ -7854,7 +8238,9 @@ static NTSTATUS thunk64_vkCmdPreprocessGeneratedCommandsNV(void *args) { struct vkCmdPreprocessGeneratedCommandsNV_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pGeneratedCommandsInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPreprocessGeneratedCommandsNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pGeneratedCommandsInfo); + return STATUS_SUCCESS; } @@ -7881,7 +8267,9 @@ static NTSTATUS thunk64_vkCmdPushConstants(void *args) { struct vkCmdPushConstants_params *params = args; TRACE("%p, 0x%s, %#x, %u, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->layout), params->stageFlags, params->offset, params->size, params->pValues); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPushConstants(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->layout, params->stageFlags, params->offset, params->size, params->pValues); + return STATUS_SUCCESS; } @@ -7891,7 +8279,9 @@ static NTSTATUS thunk32_vkCmdPushConstants(void *args) { struct vkCmdPushConstants_params *params = args; TRACE("%p, 0x%s, %#x, %u, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->layout), params->stageFlags, params->offset, params->size, params->pValues); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPushConstants(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->layout, params->stageFlags, params->offset, params->size, params->pValues); + return STATUS_SUCCESS; } @@ -7903,7 +8293,9 @@ static NTSTATUS thunk64_vkCmdPushDescriptorSetKHR(void *args) { struct vkCmdPushDescriptorSetKHR_params *params = args; TRACE("%p, %#x, 0x%s, %u, %u, %p\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->layout), params->set, params->descriptorWriteCount, params->pDescriptorWrites); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPushDescriptorSetKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineBindPoint, params->layout, params->set, params->descriptorWriteCount, params->pDescriptorWrites); + return STATUS_SUCCESS; } @@ -7930,7 +8322,9 @@ static NTSTATUS thunk64_vkCmdPushDescriptorSetWithTemplateKHR(void *args) { struct vkCmdPushDescriptorSetWithTemplateKHR_params *params = args; TRACE("%p, 0x%s, 0x%s, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->descriptorUpdateTemplate), wine_dbgstr_longlong(params->layout), params->set, params->pData); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPushDescriptorSetWithTemplateKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->descriptorUpdateTemplate, params->layout, params->set, params->pData); + return STATUS_SUCCESS; } @@ -7940,7 +8334,9 @@ static NTSTATUS thunk32_vkCmdPushDescriptorSetWithTemplateKHR(void *args) { struct vkCmdPushDescriptorSetWithTemplateKHR_params *params = args; TRACE("%p, 0x%s, 0x%s, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->descriptorUpdateTemplate), wine_dbgstr_longlong(params->layout), params->set, params->pData); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPushDescriptorSetWithTemplateKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->descriptorUpdateTemplate, params->layout, params->set, params->pData); + return STATUS_SUCCESS; } @@ -7952,7 +8348,9 @@ static NTSTATUS thunk64_vkCmdResetEvent(void *args) { struct vkCmdResetEvent_params *params = args; TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->stageMask); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResetEvent(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->stageMask); + return STATUS_SUCCESS; } @@ -7962,7 +8360,9 @@ static NTSTATUS thunk32_vkCmdResetEvent(void *args) { struct vkCmdResetEvent_params *params = args; TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->stageMask); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResetEvent(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->stageMask); + return STATUS_SUCCESS; } @@ -7974,7 +8374,9 @@ static NTSTATUS thunk64_vkCmdResetEvent2(void *args) { struct vkCmdResetEvent2_params *params = args; TRACE("%p, 0x%s, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->event), wine_dbgstr_longlong(params->stageMask)); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResetEvent2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->stageMask); + return STATUS_SUCCESS; } @@ -7984,7 +8386,9 @@ static NTSTATUS thunk32_vkCmdResetEvent2(void *args) { struct vkCmdResetEvent2_params *params = args; TRACE("%p, 0x%s, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->event), wine_dbgstr_longlong(params->stageMask)); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResetEvent2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->stageMask); + return STATUS_SUCCESS; } @@ -7996,7 +8400,9 @@ static NTSTATUS thunk64_vkCmdResetEvent2KHR(void *args) { struct vkCmdResetEvent2KHR_params *params = args; TRACE("%p, 0x%s, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->event), wine_dbgstr_longlong(params->stageMask)); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResetEvent2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->stageMask); + return STATUS_SUCCESS; } @@ -8006,7 +8412,9 @@ static NTSTATUS thunk32_vkCmdResetEvent2KHR(void *args) { struct vkCmdResetEvent2KHR_params *params = args; TRACE("%p, 0x%s, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->event), wine_dbgstr_longlong(params->stageMask)); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResetEvent2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->stageMask); + return STATUS_SUCCESS; } @@ -8018,7 +8426,9 @@ static NTSTATUS thunk64_vkCmdResetQueryPool(void *args) { struct vkCmdResetQueryPool_params *params = args; TRACE("%p, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResetQueryPool(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->firstQuery, params->queryCount); + return STATUS_SUCCESS; } @@ -8028,7 +8438,9 @@ static NTSTATUS thunk32_vkCmdResetQueryPool(void *args) { struct vkCmdResetQueryPool_params *params = args; TRACE("%p, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResetQueryPool(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->firstQuery, params->queryCount); + return STATUS_SUCCESS; } @@ -8040,7 +8452,9 @@ static NTSTATUS thunk64_vkCmdResolveImage(void *args) { struct vkCmdResolveImage_params *params = args; TRACE("%p, 0x%s, %#x, 0x%s, %#x, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResolveImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcImage, params->srcImageLayout, params->dstImage, params->dstImageLayout, params->regionCount, params->pRegions); + return STATUS_SUCCESS; } @@ -8050,7 +8464,9 @@ static NTSTATUS thunk32_vkCmdResolveImage(void *args) { struct vkCmdResolveImage_params *params = args; TRACE("%p, 0x%s, %#x, 0x%s, %#x, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResolveImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcImage, params->srcImageLayout, params->dstImage, params->dstImageLayout, params->regionCount, params->pRegions); + return STATUS_SUCCESS; } @@ -8062,7 +8478,9 @@ static NTSTATUS thunk64_vkCmdResolveImage2(void *args) { struct vkCmdResolveImage2_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pResolveImageInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResolveImage2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pResolveImageInfo); + return STATUS_SUCCESS; } @@ -8088,7 +8506,9 @@ static NTSTATUS thunk64_vkCmdResolveImage2KHR(void *args) { struct vkCmdResolveImage2KHR_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pResolveImageInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResolveImage2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pResolveImageInfo); + return STATUS_SUCCESS; } @@ -8114,7 +8534,9 @@ static NTSTATUS thunk64_vkCmdSetBlendConstants(void *args) { struct vkCmdSetBlendConstants_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->blendConstants); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetBlendConstants(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->blendConstants); + return STATUS_SUCCESS; } @@ -8124,7 +8546,9 @@ static NTSTATUS thunk32_vkCmdSetBlendConstants(void *args) { struct vkCmdSetBlendConstants_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->blendConstants); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetBlendConstants(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->blendConstants); + return STATUS_SUCCESS; } @@ -8136,7 +8560,9 @@ static NTSTATUS thunk64_vkCmdSetCheckpointNV(void *args) { struct vkCmdSetCheckpointNV_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pCheckpointMarker); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetCheckpointNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCheckpointMarker); + return STATUS_SUCCESS; } @@ -8146,7 +8572,9 @@ static NTSTATUS thunk32_vkCmdSetCheckpointNV(void *args) { struct vkCmdSetCheckpointNV_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pCheckpointMarker); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetCheckpointNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCheckpointMarker); + return STATUS_SUCCESS; } @@ -8158,7 +8586,9 @@ static NTSTATUS thunk64_vkCmdSetCoarseSampleOrderNV(void *args) { struct vkCmdSetCoarseSampleOrderNV_params *params = args; TRACE("%p, %#x, %u, %p\n", params->commandBuffer, params->sampleOrderType, params->customSampleOrderCount, params->pCustomSampleOrders); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetCoarseSampleOrderNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->sampleOrderType, params->customSampleOrderCount, params->pCustomSampleOrders); + return STATUS_SUCCESS; } @@ -8168,7 +8598,9 @@ static NTSTATUS thunk32_vkCmdSetCoarseSampleOrderNV(void *args) { struct vkCmdSetCoarseSampleOrderNV_params *params = args; TRACE("%p, %#x, %u, %p\n", params->commandBuffer, params->sampleOrderType, params->customSampleOrderCount, params->pCustomSampleOrders); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetCoarseSampleOrderNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->sampleOrderType, params->customSampleOrderCount, params->pCustomSampleOrders); + return STATUS_SUCCESS; } @@ -8180,7 +8612,9 @@ static NTSTATUS thunk64_vkCmdSetColorWriteEnableEXT(void *args) { struct vkCmdSetColorWriteEnableEXT_params *params = args; TRACE("%p, %u, %p\n", params->commandBuffer, params->attachmentCount, params->pColorWriteEnables); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetColorWriteEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->attachmentCount, params->pColorWriteEnables); + return STATUS_SUCCESS; } @@ -8190,7 +8624,9 @@ static NTSTATUS thunk32_vkCmdSetColorWriteEnableEXT(void *args) { struct vkCmdSetColorWriteEnableEXT_params *params = args; TRACE("%p, %u, %p\n", params->commandBuffer, params->attachmentCount, params->pColorWriteEnables); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetColorWriteEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->attachmentCount, params->pColorWriteEnables); + return STATUS_SUCCESS; } @@ -8202,7 +8638,9 @@ static NTSTATUS thunk64_vkCmdSetCullMode(void *args) { struct vkCmdSetCullMode_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->cullMode); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetCullMode(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->cullMode); + return STATUS_SUCCESS; } @@ -8212,7 +8650,9 @@ static NTSTATUS thunk32_vkCmdSetCullMode(void *args) { struct vkCmdSetCullMode_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->cullMode); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetCullMode(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->cullMode); + return STATUS_SUCCESS; } @@ -8224,7 +8664,9 @@ static NTSTATUS thunk64_vkCmdSetCullModeEXT(void *args) { struct vkCmdSetCullModeEXT_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->cullMode); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetCullModeEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->cullMode); + return STATUS_SUCCESS; } @@ -8234,7 +8676,9 @@ static NTSTATUS thunk32_vkCmdSetCullModeEXT(void *args) { struct vkCmdSetCullModeEXT_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->cullMode); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetCullModeEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->cullMode); + return STATUS_SUCCESS; } @@ -8246,7 +8690,9 @@ static NTSTATUS thunk64_vkCmdSetDepthBias(void *args) { struct vkCmdSetDepthBias_params *params = args; TRACE("%p, %f, %f, %f\n", params->commandBuffer, params->depthBiasConstantFactor, params->depthBiasClamp, params->depthBiasSlopeFactor); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBias(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBiasConstantFactor, params->depthBiasClamp, params->depthBiasSlopeFactor); + return STATUS_SUCCESS; } @@ -8256,7 +8702,9 @@ static NTSTATUS thunk32_vkCmdSetDepthBias(void *args) { struct vkCmdSetDepthBias_params *params = args; TRACE("%p, %f, %f, %f\n", params->commandBuffer, params->depthBiasConstantFactor, params->depthBiasClamp, params->depthBiasSlopeFactor); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBias(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBiasConstantFactor, params->depthBiasClamp, params->depthBiasSlopeFactor); + return STATUS_SUCCESS; } @@ -8268,7 +8716,9 @@ static NTSTATUS thunk64_vkCmdSetDepthBiasEnable(void *args) { struct vkCmdSetDepthBiasEnable_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthBiasEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBiasEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBiasEnable); + return STATUS_SUCCESS; } @@ -8278,7 +8728,9 @@ static NTSTATUS thunk32_vkCmdSetDepthBiasEnable(void *args) { struct vkCmdSetDepthBiasEnable_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthBiasEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBiasEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBiasEnable); + return STATUS_SUCCESS; } @@ -8290,7 +8742,9 @@ static NTSTATUS thunk64_vkCmdSetDepthBiasEnableEXT(void *args) { struct vkCmdSetDepthBiasEnableEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthBiasEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBiasEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBiasEnable); + return STATUS_SUCCESS; } @@ -8300,7 +8754,9 @@ static NTSTATUS thunk32_vkCmdSetDepthBiasEnableEXT(void *args) { struct vkCmdSetDepthBiasEnableEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthBiasEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBiasEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBiasEnable); + return STATUS_SUCCESS; } @@ -8312,7 +8768,9 @@ static NTSTATUS thunk64_vkCmdSetDepthBounds(void *args) { struct vkCmdSetDepthBounds_params *params = args; TRACE("%p, %f, %f\n", params->commandBuffer, params->minDepthBounds, params->maxDepthBounds); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBounds(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->minDepthBounds, params->maxDepthBounds); + return STATUS_SUCCESS; } @@ -8322,7 +8780,9 @@ static NTSTATUS thunk32_vkCmdSetDepthBounds(void *args) { struct vkCmdSetDepthBounds_params *params = args; TRACE("%p, %f, %f\n", params->commandBuffer, params->minDepthBounds, params->maxDepthBounds); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBounds(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->minDepthBounds, params->maxDepthBounds); + return STATUS_SUCCESS; } @@ -8334,7 +8794,9 @@ static NTSTATUS thunk64_vkCmdSetDepthBoundsTestEnable(void *args) { struct vkCmdSetDepthBoundsTestEnable_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthBoundsTestEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBoundsTestEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBoundsTestEnable); + return STATUS_SUCCESS; } @@ -8344,7 +8806,9 @@ static NTSTATUS thunk32_vkCmdSetDepthBoundsTestEnable(void *args) { struct vkCmdSetDepthBoundsTestEnable_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthBoundsTestEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBoundsTestEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBoundsTestEnable); + return STATUS_SUCCESS; } @@ -8356,7 +8820,9 @@ static NTSTATUS thunk64_vkCmdSetDepthBoundsTestEnableEXT(void *args) { struct vkCmdSetDepthBoundsTestEnableEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthBoundsTestEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBoundsTestEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBoundsTestEnable); + return STATUS_SUCCESS; } @@ -8366,7 +8832,9 @@ static NTSTATUS thunk32_vkCmdSetDepthBoundsTestEnableEXT(void *args) { struct vkCmdSetDepthBoundsTestEnableEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthBoundsTestEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBoundsTestEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBoundsTestEnable); + return STATUS_SUCCESS; } @@ -8378,7 +8846,9 @@ static NTSTATUS thunk64_vkCmdSetDepthCompareOp(void *args) { struct vkCmdSetDepthCompareOp_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->depthCompareOp); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthCompareOp(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthCompareOp); + return STATUS_SUCCESS; } @@ -8388,7 +8858,9 @@ static NTSTATUS thunk32_vkCmdSetDepthCompareOp(void *args) { struct vkCmdSetDepthCompareOp_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->depthCompareOp); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthCompareOp(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthCompareOp); + return STATUS_SUCCESS; } @@ -8400,7 +8872,9 @@ static NTSTATUS thunk64_vkCmdSetDepthCompareOpEXT(void *args) { struct vkCmdSetDepthCompareOpEXT_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->depthCompareOp); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthCompareOpEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthCompareOp); + return STATUS_SUCCESS; } @@ -8410,7 +8884,9 @@ static NTSTATUS thunk32_vkCmdSetDepthCompareOpEXT(void *args) { struct vkCmdSetDepthCompareOpEXT_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->depthCompareOp); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthCompareOpEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthCompareOp); + return STATUS_SUCCESS; } @@ -8422,7 +8898,9 @@ static NTSTATUS thunk64_vkCmdSetDepthTestEnable(void *args) { struct vkCmdSetDepthTestEnable_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthTestEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthTestEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthTestEnable); + return STATUS_SUCCESS; } @@ -8432,7 +8910,9 @@ static NTSTATUS thunk32_vkCmdSetDepthTestEnable(void *args) { struct vkCmdSetDepthTestEnable_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthTestEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthTestEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthTestEnable); + return STATUS_SUCCESS; } @@ -8444,7 +8924,9 @@ static NTSTATUS thunk64_vkCmdSetDepthTestEnableEXT(void *args) { struct vkCmdSetDepthTestEnableEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthTestEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthTestEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthTestEnable); + return STATUS_SUCCESS; } @@ -8454,7 +8936,9 @@ static NTSTATUS thunk32_vkCmdSetDepthTestEnableEXT(void *args) { struct vkCmdSetDepthTestEnableEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthTestEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthTestEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthTestEnable); + return STATUS_SUCCESS; } @@ -8466,7 +8950,9 @@ static NTSTATUS thunk64_vkCmdSetDepthWriteEnable(void *args) { struct vkCmdSetDepthWriteEnable_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthWriteEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthWriteEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthWriteEnable); + return STATUS_SUCCESS; } @@ -8476,7 +8962,9 @@ static NTSTATUS thunk32_vkCmdSetDepthWriteEnable(void *args) { struct vkCmdSetDepthWriteEnable_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthWriteEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthWriteEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthWriteEnable); + return STATUS_SUCCESS; } @@ -8488,7 +8976,9 @@ static NTSTATUS thunk64_vkCmdSetDepthWriteEnableEXT(void *args) { struct vkCmdSetDepthWriteEnableEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthWriteEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthWriteEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthWriteEnable); + return STATUS_SUCCESS; } @@ -8498,7 +8988,9 @@ static NTSTATUS thunk32_vkCmdSetDepthWriteEnableEXT(void *args) { struct vkCmdSetDepthWriteEnableEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->depthWriteEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthWriteEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthWriteEnable); + return STATUS_SUCCESS; } @@ -8510,7 +9002,9 @@ static NTSTATUS thunk64_vkCmdSetDeviceMask(void *args) { struct vkCmdSetDeviceMask_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->deviceMask); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDeviceMask(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->deviceMask); + return STATUS_SUCCESS; } @@ -8520,7 +9014,9 @@ static NTSTATUS thunk32_vkCmdSetDeviceMask(void *args) { struct vkCmdSetDeviceMask_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->deviceMask); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDeviceMask(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->deviceMask); + return STATUS_SUCCESS; } @@ -8532,7 +9028,9 @@ static NTSTATUS thunk64_vkCmdSetDeviceMaskKHR(void *args) { struct vkCmdSetDeviceMaskKHR_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->deviceMask); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDeviceMaskKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->deviceMask); + return STATUS_SUCCESS; } @@ -8542,7 +9040,9 @@ static NTSTATUS thunk32_vkCmdSetDeviceMaskKHR(void *args) { struct vkCmdSetDeviceMaskKHR_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->deviceMask); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDeviceMaskKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->deviceMask); + return STATUS_SUCCESS; } @@ -8554,7 +9054,9 @@ static NTSTATUS thunk64_vkCmdSetDiscardRectangleEXT(void *args) { struct vkCmdSetDiscardRectangleEXT_params *params = args; TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstDiscardRectangle, params->discardRectangleCount, params->pDiscardRectangles); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDiscardRectangleEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstDiscardRectangle, params->discardRectangleCount, params->pDiscardRectangles); + return STATUS_SUCCESS; } @@ -8564,7 +9066,9 @@ static NTSTATUS thunk32_vkCmdSetDiscardRectangleEXT(void *args) { struct vkCmdSetDiscardRectangleEXT_params *params = args; TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstDiscardRectangle, params->discardRectangleCount, params->pDiscardRectangles); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDiscardRectangleEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstDiscardRectangle, params->discardRectangleCount, params->pDiscardRectangles); + return STATUS_SUCCESS; } @@ -8576,7 +9080,9 @@ static NTSTATUS thunk64_vkCmdSetEvent(void *args) { struct vkCmdSetEvent_params *params = args; TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->stageMask); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetEvent(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->stageMask); + return STATUS_SUCCESS; } @@ -8586,7 +9092,9 @@ static NTSTATUS thunk32_vkCmdSetEvent(void *args) { struct vkCmdSetEvent_params *params = args; TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->stageMask); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetEvent(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->stageMask); + return STATUS_SUCCESS; } @@ -8598,7 +9106,9 @@ static NTSTATUS thunk64_vkCmdSetEvent2(void *args) { struct vkCmdSetEvent2_params *params = args; TRACE("%p, 0x%s, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->pDependencyInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetEvent2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->pDependencyInfo); + return STATUS_SUCCESS; } @@ -8625,7 +9135,9 @@ static NTSTATUS thunk64_vkCmdSetEvent2KHR(void *args) { struct vkCmdSetEvent2KHR_params *params = args; TRACE("%p, 0x%s, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->pDependencyInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetEvent2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->pDependencyInfo); + return STATUS_SUCCESS; } @@ -8652,7 +9164,9 @@ static NTSTATUS thunk64_vkCmdSetExclusiveScissorNV(void *args) { struct vkCmdSetExclusiveScissorNV_params *params = args; TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstExclusiveScissor, params->exclusiveScissorCount, params->pExclusiveScissors); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetExclusiveScissorNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstExclusiveScissor, params->exclusiveScissorCount, params->pExclusiveScissors); + return STATUS_SUCCESS; } @@ -8662,7 +9176,9 @@ static NTSTATUS thunk32_vkCmdSetExclusiveScissorNV(void *args) { struct vkCmdSetExclusiveScissorNV_params *params = args; TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstExclusiveScissor, params->exclusiveScissorCount, params->pExclusiveScissors); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetExclusiveScissorNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstExclusiveScissor, params->exclusiveScissorCount, params->pExclusiveScissors); + return STATUS_SUCCESS; } @@ -8674,7 +9190,9 @@ static NTSTATUS thunk64_vkCmdSetFragmentShadingRateEnumNV(void *args) { struct vkCmdSetFragmentShadingRateEnumNV_params *params = args; TRACE("%p, %#x, %p\n", params->commandBuffer, params->shadingRate, params->combinerOps); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetFragmentShadingRateEnumNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->shadingRate, params->combinerOps); + return STATUS_SUCCESS; } @@ -8684,7 +9202,9 @@ static NTSTATUS thunk32_vkCmdSetFragmentShadingRateEnumNV(void *args) { struct vkCmdSetFragmentShadingRateEnumNV_params *params = args; TRACE("%p, %#x, %p\n", params->commandBuffer, params->shadingRate, params->combinerOps); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetFragmentShadingRateEnumNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->shadingRate, params->combinerOps); + return STATUS_SUCCESS; } @@ -8696,7 +9216,9 @@ static NTSTATUS thunk64_vkCmdSetFragmentShadingRateKHR(void *args) { struct vkCmdSetFragmentShadingRateKHR_params *params = args; TRACE("%p, %p, %p\n", params->commandBuffer, params->pFragmentSize, params->combinerOps); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetFragmentShadingRateKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pFragmentSize, params->combinerOps); + return STATUS_SUCCESS; } @@ -8706,7 +9228,9 @@ static NTSTATUS thunk32_vkCmdSetFragmentShadingRateKHR(void *args) { struct vkCmdSetFragmentShadingRateKHR_params *params = args; TRACE("%p, %p, %p\n", params->commandBuffer, params->pFragmentSize, params->combinerOps); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetFragmentShadingRateKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pFragmentSize, params->combinerOps); + return STATUS_SUCCESS; } @@ -8718,7 +9242,9 @@ static NTSTATUS thunk64_vkCmdSetFrontFace(void *args) { struct vkCmdSetFrontFace_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->frontFace); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetFrontFace(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->frontFace); + return STATUS_SUCCESS; } @@ -8728,7 +9254,9 @@ static NTSTATUS thunk32_vkCmdSetFrontFace(void *args) { struct vkCmdSetFrontFace_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->frontFace); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetFrontFace(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->frontFace); + return STATUS_SUCCESS; } @@ -8740,7 +9268,9 @@ static NTSTATUS thunk64_vkCmdSetFrontFaceEXT(void *args) { struct vkCmdSetFrontFaceEXT_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->frontFace); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetFrontFaceEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->frontFace); + return STATUS_SUCCESS; } @@ -8750,7 +9280,9 @@ static NTSTATUS thunk32_vkCmdSetFrontFaceEXT(void *args) { struct vkCmdSetFrontFaceEXT_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->frontFace); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetFrontFaceEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->frontFace); + return STATUS_SUCCESS; } @@ -8762,7 +9294,9 @@ static NTSTATUS thunk64_vkCmdSetLineStippleEXT(void *args) { struct vkCmdSetLineStippleEXT_params *params = args; TRACE("%p, %u, %u\n", params->commandBuffer, params->lineStippleFactor, params->lineStipplePattern); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetLineStippleEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->lineStippleFactor, params->lineStipplePattern); + return STATUS_SUCCESS; } @@ -8772,7 +9306,9 @@ static NTSTATUS thunk32_vkCmdSetLineStippleEXT(void *args) { struct vkCmdSetLineStippleEXT_params *params = args; TRACE("%p, %u, %u\n", params->commandBuffer, params->lineStippleFactor, params->lineStipplePattern); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetLineStippleEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->lineStippleFactor, params->lineStipplePattern); + return STATUS_SUCCESS; } @@ -8784,7 +9320,9 @@ static NTSTATUS thunk64_vkCmdSetLineWidth(void *args) { struct vkCmdSetLineWidth_params *params = args; TRACE("%p, %f\n", params->commandBuffer, params->lineWidth); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetLineWidth(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->lineWidth); + return STATUS_SUCCESS; } @@ -8794,7 +9332,9 @@ static NTSTATUS thunk32_vkCmdSetLineWidth(void *args) { struct vkCmdSetLineWidth_params *params = args; TRACE("%p, %f\n", params->commandBuffer, params->lineWidth); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetLineWidth(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->lineWidth); + return STATUS_SUCCESS; } @@ -8806,7 +9346,9 @@ static NTSTATUS thunk64_vkCmdSetLogicOpEXT(void *args) { struct vkCmdSetLogicOpEXT_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->logicOp); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetLogicOpEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->logicOp); + return STATUS_SUCCESS; } @@ -8816,7 +9358,9 @@ static NTSTATUS thunk32_vkCmdSetLogicOpEXT(void *args) { struct vkCmdSetLogicOpEXT_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->logicOp); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetLogicOpEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->logicOp); + return STATUS_SUCCESS; } @@ -8828,7 +9372,9 @@ static NTSTATUS thunk64_vkCmdSetPatchControlPointsEXT(void *args) { struct vkCmdSetPatchControlPointsEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->patchControlPoints); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPatchControlPointsEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->patchControlPoints); + return STATUS_SUCCESS; } @@ -8838,7 +9384,9 @@ static NTSTATUS thunk32_vkCmdSetPatchControlPointsEXT(void *args) { struct vkCmdSetPatchControlPointsEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->patchControlPoints); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPatchControlPointsEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->patchControlPoints); + return STATUS_SUCCESS; } @@ -8849,8 +9397,12 @@ static NTSTATUS thunk32_vkCmdSetPatchControlPointsEXT(void *args) static NTSTATUS thunk64_vkCmdSetPerformanceMarkerINTEL(void *args) { struct vkCmdSetPerformanceMarkerINTEL_params *params = args; + VkResult result; TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo); - return wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPerformanceMarkerINTEL(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pMarkerInfo); + + result = wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPerformanceMarkerINTEL(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pMarkerInfo); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -8875,8 +9427,12 @@ static NTSTATUS thunk32_vkCmdSetPerformanceMarkerINTEL(void *args) static NTSTATUS thunk64_vkCmdSetPerformanceOverrideINTEL(void *args) { struct vkCmdSetPerformanceOverrideINTEL_params *params = args; + VkResult result; TRACE("%p, %p\n", params->commandBuffer, params->pOverrideInfo); - return wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPerformanceOverrideINTEL(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pOverrideInfo); + + result = wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPerformanceOverrideINTEL(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pOverrideInfo); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -8901,8 +9457,12 @@ static NTSTATUS thunk32_vkCmdSetPerformanceOverrideINTEL(void *args) static NTSTATUS thunk64_vkCmdSetPerformanceStreamMarkerINTEL(void *args) { struct vkCmdSetPerformanceStreamMarkerINTEL_params *params = args; + VkResult result; TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo); - return wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPerformanceStreamMarkerINTEL(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pMarkerInfo); + + result = wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPerformanceStreamMarkerINTEL(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pMarkerInfo); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -8910,8 +9470,12 @@ static NTSTATUS thunk64_vkCmdSetPerformanceStreamMarkerINTEL(void *args) static NTSTATUS thunk32_vkCmdSetPerformanceStreamMarkerINTEL(void *args) { struct vkCmdSetPerformanceStreamMarkerINTEL_params *params = args; + VkResult result; TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo); - return wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPerformanceStreamMarkerINTEL(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pMarkerInfo); + + result = wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPerformanceStreamMarkerINTEL(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pMarkerInfo); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -8922,7 +9486,9 @@ static NTSTATUS thunk64_vkCmdSetPrimitiveRestartEnable(void *args) { struct vkCmdSetPrimitiveRestartEnable_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->primitiveRestartEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPrimitiveRestartEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->primitiveRestartEnable); + return STATUS_SUCCESS; } @@ -8932,7 +9498,9 @@ static NTSTATUS thunk32_vkCmdSetPrimitiveRestartEnable(void *args) { struct vkCmdSetPrimitiveRestartEnable_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->primitiveRestartEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPrimitiveRestartEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->primitiveRestartEnable); + return STATUS_SUCCESS; } @@ -8944,7 +9512,9 @@ static NTSTATUS thunk64_vkCmdSetPrimitiveRestartEnableEXT(void *args) { struct vkCmdSetPrimitiveRestartEnableEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->primitiveRestartEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPrimitiveRestartEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->primitiveRestartEnable); + return STATUS_SUCCESS; } @@ -8954,7 +9524,9 @@ static NTSTATUS thunk32_vkCmdSetPrimitiveRestartEnableEXT(void *args) { struct vkCmdSetPrimitiveRestartEnableEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->primitiveRestartEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPrimitiveRestartEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->primitiveRestartEnable); + return STATUS_SUCCESS; } @@ -8966,7 +9538,9 @@ static NTSTATUS thunk64_vkCmdSetPrimitiveTopology(void *args) { struct vkCmdSetPrimitiveTopology_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->primitiveTopology); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPrimitiveTopology(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->primitiveTopology); + return STATUS_SUCCESS; } @@ -8976,7 +9550,9 @@ static NTSTATUS thunk32_vkCmdSetPrimitiveTopology(void *args) { struct vkCmdSetPrimitiveTopology_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->primitiveTopology); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPrimitiveTopology(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->primitiveTopology); + return STATUS_SUCCESS; } @@ -8988,7 +9564,9 @@ static NTSTATUS thunk64_vkCmdSetPrimitiveTopologyEXT(void *args) { struct vkCmdSetPrimitiveTopologyEXT_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->primitiveTopology); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPrimitiveTopologyEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->primitiveTopology); + return STATUS_SUCCESS; } @@ -8998,7 +9576,9 @@ static NTSTATUS thunk32_vkCmdSetPrimitiveTopologyEXT(void *args) { struct vkCmdSetPrimitiveTopologyEXT_params *params = args; TRACE("%p, %#x\n", params->commandBuffer, params->primitiveTopology); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPrimitiveTopologyEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->primitiveTopology); + return STATUS_SUCCESS; } @@ -9010,7 +9590,9 @@ static NTSTATUS thunk64_vkCmdSetRasterizerDiscardEnable(void *args) { struct vkCmdSetRasterizerDiscardEnable_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->rasterizerDiscardEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetRasterizerDiscardEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->rasterizerDiscardEnable); + return STATUS_SUCCESS; } @@ -9020,7 +9602,9 @@ static NTSTATUS thunk32_vkCmdSetRasterizerDiscardEnable(void *args) { struct vkCmdSetRasterizerDiscardEnable_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->rasterizerDiscardEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetRasterizerDiscardEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->rasterizerDiscardEnable); + return STATUS_SUCCESS; } @@ -9032,7 +9616,9 @@ static NTSTATUS thunk64_vkCmdSetRasterizerDiscardEnableEXT(void *args) { struct vkCmdSetRasterizerDiscardEnableEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->rasterizerDiscardEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetRasterizerDiscardEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->rasterizerDiscardEnable); + return STATUS_SUCCESS; } @@ -9042,7 +9628,9 @@ static NTSTATUS thunk32_vkCmdSetRasterizerDiscardEnableEXT(void *args) { struct vkCmdSetRasterizerDiscardEnableEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->rasterizerDiscardEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetRasterizerDiscardEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->rasterizerDiscardEnable); + return STATUS_SUCCESS; } @@ -9054,7 +9642,9 @@ static NTSTATUS thunk64_vkCmdSetRayTracingPipelineStackSizeKHR(void *args) { struct vkCmdSetRayTracingPipelineStackSizeKHR_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->pipelineStackSize); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetRayTracingPipelineStackSizeKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineStackSize); + return STATUS_SUCCESS; } @@ -9064,7 +9654,9 @@ static NTSTATUS thunk32_vkCmdSetRayTracingPipelineStackSizeKHR(void *args) { struct vkCmdSetRayTracingPipelineStackSizeKHR_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->pipelineStackSize); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetRayTracingPipelineStackSizeKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineStackSize); + return STATUS_SUCCESS; } @@ -9076,7 +9668,9 @@ static NTSTATUS thunk64_vkCmdSetSampleLocationsEXT(void *args) { struct vkCmdSetSampleLocationsEXT_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pSampleLocationsInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetSampleLocationsEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSampleLocationsInfo); + return STATUS_SUCCESS; } @@ -9086,7 +9680,9 @@ static NTSTATUS thunk32_vkCmdSetSampleLocationsEXT(void *args) { struct vkCmdSetSampleLocationsEXT_params *params = args; TRACE("%p, %p\n", params->commandBuffer, params->pSampleLocationsInfo); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetSampleLocationsEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSampleLocationsInfo); + return STATUS_SUCCESS; } @@ -9098,7 +9694,9 @@ static NTSTATUS thunk64_vkCmdSetScissor(void *args) { struct vkCmdSetScissor_params *params = args; TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstScissor, params->scissorCount, params->pScissors); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetScissor(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstScissor, params->scissorCount, params->pScissors); + return STATUS_SUCCESS; } @@ -9108,7 +9706,9 @@ static NTSTATUS thunk32_vkCmdSetScissor(void *args) { struct vkCmdSetScissor_params *params = args; TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstScissor, params->scissorCount, params->pScissors); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetScissor(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstScissor, params->scissorCount, params->pScissors); + return STATUS_SUCCESS; } @@ -9120,7 +9720,9 @@ static NTSTATUS thunk64_vkCmdSetScissorWithCount(void *args) { struct vkCmdSetScissorWithCount_params *params = args; TRACE("%p, %u, %p\n", params->commandBuffer, params->scissorCount, params->pScissors); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetScissorWithCount(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->scissorCount, params->pScissors); + return STATUS_SUCCESS; } @@ -9130,7 +9732,9 @@ static NTSTATUS thunk32_vkCmdSetScissorWithCount(void *args) { struct vkCmdSetScissorWithCount_params *params = args; TRACE("%p, %u, %p\n", params->commandBuffer, params->scissorCount, params->pScissors); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetScissorWithCount(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->scissorCount, params->pScissors); + return STATUS_SUCCESS; } @@ -9142,7 +9746,9 @@ static NTSTATUS thunk64_vkCmdSetScissorWithCountEXT(void *args) { struct vkCmdSetScissorWithCountEXT_params *params = args; TRACE("%p, %u, %p\n", params->commandBuffer, params->scissorCount, params->pScissors); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetScissorWithCountEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->scissorCount, params->pScissors); + return STATUS_SUCCESS; } @@ -9152,7 +9758,9 @@ static NTSTATUS thunk32_vkCmdSetScissorWithCountEXT(void *args) { struct vkCmdSetScissorWithCountEXT_params *params = args; TRACE("%p, %u, %p\n", params->commandBuffer, params->scissorCount, params->pScissors); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetScissorWithCountEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->scissorCount, params->pScissors); + return STATUS_SUCCESS; } @@ -9164,7 +9772,9 @@ static NTSTATUS thunk64_vkCmdSetStencilCompareMask(void *args) { struct vkCmdSetStencilCompareMask_params *params = args; TRACE("%p, %#x, %u\n", params->commandBuffer, params->faceMask, params->compareMask); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilCompareMask(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->compareMask); + return STATUS_SUCCESS; } @@ -9174,7 +9784,9 @@ static NTSTATUS thunk32_vkCmdSetStencilCompareMask(void *args) { struct vkCmdSetStencilCompareMask_params *params = args; TRACE("%p, %#x, %u\n", params->commandBuffer, params->faceMask, params->compareMask); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilCompareMask(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->compareMask); + return STATUS_SUCCESS; } @@ -9186,7 +9798,9 @@ static NTSTATUS thunk64_vkCmdSetStencilOp(void *args) { struct vkCmdSetStencilOp_params *params = args; TRACE("%p, %#x, %#x, %#x, %#x, %#x\n", params->commandBuffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilOp(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp); + return STATUS_SUCCESS; } @@ -9196,7 +9810,9 @@ static NTSTATUS thunk32_vkCmdSetStencilOp(void *args) { struct vkCmdSetStencilOp_params *params = args; TRACE("%p, %#x, %#x, %#x, %#x, %#x\n", params->commandBuffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilOp(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp); + return STATUS_SUCCESS; } @@ -9208,7 +9824,9 @@ static NTSTATUS thunk64_vkCmdSetStencilOpEXT(void *args) { struct vkCmdSetStencilOpEXT_params *params = args; TRACE("%p, %#x, %#x, %#x, %#x, %#x\n", params->commandBuffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilOpEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp); + return STATUS_SUCCESS; } @@ -9218,7 +9836,9 @@ static NTSTATUS thunk32_vkCmdSetStencilOpEXT(void *args) { struct vkCmdSetStencilOpEXT_params *params = args; TRACE("%p, %#x, %#x, %#x, %#x, %#x\n", params->commandBuffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilOpEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp); + return STATUS_SUCCESS; } @@ -9230,7 +9850,9 @@ static NTSTATUS thunk64_vkCmdSetStencilReference(void *args) { struct vkCmdSetStencilReference_params *params = args; TRACE("%p, %#x, %u\n", params->commandBuffer, params->faceMask, params->reference); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilReference(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->reference); + return STATUS_SUCCESS; } @@ -9240,7 +9862,9 @@ static NTSTATUS thunk32_vkCmdSetStencilReference(void *args) { struct vkCmdSetStencilReference_params *params = args; TRACE("%p, %#x, %u\n", params->commandBuffer, params->faceMask, params->reference); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilReference(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->reference); + return STATUS_SUCCESS; } @@ -9252,7 +9876,9 @@ static NTSTATUS thunk64_vkCmdSetStencilTestEnable(void *args) { struct vkCmdSetStencilTestEnable_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->stencilTestEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilTestEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stencilTestEnable); + return STATUS_SUCCESS; } @@ -9262,7 +9888,9 @@ static NTSTATUS thunk32_vkCmdSetStencilTestEnable(void *args) { struct vkCmdSetStencilTestEnable_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->stencilTestEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilTestEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stencilTestEnable); + return STATUS_SUCCESS; } @@ -9274,7 +9902,9 @@ static NTSTATUS thunk64_vkCmdSetStencilTestEnableEXT(void *args) { struct vkCmdSetStencilTestEnableEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->stencilTestEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilTestEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stencilTestEnable); + return STATUS_SUCCESS; } @@ -9284,7 +9914,9 @@ static NTSTATUS thunk32_vkCmdSetStencilTestEnableEXT(void *args) { struct vkCmdSetStencilTestEnableEXT_params *params = args; TRACE("%p, %u\n", params->commandBuffer, params->stencilTestEnable); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilTestEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stencilTestEnable); + return STATUS_SUCCESS; } @@ -9296,7 +9928,9 @@ static NTSTATUS thunk64_vkCmdSetStencilWriteMask(void *args) { struct vkCmdSetStencilWriteMask_params *params = args; TRACE("%p, %#x, %u\n", params->commandBuffer, params->faceMask, params->writeMask); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilWriteMask(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->writeMask); + return STATUS_SUCCESS; } @@ -9306,7 +9940,9 @@ static NTSTATUS thunk32_vkCmdSetStencilWriteMask(void *args) { struct vkCmdSetStencilWriteMask_params *params = args; TRACE("%p, %#x, %u\n", params->commandBuffer, params->faceMask, params->writeMask); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilWriteMask(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->writeMask); + return STATUS_SUCCESS; } @@ -9318,7 +9954,9 @@ static NTSTATUS thunk64_vkCmdSetVertexInputEXT(void *args) { struct vkCmdSetVertexInputEXT_params *params = args; TRACE("%p, %u, %p, %u, %p\n", params->commandBuffer, params->vertexBindingDescriptionCount, params->pVertexBindingDescriptions, params->vertexAttributeDescriptionCount, params->pVertexAttributeDescriptions); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetVertexInputEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->vertexBindingDescriptionCount, params->pVertexBindingDescriptions, params->vertexAttributeDescriptionCount, params->pVertexAttributeDescriptions); + return STATUS_SUCCESS; } @@ -9328,7 +9966,9 @@ static NTSTATUS thunk32_vkCmdSetVertexInputEXT(void *args) { struct vkCmdSetVertexInputEXT_params *params = args; TRACE("%p, %u, %p, %u, %p\n", params->commandBuffer, params->vertexBindingDescriptionCount, params->pVertexBindingDescriptions, params->vertexAttributeDescriptionCount, params->pVertexAttributeDescriptions); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetVertexInputEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->vertexBindingDescriptionCount, params->pVertexBindingDescriptions, params->vertexAttributeDescriptionCount, params->pVertexAttributeDescriptions); + return STATUS_SUCCESS; } @@ -9340,7 +9980,9 @@ static NTSTATUS thunk64_vkCmdSetViewport(void *args) { struct vkCmdSetViewport_params *params = args; TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstViewport, params->viewportCount, params->pViewports); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewport(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstViewport, params->viewportCount, params->pViewports); + return STATUS_SUCCESS; } @@ -9350,7 +9992,9 @@ static NTSTATUS thunk32_vkCmdSetViewport(void *args) { struct vkCmdSetViewport_params *params = args; TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstViewport, params->viewportCount, params->pViewports); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewport(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstViewport, params->viewportCount, params->pViewports); + return STATUS_SUCCESS; } @@ -9362,7 +10006,9 @@ static NTSTATUS thunk64_vkCmdSetViewportShadingRatePaletteNV(void *args) { struct vkCmdSetViewportShadingRatePaletteNV_params *params = args; TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstViewport, params->viewportCount, params->pShadingRatePalettes); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewportShadingRatePaletteNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstViewport, params->viewportCount, params->pShadingRatePalettes); + return STATUS_SUCCESS; } @@ -9372,7 +10018,9 @@ static NTSTATUS thunk32_vkCmdSetViewportShadingRatePaletteNV(void *args) { struct vkCmdSetViewportShadingRatePaletteNV_params *params = args; TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstViewport, params->viewportCount, params->pShadingRatePalettes); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewportShadingRatePaletteNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstViewport, params->viewportCount, params->pShadingRatePalettes); + return STATUS_SUCCESS; } @@ -9384,7 +10032,9 @@ static NTSTATUS thunk64_vkCmdSetViewportWScalingNV(void *args) { struct vkCmdSetViewportWScalingNV_params *params = args; TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstViewport, params->viewportCount, params->pViewportWScalings); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewportWScalingNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstViewport, params->viewportCount, params->pViewportWScalings); + return STATUS_SUCCESS; } @@ -9394,7 +10044,9 @@ static NTSTATUS thunk32_vkCmdSetViewportWScalingNV(void *args) { struct vkCmdSetViewportWScalingNV_params *params = args; TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstViewport, params->viewportCount, params->pViewportWScalings); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewportWScalingNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstViewport, params->viewportCount, params->pViewportWScalings); + return STATUS_SUCCESS; } @@ -9406,7 +10058,9 @@ static NTSTATUS thunk64_vkCmdSetViewportWithCount(void *args) { struct vkCmdSetViewportWithCount_params *params = args; TRACE("%p, %u, %p\n", params->commandBuffer, params->viewportCount, params->pViewports); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewportWithCount(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->viewportCount, params->pViewports); + return STATUS_SUCCESS; } @@ -9416,7 +10070,9 @@ static NTSTATUS thunk32_vkCmdSetViewportWithCount(void *args) { struct vkCmdSetViewportWithCount_params *params = args; TRACE("%p, %u, %p\n", params->commandBuffer, params->viewportCount, params->pViewports); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewportWithCount(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->viewportCount, params->pViewports); + return STATUS_SUCCESS; } @@ -9428,7 +10084,9 @@ static NTSTATUS thunk64_vkCmdSetViewportWithCountEXT(void *args) { struct vkCmdSetViewportWithCountEXT_params *params = args; TRACE("%p, %u, %p\n", params->commandBuffer, params->viewportCount, params->pViewports); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewportWithCountEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->viewportCount, params->pViewports); + return STATUS_SUCCESS; } @@ -9438,7 +10096,9 @@ static NTSTATUS thunk32_vkCmdSetViewportWithCountEXT(void *args) { struct vkCmdSetViewportWithCountEXT_params *params = args; TRACE("%p, %u, %p\n", params->commandBuffer, params->viewportCount, params->pViewports); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewportWithCountEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->viewportCount, params->pViewports); + return STATUS_SUCCESS; } @@ -9450,7 +10110,9 @@ static NTSTATUS thunk64_vkCmdSubpassShadingHUAWEI(void *args) { struct vkCmdSubpassShadingHUAWEI_params *params = args; TRACE("%p\n", params->commandBuffer); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSubpassShadingHUAWEI(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + return STATUS_SUCCESS; } @@ -9460,7 +10122,9 @@ static NTSTATUS thunk32_vkCmdSubpassShadingHUAWEI(void *args) { struct vkCmdSubpassShadingHUAWEI_params *params = args; TRACE("%p\n", params->commandBuffer); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSubpassShadingHUAWEI(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + return STATUS_SUCCESS; } @@ -9472,7 +10136,9 @@ static NTSTATUS thunk64_vkCmdTraceRaysIndirect2KHR(void *args) { struct vkCmdTraceRaysIndirect2KHR_params *params = args; TRACE("%p, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->indirectDeviceAddress)); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdTraceRaysIndirect2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->indirectDeviceAddress); + return STATUS_SUCCESS; } @@ -9482,7 +10148,9 @@ static NTSTATUS thunk32_vkCmdTraceRaysIndirect2KHR(void *args) { struct vkCmdTraceRaysIndirect2KHR_params *params = args; TRACE("%p, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->indirectDeviceAddress)); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdTraceRaysIndirect2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->indirectDeviceAddress); + return STATUS_SUCCESS; } @@ -9494,7 +10162,9 @@ static NTSTATUS thunk64_vkCmdTraceRaysIndirectKHR(void *args) { struct vkCmdTraceRaysIndirectKHR_params *params = args; TRACE("%p, %p, %p, %p, %p, 0x%s\n", params->commandBuffer, params->pRaygenShaderBindingTable, params->pMissShaderBindingTable, params->pHitShaderBindingTable, params->pCallableShaderBindingTable, wine_dbgstr_longlong(params->indirectDeviceAddress)); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdTraceRaysIndirectKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRaygenShaderBindingTable, params->pMissShaderBindingTable, params->pHitShaderBindingTable, params->pCallableShaderBindingTable, params->indirectDeviceAddress); + return STATUS_SUCCESS; } @@ -9526,7 +10196,9 @@ static NTSTATUS thunk64_vkCmdTraceRaysKHR(void *args) { struct vkCmdTraceRaysKHR_params *params = args; TRACE("%p, %p, %p, %p, %p, %u, %u, %u\n", params->commandBuffer, params->pRaygenShaderBindingTable, params->pMissShaderBindingTable, params->pHitShaderBindingTable, params->pCallableShaderBindingTable, params->width, params->height, params->depth); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdTraceRaysKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRaygenShaderBindingTable, params->pMissShaderBindingTable, params->pHitShaderBindingTable, params->pCallableShaderBindingTable, params->width, params->height, params->depth); + return STATUS_SUCCESS; } @@ -9558,7 +10230,9 @@ static NTSTATUS thunk64_vkCmdTraceRaysNV(void *args) { struct vkCmdTraceRaysNV_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->raygenShaderBindingTableBuffer), wine_dbgstr_longlong(params->raygenShaderBindingOffset), wine_dbgstr_longlong(params->missShaderBindingTableBuffer), wine_dbgstr_longlong(params->missShaderBindingOffset), wine_dbgstr_longlong(params->missShaderBindingStride), wine_dbgstr_longlong(params->hitShaderBindingTableBuffer), wine_dbgstr_longlong(params->hitShaderBindingOffset), wine_dbgstr_longlong(params->hitShaderBindingStride), wine_dbgstr_longlong(params->callableShaderBindingTableBuffer), wine_dbgstr_longlong(params->callableShaderBindingOffset), wine_dbgstr_longlong(params->callableShaderBindingStride), params->width, params->height, params->depth); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdTraceRaysNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->raygenShaderBindingTableBuffer, params->raygenShaderBindingOffset, params->missShaderBindingTableBuffer, params->missShaderBindingOffset, params->missShaderBindingStride, params->hitShaderBindingTableBuffer, params->hitShaderBindingOffset, params->hitShaderBindingStride, params->callableShaderBindingTableBuffer, params->callableShaderBindingOffset, params->callableShaderBindingStride, params->width, params->height, params->depth); + return STATUS_SUCCESS; } @@ -9568,7 +10242,9 @@ static NTSTATUS thunk32_vkCmdTraceRaysNV(void *args) { struct vkCmdTraceRaysNV_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->raygenShaderBindingTableBuffer), wine_dbgstr_longlong(params->raygenShaderBindingOffset), wine_dbgstr_longlong(params->missShaderBindingTableBuffer), wine_dbgstr_longlong(params->missShaderBindingOffset), wine_dbgstr_longlong(params->missShaderBindingStride), wine_dbgstr_longlong(params->hitShaderBindingTableBuffer), wine_dbgstr_longlong(params->hitShaderBindingOffset), wine_dbgstr_longlong(params->hitShaderBindingStride), wine_dbgstr_longlong(params->callableShaderBindingTableBuffer), wine_dbgstr_longlong(params->callableShaderBindingOffset), wine_dbgstr_longlong(params->callableShaderBindingStride), params->width, params->height, params->depth); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdTraceRaysNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->raygenShaderBindingTableBuffer, params->raygenShaderBindingOffset, params->missShaderBindingTableBuffer, params->missShaderBindingOffset, params->missShaderBindingStride, params->hitShaderBindingTableBuffer, params->hitShaderBindingOffset, params->hitShaderBindingStride, params->callableShaderBindingTableBuffer, params->callableShaderBindingOffset, params->callableShaderBindingStride, params->width, params->height, params->depth); + return STATUS_SUCCESS; } @@ -9580,7 +10256,9 @@ static NTSTATUS thunk64_vkCmdUpdateBuffer(void *args) { struct vkCmdUpdateBuffer_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), wine_dbgstr_longlong(params->dataSize), params->pData); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdUpdateBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->dstBuffer, params->dstOffset, params->dataSize, params->pData); + return STATUS_SUCCESS; } @@ -9590,7 +10268,9 @@ static NTSTATUS thunk32_vkCmdUpdateBuffer(void *args) { struct vkCmdUpdateBuffer_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), wine_dbgstr_longlong(params->dataSize), params->pData); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdUpdateBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->dstBuffer, params->dstOffset, params->dataSize, params->pData); + return STATUS_SUCCESS; } @@ -9602,7 +10282,9 @@ static NTSTATUS thunk64_vkCmdWaitEvents(void *args) { struct vkCmdWaitEvents_params *params = args; TRACE("%p, %u, %p, %#x, %#x, %u, %p, %u, %p, %u, %p\n", params->commandBuffer, params->eventCount, params->pEvents, params->srcStageMask, params->dstStageMask, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, params->pBufferMemoryBarriers, params->imageMemoryBarrierCount, params->pImageMemoryBarriers); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWaitEvents(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->eventCount, params->pEvents, params->srcStageMask, params->dstStageMask, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, params->pBufferMemoryBarriers, params->imageMemoryBarrierCount, params->pImageMemoryBarriers); + return STATUS_SUCCESS; } @@ -9632,7 +10314,9 @@ static NTSTATUS thunk64_vkCmdWaitEvents2(void *args) { struct vkCmdWaitEvents2_params *params = args; TRACE("%p, %u, %p, %p\n", params->commandBuffer, params->eventCount, params->pEvents, params->pDependencyInfos); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWaitEvents2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->eventCount, params->pEvents, params->pDependencyInfos); + return STATUS_SUCCESS; } @@ -9659,7 +10343,9 @@ static NTSTATUS thunk64_vkCmdWaitEvents2KHR(void *args) { struct vkCmdWaitEvents2KHR_params *params = args; TRACE("%p, %u, %p, %p\n", params->commandBuffer, params->eventCount, params->pEvents, params->pDependencyInfos); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWaitEvents2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->eventCount, params->pEvents, params->pDependencyInfos); + return STATUS_SUCCESS; } @@ -9686,7 +10372,9 @@ static NTSTATUS thunk64_vkCmdWriteAccelerationStructuresPropertiesKHR(void *args { struct vkCmdWriteAccelerationStructuresPropertiesKHR_params *params = args; TRACE("%p, %u, %p, %#x, 0x%s, %u\n", params->commandBuffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, wine_dbgstr_longlong(params->queryPool), params->firstQuery); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteAccelerationStructuresPropertiesKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, params->queryPool, params->firstQuery); + return STATUS_SUCCESS; } @@ -9696,7 +10384,9 @@ static NTSTATUS thunk32_vkCmdWriteAccelerationStructuresPropertiesKHR(void *args { struct vkCmdWriteAccelerationStructuresPropertiesKHR_params *params = args; TRACE("%p, %u, %p, %#x, 0x%s, %u\n", params->commandBuffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, wine_dbgstr_longlong(params->queryPool), params->firstQuery); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteAccelerationStructuresPropertiesKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, params->queryPool, params->firstQuery); + return STATUS_SUCCESS; } @@ -9708,7 +10398,9 @@ static NTSTATUS thunk64_vkCmdWriteAccelerationStructuresPropertiesNV(void *args) { struct vkCmdWriteAccelerationStructuresPropertiesNV_params *params = args; TRACE("%p, %u, %p, %#x, 0x%s, %u\n", params->commandBuffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, wine_dbgstr_longlong(params->queryPool), params->firstQuery); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteAccelerationStructuresPropertiesNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, params->queryPool, params->firstQuery); + return STATUS_SUCCESS; } @@ -9718,7 +10410,9 @@ static NTSTATUS thunk32_vkCmdWriteAccelerationStructuresPropertiesNV(void *args) { struct vkCmdWriteAccelerationStructuresPropertiesNV_params *params = args; TRACE("%p, %u, %p, %#x, 0x%s, %u\n", params->commandBuffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, wine_dbgstr_longlong(params->queryPool), params->firstQuery); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteAccelerationStructuresPropertiesNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, params->queryPool, params->firstQuery); + return STATUS_SUCCESS; } @@ -9730,7 +10424,9 @@ static NTSTATUS thunk64_vkCmdWriteBufferMarker2AMD(void *args) { struct vkCmdWriteBufferMarker2AMD_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->stage), wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), params->marker); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteBufferMarker2AMD(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stage, params->dstBuffer, params->dstOffset, params->marker); + return STATUS_SUCCESS; } @@ -9740,7 +10436,9 @@ static NTSTATUS thunk32_vkCmdWriteBufferMarker2AMD(void *args) { struct vkCmdWriteBufferMarker2AMD_params *params = args; TRACE("%p, 0x%s, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->stage), wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), params->marker); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteBufferMarker2AMD(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stage, params->dstBuffer, params->dstOffset, params->marker); + return STATUS_SUCCESS; } @@ -9752,7 +10450,9 @@ static NTSTATUS thunk64_vkCmdWriteBufferMarkerAMD(void *args) { struct vkCmdWriteBufferMarkerAMD_params *params = args; TRACE("%p, %#x, 0x%s, 0x%s, %u\n", params->commandBuffer, params->pipelineStage, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), params->marker); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteBufferMarkerAMD(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineStage, params->dstBuffer, params->dstOffset, params->marker); + return STATUS_SUCCESS; } @@ -9762,7 +10462,9 @@ static NTSTATUS thunk32_vkCmdWriteBufferMarkerAMD(void *args) { struct vkCmdWriteBufferMarkerAMD_params *params = args; TRACE("%p, %#x, 0x%s, 0x%s, %u\n", params->commandBuffer, params->pipelineStage, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), params->marker); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteBufferMarkerAMD(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineStage, params->dstBuffer, params->dstOffset, params->marker); + return STATUS_SUCCESS; } @@ -9774,7 +10476,9 @@ static NTSTATUS thunk64_vkCmdWriteTimestamp(void *args) { struct vkCmdWriteTimestamp_params *params = args; TRACE("%p, %#x, 0x%s, %u\n", params->commandBuffer, params->pipelineStage, wine_dbgstr_longlong(params->queryPool), params->query); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteTimestamp(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineStage, params->queryPool, params->query); + return STATUS_SUCCESS; } @@ -9784,7 +10488,9 @@ static NTSTATUS thunk32_vkCmdWriteTimestamp(void *args) { struct vkCmdWriteTimestamp_params *params = args; TRACE("%p, %#x, 0x%s, %u\n", params->commandBuffer, params->pipelineStage, wine_dbgstr_longlong(params->queryPool), params->query); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteTimestamp(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineStage, params->queryPool, params->query); + return STATUS_SUCCESS; } @@ -9796,7 +10502,9 @@ static NTSTATUS thunk64_vkCmdWriteTimestamp2(void *args) { struct vkCmdWriteTimestamp2_params *params = args; TRACE("%p, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->stage), wine_dbgstr_longlong(params->queryPool), params->query); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteTimestamp2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stage, params->queryPool, params->query); + return STATUS_SUCCESS; } @@ -9806,7 +10514,9 @@ static NTSTATUS thunk32_vkCmdWriteTimestamp2(void *args) { struct vkCmdWriteTimestamp2_params *params = args; TRACE("%p, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->stage), wine_dbgstr_longlong(params->queryPool), params->query); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteTimestamp2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stage, params->queryPool, params->query); + return STATUS_SUCCESS; } @@ -9818,7 +10528,9 @@ static NTSTATUS thunk64_vkCmdWriteTimestamp2KHR(void *args) { struct vkCmdWriteTimestamp2KHR_params *params = args; TRACE("%p, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->stage), wine_dbgstr_longlong(params->queryPool), params->query); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteTimestamp2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stage, params->queryPool, params->query); + return STATUS_SUCCESS; } @@ -9828,7 +10540,9 @@ static NTSTATUS thunk32_vkCmdWriteTimestamp2KHR(void *args) { struct vkCmdWriteTimestamp2KHR_params *params = args; TRACE("%p, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->stage), wine_dbgstr_longlong(params->queryPool), params->query); + wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteTimestamp2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stage, params->queryPool, params->query); + return STATUS_SUCCESS; } @@ -9839,8 +10553,12 @@ static NTSTATUS thunk32_vkCmdWriteTimestamp2KHR(void *args) static NTSTATUS thunk64_vkCompileDeferredNV(void *args) { struct vkCompileDeferredNV_params *params = args; + VkResult result; TRACE("%p, 0x%s, %u\n", params->device, wine_dbgstr_longlong(params->pipeline), params->shader); - return wine_device_from_handle(params->device)->funcs.p_vkCompileDeferredNV(wine_device_from_handle(params->device)->device, params->pipeline, params->shader); + + result = wine_device_from_handle(params->device)->funcs.p_vkCompileDeferredNV(wine_device_from_handle(params->device)->device, params->pipeline, params->shader); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -9848,8 +10566,12 @@ static NTSTATUS thunk64_vkCompileDeferredNV(void *args) static NTSTATUS thunk32_vkCompileDeferredNV(void *args) { struct vkCompileDeferredNV_params *params = args; + VkResult result; TRACE("%p, 0x%s, %u\n", params->device, wine_dbgstr_longlong(params->pipeline), params->shader); - return wine_device_from_handle(params->device)->funcs.p_vkCompileDeferredNV(wine_device_from_handle(params->device)->device, params->pipeline, params->shader); + + result = wine_device_from_handle(params->device)->funcs.p_vkCompileDeferredNV(wine_device_from_handle(params->device)->device, params->pipeline, params->shader); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -9859,8 +10581,12 @@ static NTSTATUS thunk32_vkCompileDeferredNV(void *args) static NTSTATUS thunk64_vkCopyAccelerationStructureKHR(void *args) { struct vkCopyAccelerationStructureKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo); - return wine_device_from_handle(params->device)->funcs.p_vkCopyAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, params->pInfo); + + result = wine_device_from_handle(params->device)->funcs.p_vkCopyAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, params->pInfo); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -9885,8 +10611,12 @@ static NTSTATUS thunk32_vkCopyAccelerationStructureKHR(void *args) static NTSTATUS thunk64_vkCopyAccelerationStructureToMemoryKHR(void *args) { struct vkCopyAccelerationStructureToMemoryKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo); - return wine_device_from_handle(params->device)->funcs.p_vkCopyAccelerationStructureToMemoryKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, params->pInfo); + + result = wine_device_from_handle(params->device)->funcs.p_vkCopyAccelerationStructureToMemoryKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, params->pInfo); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -9911,8 +10641,12 @@ static NTSTATUS thunk32_vkCopyAccelerationStructureToMemoryKHR(void *args) static NTSTATUS thunk64_vkCopyMemoryToAccelerationStructureKHR(void *args) { struct vkCopyMemoryToAccelerationStructureKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo); - return wine_device_from_handle(params->device)->funcs.p_vkCopyMemoryToAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, params->pInfo); + + result = wine_device_from_handle(params->device)->funcs.p_vkCopyMemoryToAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, params->pInfo); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -9937,8 +10671,12 @@ static NTSTATUS thunk32_vkCopyMemoryToAccelerationStructureKHR(void *args) static NTSTATUS thunk64_vkCreateAccelerationStructureKHR(void *args) { struct vkCreateAccelerationStructureKHR_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pAccelerationStructure); - return wine_device_from_handle(params->device)->funcs.p_vkCreateAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pAccelerationStructure); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pAccelerationStructure); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -9963,8 +10701,12 @@ static NTSTATUS thunk32_vkCreateAccelerationStructureKHR(void *args) static NTSTATUS thunk64_vkCreateAccelerationStructureNV(void *args) { struct vkCreateAccelerationStructureNV_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pAccelerationStructure); - return wine_device_from_handle(params->device)->funcs.p_vkCreateAccelerationStructureNV(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pAccelerationStructure); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateAccelerationStructureNV(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pAccelerationStructure); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -9989,8 +10731,12 @@ static NTSTATUS thunk32_vkCreateAccelerationStructureNV(void *args) static NTSTATUS thunk64_vkCreateBuffer(void *args) { struct vkCreateBuffer_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pBuffer); - return wine_device_from_handle(params->device)->funcs.p_vkCreateBuffer(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pBuffer); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateBuffer(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pBuffer); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10015,8 +10761,12 @@ static NTSTATUS thunk32_vkCreateBuffer(void *args) static NTSTATUS thunk64_vkCreateBufferView(void *args) { struct vkCreateBufferView_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pView); - return wine_device_from_handle(params->device)->funcs.p_vkCreateBufferView(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pView); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateBufferView(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pView); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10040,7 +10790,10 @@ static NTSTATUS thunk32_vkCreateBufferView(void *args) VkResult thunk_vkCreateComputePipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkComputePipelineCreateInfo *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) { - return wine_device_from_handle(device)->funcs.p_vkCreateComputePipelines(wine_device_from_handle(device)->device, pipelineCache, createInfoCount, pCreateInfos, NULL, pPipelines); + VkResult result; + result = wine_device_from_handle(device)->funcs.p_vkCreateComputePipelines(wine_device_from_handle(device)->device, pipelineCache, createInfoCount, pCreateInfos, NULL, pPipelines); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10063,8 +10816,12 @@ VkResult thunk_vkCreateComputePipelines(VkDevice device, VkPipelineCache pipelin static NTSTATUS thunk64_vkCreateCuFunctionNVX(void *args) { struct vkCreateCuFunctionNVX_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pFunction); - return wine_device_from_handle(params->device)->funcs.p_vkCreateCuFunctionNVX(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pFunction); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateCuFunctionNVX(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pFunction); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10089,8 +10846,12 @@ static NTSTATUS thunk32_vkCreateCuFunctionNVX(void *args) static NTSTATUS thunk64_vkCreateCuModuleNVX(void *args) { struct vkCreateCuModuleNVX_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pModule); - return wine_device_from_handle(params->device)->funcs.p_vkCreateCuModuleNVX(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pModule); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateCuModuleNVX(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pModule); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10098,8 +10859,12 @@ static NTSTATUS thunk64_vkCreateCuModuleNVX(void *args) static NTSTATUS thunk32_vkCreateCuModuleNVX(void *args) { struct vkCreateCuModuleNVX_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pModule); - return wine_device_from_handle(params->device)->funcs.p_vkCreateCuModuleNVX(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pModule); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateCuModuleNVX(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pModule); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -10109,17 +10874,25 @@ static NTSTATUS thunk32_vkCreateCuModuleNVX(void *args) static NTSTATUS thunk64_vkCreateDeferredOperationKHR(void *args) { struct vkCreateDeferredOperationKHR_params *params = args; + VkResult result; TRACE("%p, %p, %p\n", params->device, params->pAllocator, params->pDeferredOperation); - return wine_device_from_handle(params->device)->funcs.p_vkCreateDeferredOperationKHR(wine_device_from_handle(params->device)->device, NULL, params->pDeferredOperation); -} -#else /* USE_STRUCT_CONVERSION */ + result = wine_device_from_handle(params->device)->funcs.p_vkCreateDeferredOperationKHR(wine_device_from_handle(params->device)->device, NULL, params->pDeferredOperation); + + return result; +} + +#else /* USE_STRUCT_CONVERSION */ static NTSTATUS thunk32_vkCreateDeferredOperationKHR(void *args) { struct vkCreateDeferredOperationKHR_params *params = args; + VkResult result; TRACE("%p, %p, %p\n", params->device, params->pAllocator, params->pDeferredOperation); - return wine_device_from_handle(params->device)->funcs.p_vkCreateDeferredOperationKHR(wine_device_from_handle(params->device)->device, NULL, params->pDeferredOperation); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateDeferredOperationKHR(wine_device_from_handle(params->device)->device, NULL, params->pDeferredOperation); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -10129,8 +10902,12 @@ static NTSTATUS thunk32_vkCreateDeferredOperationKHR(void *args) static NTSTATUS thunk64_vkCreateDescriptorPool(void *args) { struct vkCreateDescriptorPool_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pDescriptorPool); - return wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorPool(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pDescriptorPool); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorPool(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pDescriptorPool); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10138,8 +10915,12 @@ static NTSTATUS thunk64_vkCreateDescriptorPool(void *args) static NTSTATUS thunk32_vkCreateDescriptorPool(void *args) { struct vkCreateDescriptorPool_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pDescriptorPool); - return wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorPool(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pDescriptorPool); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorPool(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pDescriptorPool); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -10149,8 +10930,12 @@ static NTSTATUS thunk32_vkCreateDescriptorPool(void *args) static NTSTATUS thunk64_vkCreateDescriptorSetLayout(void *args) { struct vkCreateDescriptorSetLayout_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSetLayout); - return wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorSetLayout(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSetLayout); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorSetLayout(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSetLayout); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10158,8 +10943,12 @@ static NTSTATUS thunk64_vkCreateDescriptorSetLayout(void *args) static NTSTATUS thunk32_vkCreateDescriptorSetLayout(void *args) { struct vkCreateDescriptorSetLayout_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSetLayout); - return wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorSetLayout(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSetLayout); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorSetLayout(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSetLayout); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -10169,8 +10958,12 @@ static NTSTATUS thunk32_vkCreateDescriptorSetLayout(void *args) static NTSTATUS thunk64_vkCreateDescriptorUpdateTemplate(void *args) { struct vkCreateDescriptorUpdateTemplate_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pDescriptorUpdateTemplate); - return wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorUpdateTemplate(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pDescriptorUpdateTemplate); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorUpdateTemplate(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pDescriptorUpdateTemplate); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10195,8 +10988,12 @@ static NTSTATUS thunk32_vkCreateDescriptorUpdateTemplate(void *args) static NTSTATUS thunk64_vkCreateDescriptorUpdateTemplateKHR(void *args) { struct vkCreateDescriptorUpdateTemplateKHR_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pDescriptorUpdateTemplate); - return wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorUpdateTemplateKHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pDescriptorUpdateTemplate); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorUpdateTemplateKHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pDescriptorUpdateTemplate); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10221,8 +11018,12 @@ static NTSTATUS thunk32_vkCreateDescriptorUpdateTemplateKHR(void *args) static NTSTATUS thunk64_vkCreateEvent(void *args) { struct vkCreateEvent_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pEvent); - return wine_device_from_handle(params->device)->funcs.p_vkCreateEvent(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pEvent); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateEvent(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pEvent); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10230,8 +11031,12 @@ static NTSTATUS thunk64_vkCreateEvent(void *args) static NTSTATUS thunk32_vkCreateEvent(void *args) { struct vkCreateEvent_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pEvent); - return wine_device_from_handle(params->device)->funcs.p_vkCreateEvent(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pEvent); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateEvent(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pEvent); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -10241,8 +11046,12 @@ static NTSTATUS thunk32_vkCreateEvent(void *args) static NTSTATUS thunk64_vkCreateFence(void *args) { struct vkCreateFence_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pFence); - return wine_device_from_handle(params->device)->funcs.p_vkCreateFence(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pFence); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateFence(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pFence); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10250,8 +11059,12 @@ static NTSTATUS thunk64_vkCreateFence(void *args) static NTSTATUS thunk32_vkCreateFence(void *args) { struct vkCreateFence_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pFence); - return wine_device_from_handle(params->device)->funcs.p_vkCreateFence(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pFence); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateFence(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pFence); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -10261,8 +11074,12 @@ static NTSTATUS thunk32_vkCreateFence(void *args) static NTSTATUS thunk64_vkCreateFramebuffer(void *args) { struct vkCreateFramebuffer_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pFramebuffer); - return wine_device_from_handle(params->device)->funcs.p_vkCreateFramebuffer(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pFramebuffer); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateFramebuffer(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pFramebuffer); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10286,7 +11103,10 @@ static NTSTATUS thunk32_vkCreateFramebuffer(void *args) VkResult thunk_vkCreateGraphicsPipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkGraphicsPipelineCreateInfo *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) { - return wine_device_from_handle(device)->funcs.p_vkCreateGraphicsPipelines(wine_device_from_handle(device)->device, pipelineCache, createInfoCount, pCreateInfos, NULL, pPipelines); + VkResult result; + result = wine_device_from_handle(device)->funcs.p_vkCreateGraphicsPipelines(wine_device_from_handle(device)->device, pipelineCache, createInfoCount, pCreateInfos, NULL, pPipelines); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10309,8 +11129,12 @@ VkResult thunk_vkCreateGraphicsPipelines(VkDevice device, VkPipelineCache pipeli static NTSTATUS thunk64_vkCreateImage(void *args) { struct vkCreateImage_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pImage); - return wine_device_from_handle(params->device)->funcs.p_vkCreateImage(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pImage); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateImage(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pImage); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10318,8 +11142,12 @@ static NTSTATUS thunk64_vkCreateImage(void *args) static NTSTATUS thunk32_vkCreateImage(void *args) { struct vkCreateImage_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pImage); - return wine_device_from_handle(params->device)->funcs.p_vkCreateImage(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pImage); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateImage(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pImage); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -10329,8 +11157,12 @@ static NTSTATUS thunk32_vkCreateImage(void *args) static NTSTATUS thunk64_vkCreateImageView(void *args) { struct vkCreateImageView_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pView); - return wine_device_from_handle(params->device)->funcs.p_vkCreateImageView(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pView); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateImageView(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pView); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10355,8 +11187,12 @@ static NTSTATUS thunk32_vkCreateImageView(void *args) static NTSTATUS thunk64_vkCreateIndirectCommandsLayoutNV(void *args) { struct vkCreateIndirectCommandsLayoutNV_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pIndirectCommandsLayout); - return wine_device_from_handle(params->device)->funcs.p_vkCreateIndirectCommandsLayoutNV(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pIndirectCommandsLayout); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateIndirectCommandsLayoutNV(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pIndirectCommandsLayout); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10382,8 +11218,12 @@ static NTSTATUS thunk32_vkCreateIndirectCommandsLayoutNV(void *args) static NTSTATUS thunk64_vkCreatePipelineCache(void *args) { struct vkCreatePipelineCache_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPipelineCache); - return wine_device_from_handle(params->device)->funcs.p_vkCreatePipelineCache(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPipelineCache); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreatePipelineCache(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPipelineCache); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10391,8 +11231,12 @@ static NTSTATUS thunk64_vkCreatePipelineCache(void *args) static NTSTATUS thunk32_vkCreatePipelineCache(void *args) { struct vkCreatePipelineCache_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPipelineCache); - return wine_device_from_handle(params->device)->funcs.p_vkCreatePipelineCache(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPipelineCache); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreatePipelineCache(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPipelineCache); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -10402,8 +11246,12 @@ static NTSTATUS thunk32_vkCreatePipelineCache(void *args) static NTSTATUS thunk64_vkCreatePipelineLayout(void *args) { struct vkCreatePipelineLayout_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPipelineLayout); - return wine_device_from_handle(params->device)->funcs.p_vkCreatePipelineLayout(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPipelineLayout); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreatePipelineLayout(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPipelineLayout); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10411,8 +11259,12 @@ static NTSTATUS thunk64_vkCreatePipelineLayout(void *args) static NTSTATUS thunk32_vkCreatePipelineLayout(void *args) { struct vkCreatePipelineLayout_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPipelineLayout); - return wine_device_from_handle(params->device)->funcs.p_vkCreatePipelineLayout(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPipelineLayout); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreatePipelineLayout(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPipelineLayout); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -10422,8 +11274,12 @@ static NTSTATUS thunk32_vkCreatePipelineLayout(void *args) static NTSTATUS thunk64_vkCreatePrivateDataSlot(void *args) { struct vkCreatePrivateDataSlot_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPrivateDataSlot); - return wine_device_from_handle(params->device)->funcs.p_vkCreatePrivateDataSlot(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPrivateDataSlot); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreatePrivateDataSlot(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPrivateDataSlot); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10431,8 +11287,12 @@ static NTSTATUS thunk64_vkCreatePrivateDataSlot(void *args) static NTSTATUS thunk32_vkCreatePrivateDataSlot(void *args) { struct vkCreatePrivateDataSlot_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPrivateDataSlot); - return wine_device_from_handle(params->device)->funcs.p_vkCreatePrivateDataSlot(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPrivateDataSlot); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreatePrivateDataSlot(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPrivateDataSlot); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -10442,8 +11302,12 @@ static NTSTATUS thunk32_vkCreatePrivateDataSlot(void *args) static NTSTATUS thunk64_vkCreatePrivateDataSlotEXT(void *args) { struct vkCreatePrivateDataSlotEXT_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPrivateDataSlot); - return wine_device_from_handle(params->device)->funcs.p_vkCreatePrivateDataSlotEXT(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPrivateDataSlot); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreatePrivateDataSlotEXT(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPrivateDataSlot); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10451,8 +11315,12 @@ static NTSTATUS thunk64_vkCreatePrivateDataSlotEXT(void *args) static NTSTATUS thunk32_vkCreatePrivateDataSlotEXT(void *args) { struct vkCreatePrivateDataSlotEXT_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPrivateDataSlot); - return wine_device_from_handle(params->device)->funcs.p_vkCreatePrivateDataSlotEXT(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPrivateDataSlot); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreatePrivateDataSlotEXT(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPrivateDataSlot); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -10462,8 +11330,12 @@ static NTSTATUS thunk32_vkCreatePrivateDataSlotEXT(void *args) static NTSTATUS thunk64_vkCreateQueryPool(void *args) { struct vkCreateQueryPool_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pQueryPool); - return wine_device_from_handle(params->device)->funcs.p_vkCreateQueryPool(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pQueryPool); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateQueryPool(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pQueryPool); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10471,8 +11343,12 @@ static NTSTATUS thunk64_vkCreateQueryPool(void *args) static NTSTATUS thunk32_vkCreateQueryPool(void *args) { struct vkCreateQueryPool_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pQueryPool); - return wine_device_from_handle(params->device)->funcs.p_vkCreateQueryPool(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pQueryPool); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateQueryPool(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pQueryPool); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -10481,7 +11357,10 @@ static NTSTATUS thunk32_vkCreateQueryPool(void *args) VkResult thunk_vkCreateRayTracingPipelinesKHR(VkDevice device, VkDeferredOperationKHR deferredOperation, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkRayTracingPipelineCreateInfoKHR *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) { - return wine_device_from_handle(device)->funcs.p_vkCreateRayTracingPipelinesKHR(wine_device_from_handle(device)->device, deferredOperation, pipelineCache, createInfoCount, pCreateInfos, NULL, pPipelines); + VkResult result; + result = wine_device_from_handle(device)->funcs.p_vkCreateRayTracingPipelinesKHR(wine_device_from_handle(device)->device, deferredOperation, pipelineCache, createInfoCount, pCreateInfos, NULL, pPipelines); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10503,7 +11382,10 @@ VkResult thunk_vkCreateRayTracingPipelinesKHR(VkDevice device, VkDeferredOperati VkResult thunk_vkCreateRayTracingPipelinesNV(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkRayTracingPipelineCreateInfoNV *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) { - return wine_device_from_handle(device)->funcs.p_vkCreateRayTracingPipelinesNV(wine_device_from_handle(device)->device, pipelineCache, createInfoCount, pCreateInfos, NULL, pPipelines); + VkResult result; + result = wine_device_from_handle(device)->funcs.p_vkCreateRayTracingPipelinesNV(wine_device_from_handle(device)->device, pipelineCache, createInfoCount, pCreateInfos, NULL, pPipelines); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10526,8 +11408,12 @@ VkResult thunk_vkCreateRayTracingPipelinesNV(VkDevice device, VkPipelineCache pi static NTSTATUS thunk64_vkCreateRenderPass(void *args) { struct vkCreateRenderPass_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pRenderPass); - return wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10535,8 +11421,12 @@ static NTSTATUS thunk64_vkCreateRenderPass(void *args) static NTSTATUS thunk32_vkCreateRenderPass(void *args) { struct vkCreateRenderPass_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pRenderPass); - return wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -10546,8 +11436,12 @@ static NTSTATUS thunk32_vkCreateRenderPass(void *args) static NTSTATUS thunk64_vkCreateRenderPass2(void *args) { struct vkCreateRenderPass2_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pRenderPass); - return wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass2(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass2(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10555,8 +11449,12 @@ static NTSTATUS thunk64_vkCreateRenderPass2(void *args) static NTSTATUS thunk32_vkCreateRenderPass2(void *args) { struct vkCreateRenderPass2_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pRenderPass); - return wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass2(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass2(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -10566,8 +11464,12 @@ static NTSTATUS thunk32_vkCreateRenderPass2(void *args) static NTSTATUS thunk64_vkCreateRenderPass2KHR(void *args) { struct vkCreateRenderPass2KHR_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pRenderPass); - return wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass2KHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass2KHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10575,8 +11477,12 @@ static NTSTATUS thunk64_vkCreateRenderPass2KHR(void *args) static NTSTATUS thunk32_vkCreateRenderPass2KHR(void *args) { struct vkCreateRenderPass2KHR_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pRenderPass); - return wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass2KHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass2KHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -10586,8 +11492,12 @@ static NTSTATUS thunk32_vkCreateRenderPass2KHR(void *args) static NTSTATUS thunk64_vkCreateSampler(void *args) { struct vkCreateSampler_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSampler); - return wine_device_from_handle(params->device)->funcs.p_vkCreateSampler(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSampler); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateSampler(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSampler); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10595,8 +11505,12 @@ static NTSTATUS thunk64_vkCreateSampler(void *args) static NTSTATUS thunk32_vkCreateSampler(void *args) { struct vkCreateSampler_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSampler); - return wine_device_from_handle(params->device)->funcs.p_vkCreateSampler(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSampler); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateSampler(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSampler); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -10606,8 +11520,12 @@ static NTSTATUS thunk32_vkCreateSampler(void *args) static NTSTATUS thunk64_vkCreateSamplerYcbcrConversion(void *args) { struct vkCreateSamplerYcbcrConversion_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pYcbcrConversion); - return wine_device_from_handle(params->device)->funcs.p_vkCreateSamplerYcbcrConversion(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pYcbcrConversion); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateSamplerYcbcrConversion(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pYcbcrConversion); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10615,8 +11533,12 @@ static NTSTATUS thunk64_vkCreateSamplerYcbcrConversion(void *args) static NTSTATUS thunk32_vkCreateSamplerYcbcrConversion(void *args) { struct vkCreateSamplerYcbcrConversion_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pYcbcrConversion); - return wine_device_from_handle(params->device)->funcs.p_vkCreateSamplerYcbcrConversion(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pYcbcrConversion); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateSamplerYcbcrConversion(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pYcbcrConversion); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -10626,8 +11548,12 @@ static NTSTATUS thunk32_vkCreateSamplerYcbcrConversion(void *args) static NTSTATUS thunk64_vkCreateSamplerYcbcrConversionKHR(void *args) { struct vkCreateSamplerYcbcrConversionKHR_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pYcbcrConversion); - return wine_device_from_handle(params->device)->funcs.p_vkCreateSamplerYcbcrConversionKHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pYcbcrConversion); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateSamplerYcbcrConversionKHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pYcbcrConversion); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10635,8 +11561,12 @@ static NTSTATUS thunk64_vkCreateSamplerYcbcrConversionKHR(void *args) static NTSTATUS thunk32_vkCreateSamplerYcbcrConversionKHR(void *args) { struct vkCreateSamplerYcbcrConversionKHR_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pYcbcrConversion); - return wine_device_from_handle(params->device)->funcs.p_vkCreateSamplerYcbcrConversionKHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pYcbcrConversion); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateSamplerYcbcrConversionKHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pYcbcrConversion); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -10646,8 +11576,12 @@ static NTSTATUS thunk32_vkCreateSamplerYcbcrConversionKHR(void *args) static NTSTATUS thunk64_vkCreateSemaphore(void *args) { struct vkCreateSemaphore_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSemaphore); - return wine_device_from_handle(params->device)->funcs.p_vkCreateSemaphore(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSemaphore); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateSemaphore(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSemaphore); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10655,8 +11589,12 @@ static NTSTATUS thunk64_vkCreateSemaphore(void *args) static NTSTATUS thunk32_vkCreateSemaphore(void *args) { struct vkCreateSemaphore_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSemaphore); - return wine_device_from_handle(params->device)->funcs.p_vkCreateSemaphore(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSemaphore); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateSemaphore(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSemaphore); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -10666,8 +11604,12 @@ static NTSTATUS thunk32_vkCreateSemaphore(void *args) static NTSTATUS thunk64_vkCreateShaderModule(void *args) { struct vkCreateShaderModule_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pShaderModule); - return wine_device_from_handle(params->device)->funcs.p_vkCreateShaderModule(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pShaderModule); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateShaderModule(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pShaderModule); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10675,8 +11617,12 @@ static NTSTATUS thunk64_vkCreateShaderModule(void *args) static NTSTATUS thunk32_vkCreateShaderModule(void *args) { struct vkCreateShaderModule_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pShaderModule); - return wine_device_from_handle(params->device)->funcs.p_vkCreateShaderModule(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pShaderModule); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateShaderModule(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pShaderModule); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -10718,8 +11664,12 @@ static NTSTATUS thunk32_vkCreateSwapchainKHR(void *args) static NTSTATUS thunk64_vkCreateValidationCacheEXT(void *args) { struct vkCreateValidationCacheEXT_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pValidationCache); - return wine_device_from_handle(params->device)->funcs.p_vkCreateValidationCacheEXT(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pValidationCache); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateValidationCacheEXT(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pValidationCache); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10727,8 +11677,12 @@ static NTSTATUS thunk64_vkCreateValidationCacheEXT(void *args) static NTSTATUS thunk32_vkCreateValidationCacheEXT(void *args) { struct vkCreateValidationCacheEXT_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pValidationCache); - return wine_device_from_handle(params->device)->funcs.p_vkCreateValidationCacheEXT(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pValidationCache); + + result = wine_device_from_handle(params->device)->funcs.p_vkCreateValidationCacheEXT(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pValidationCache); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -10803,7 +11757,9 @@ static NTSTATUS thunk64_vkDebugReportMessageEXT(void *args) { struct vkDebugReportMessageEXT_params *params = args; TRACE("%p, %#x, %#x, 0x%s, 0x%s, %d, %p, %p\n", params->instance, params->flags, params->objectType, wine_dbgstr_longlong(params->object), wine_dbgstr_longlong(params->location), params->messageCode, params->pLayerPrefix, params->pMessage); + wine_instance_from_handle(params->instance)->funcs.p_vkDebugReportMessageEXT(wine_instance_from_handle(params->instance)->instance, params->flags, params->objectType, wine_vk_unwrap_handle(params->objectType, params->object), params->location, params->messageCode, params->pLayerPrefix, params->pMessage); + return STATUS_SUCCESS; } @@ -10813,7 +11769,9 @@ static NTSTATUS thunk32_vkDebugReportMessageEXT(void *args) { struct vkDebugReportMessageEXT_params *params = args; TRACE("%p, %#x, %#x, 0x%s, 0x%s, %d, %p, %p\n", params->instance, params->flags, params->objectType, wine_dbgstr_longlong(params->object), wine_dbgstr_longlong(params->location), params->messageCode, params->pLayerPrefix, params->pMessage); + wine_instance_from_handle(params->instance)->funcs.p_vkDebugReportMessageEXT(wine_instance_from_handle(params->instance)->instance, params->flags, params->objectType, wine_vk_unwrap_handle(params->objectType, params->object), params->location, params->messageCode, params->pLayerPrefix, params->pMessage); + return STATUS_SUCCESS; } @@ -10824,8 +11782,12 @@ static NTSTATUS thunk32_vkDebugReportMessageEXT(void *args) static NTSTATUS thunk64_vkDeferredOperationJoinKHR(void *args) { struct vkDeferredOperationJoinKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->operation)); - return wine_device_from_handle(params->device)->funcs.p_vkDeferredOperationJoinKHR(wine_device_from_handle(params->device)->device, params->operation); + + result = wine_device_from_handle(params->device)->funcs.p_vkDeferredOperationJoinKHR(wine_device_from_handle(params->device)->device, params->operation); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -10833,8 +11795,12 @@ static NTSTATUS thunk64_vkDeferredOperationJoinKHR(void *args) static NTSTATUS thunk32_vkDeferredOperationJoinKHR(void *args) { struct vkDeferredOperationJoinKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->operation)); - return wine_device_from_handle(params->device)->funcs.p_vkDeferredOperationJoinKHR(wine_device_from_handle(params->device)->device, params->operation); + + result = wine_device_from_handle(params->device)->funcs.p_vkDeferredOperationJoinKHR(wine_device_from_handle(params->device)->device, params->operation); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -10845,7 +11811,9 @@ static NTSTATUS thunk64_vkDestroyAccelerationStructureKHR(void *args) { struct vkDestroyAccelerationStructureKHR_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->accelerationStructure), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->accelerationStructure, NULL); + return STATUS_SUCCESS; } @@ -10855,7 +11823,9 @@ static NTSTATUS thunk32_vkDestroyAccelerationStructureKHR(void *args) { struct vkDestroyAccelerationStructureKHR_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->accelerationStructure), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->accelerationStructure, NULL); + return STATUS_SUCCESS; } @@ -10867,7 +11837,9 @@ static NTSTATUS thunk64_vkDestroyAccelerationStructureNV(void *args) { struct vkDestroyAccelerationStructureNV_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->accelerationStructure), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyAccelerationStructureNV(wine_device_from_handle(params->device)->device, params->accelerationStructure, NULL); + return STATUS_SUCCESS; } @@ -10877,7 +11849,9 @@ static NTSTATUS thunk32_vkDestroyAccelerationStructureNV(void *args) { struct vkDestroyAccelerationStructureNV_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->accelerationStructure), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyAccelerationStructureNV(wine_device_from_handle(params->device)->device, params->accelerationStructure, NULL); + return STATUS_SUCCESS; } @@ -10889,7 +11863,9 @@ static NTSTATUS thunk64_vkDestroyBuffer(void *args) { struct vkDestroyBuffer_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->buffer), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyBuffer(wine_device_from_handle(params->device)->device, params->buffer, NULL); + return STATUS_SUCCESS; } @@ -10899,7 +11875,9 @@ static NTSTATUS thunk32_vkDestroyBuffer(void *args) { struct vkDestroyBuffer_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->buffer), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyBuffer(wine_device_from_handle(params->device)->device, params->buffer, NULL); + return STATUS_SUCCESS; } @@ -10911,7 +11889,9 @@ static NTSTATUS thunk64_vkDestroyBufferView(void *args) { struct vkDestroyBufferView_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->bufferView), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyBufferView(wine_device_from_handle(params->device)->device, params->bufferView, NULL); + return STATUS_SUCCESS; } @@ -10921,7 +11901,9 @@ static NTSTATUS thunk32_vkDestroyBufferView(void *args) { struct vkDestroyBufferView_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->bufferView), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyBufferView(wine_device_from_handle(params->device)->device, params->bufferView, NULL); + return STATUS_SUCCESS; } @@ -10933,7 +11915,9 @@ static NTSTATUS thunk64_vkDestroyCuFunctionNVX(void *args) { struct vkDestroyCuFunctionNVX_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->function), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyCuFunctionNVX(wine_device_from_handle(params->device)->device, params->function, NULL); + return STATUS_SUCCESS; } @@ -10943,7 +11927,9 @@ static NTSTATUS thunk32_vkDestroyCuFunctionNVX(void *args) { struct vkDestroyCuFunctionNVX_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->function), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyCuFunctionNVX(wine_device_from_handle(params->device)->device, params->function, NULL); + return STATUS_SUCCESS; } @@ -10955,7 +11941,9 @@ static NTSTATUS thunk64_vkDestroyCuModuleNVX(void *args) { struct vkDestroyCuModuleNVX_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->module), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyCuModuleNVX(wine_device_from_handle(params->device)->device, params->module, NULL); + return STATUS_SUCCESS; } @@ -10965,7 +11953,9 @@ static NTSTATUS thunk32_vkDestroyCuModuleNVX(void *args) { struct vkDestroyCuModuleNVX_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->module), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyCuModuleNVX(wine_device_from_handle(params->device)->device, params->module, NULL); + return STATUS_SUCCESS; } @@ -10977,7 +11967,9 @@ static NTSTATUS thunk64_vkDestroyDeferredOperationKHR(void *args) { struct vkDestroyDeferredOperationKHR_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->operation), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyDeferredOperationKHR(wine_device_from_handle(params->device)->device, params->operation, NULL); + return STATUS_SUCCESS; } @@ -10987,7 +11979,9 @@ static NTSTATUS thunk32_vkDestroyDeferredOperationKHR(void *args) { struct vkDestroyDeferredOperationKHR_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->operation), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyDeferredOperationKHR(wine_device_from_handle(params->device)->device, params->operation, NULL); + return STATUS_SUCCESS; } @@ -10999,7 +11993,9 @@ static NTSTATUS thunk64_vkDestroyDescriptorPool(void *args) { struct vkDestroyDescriptorPool_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorPool), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyDescriptorPool(wine_device_from_handle(params->device)->device, params->descriptorPool, NULL); + return STATUS_SUCCESS; } @@ -11009,7 +12005,9 @@ static NTSTATUS thunk32_vkDestroyDescriptorPool(void *args) { struct vkDestroyDescriptorPool_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorPool), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyDescriptorPool(wine_device_from_handle(params->device)->device, params->descriptorPool, NULL); + return STATUS_SUCCESS; } @@ -11021,7 +12019,9 @@ static NTSTATUS thunk64_vkDestroyDescriptorSetLayout(void *args) { struct vkDestroyDescriptorSetLayout_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSetLayout), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyDescriptorSetLayout(wine_device_from_handle(params->device)->device, params->descriptorSetLayout, NULL); + return STATUS_SUCCESS; } @@ -11031,7 +12031,9 @@ static NTSTATUS thunk32_vkDestroyDescriptorSetLayout(void *args) { struct vkDestroyDescriptorSetLayout_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSetLayout), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyDescriptorSetLayout(wine_device_from_handle(params->device)->device, params->descriptorSetLayout, NULL); + return STATUS_SUCCESS; } @@ -11043,7 +12045,9 @@ static NTSTATUS thunk64_vkDestroyDescriptorUpdateTemplate(void *args) { struct vkDestroyDescriptorUpdateTemplate_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyDescriptorUpdateTemplate(wine_device_from_handle(params->device)->device, params->descriptorUpdateTemplate, NULL); + return STATUS_SUCCESS; } @@ -11053,7 +12057,9 @@ static NTSTATUS thunk32_vkDestroyDescriptorUpdateTemplate(void *args) { struct vkDestroyDescriptorUpdateTemplate_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyDescriptorUpdateTemplate(wine_device_from_handle(params->device)->device, params->descriptorUpdateTemplate, NULL); + return STATUS_SUCCESS; } @@ -11065,7 +12071,9 @@ static NTSTATUS thunk64_vkDestroyDescriptorUpdateTemplateKHR(void *args) { struct vkDestroyDescriptorUpdateTemplateKHR_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyDescriptorUpdateTemplateKHR(wine_device_from_handle(params->device)->device, params->descriptorUpdateTemplate, NULL); + return STATUS_SUCCESS; } @@ -11075,7 +12083,9 @@ static NTSTATUS thunk32_vkDestroyDescriptorUpdateTemplateKHR(void *args) { struct vkDestroyDescriptorUpdateTemplateKHR_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyDescriptorUpdateTemplateKHR(wine_device_from_handle(params->device)->device, params->descriptorUpdateTemplate, NULL); + return STATUS_SUCCESS; } @@ -11087,7 +12097,9 @@ static NTSTATUS thunk64_vkDestroyEvent(void *args) { struct vkDestroyEvent_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->event), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyEvent(wine_device_from_handle(params->device)->device, params->event, NULL); + return STATUS_SUCCESS; } @@ -11097,7 +12109,9 @@ static NTSTATUS thunk32_vkDestroyEvent(void *args) { struct vkDestroyEvent_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->event), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyEvent(wine_device_from_handle(params->device)->device, params->event, NULL); + return STATUS_SUCCESS; } @@ -11109,7 +12123,9 @@ static NTSTATUS thunk64_vkDestroyFence(void *args) { struct vkDestroyFence_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->fence), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyFence(wine_device_from_handle(params->device)->device, params->fence, NULL); + return STATUS_SUCCESS; } @@ -11119,7 +12135,9 @@ static NTSTATUS thunk32_vkDestroyFence(void *args) { struct vkDestroyFence_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->fence), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyFence(wine_device_from_handle(params->device)->device, params->fence, NULL); + return STATUS_SUCCESS; } @@ -11131,7 +12149,9 @@ static NTSTATUS thunk64_vkDestroyFramebuffer(void *args) { struct vkDestroyFramebuffer_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->framebuffer), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyFramebuffer(wine_device_from_handle(params->device)->device, params->framebuffer, NULL); + return STATUS_SUCCESS; } @@ -11141,7 +12161,9 @@ static NTSTATUS thunk32_vkDestroyFramebuffer(void *args) { struct vkDestroyFramebuffer_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->framebuffer), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyFramebuffer(wine_device_from_handle(params->device)->device, params->framebuffer, NULL); + return STATUS_SUCCESS; } @@ -11153,7 +12175,9 @@ static NTSTATUS thunk64_vkDestroyImage(void *args) { struct vkDestroyImage_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyImage(wine_device_from_handle(params->device)->device, params->image, NULL); + return STATUS_SUCCESS; } @@ -11163,7 +12187,9 @@ static NTSTATUS thunk32_vkDestroyImage(void *args) { struct vkDestroyImage_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyImage(wine_device_from_handle(params->device)->device, params->image, NULL); + return STATUS_SUCCESS; } @@ -11175,7 +12201,9 @@ static NTSTATUS thunk64_vkDestroyImageView(void *args) { struct vkDestroyImageView_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->imageView), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyImageView(wine_device_from_handle(params->device)->device, params->imageView, NULL); + return STATUS_SUCCESS; } @@ -11185,7 +12213,9 @@ static NTSTATUS thunk32_vkDestroyImageView(void *args) { struct vkDestroyImageView_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->imageView), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyImageView(wine_device_from_handle(params->device)->device, params->imageView, NULL); + return STATUS_SUCCESS; } @@ -11197,7 +12227,9 @@ static NTSTATUS thunk64_vkDestroyIndirectCommandsLayoutNV(void *args) { struct vkDestroyIndirectCommandsLayoutNV_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->indirectCommandsLayout), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyIndirectCommandsLayoutNV(wine_device_from_handle(params->device)->device, params->indirectCommandsLayout, NULL); + return STATUS_SUCCESS; } @@ -11207,7 +12239,9 @@ static NTSTATUS thunk32_vkDestroyIndirectCommandsLayoutNV(void *args) { struct vkDestroyIndirectCommandsLayoutNV_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->indirectCommandsLayout), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyIndirectCommandsLayoutNV(wine_device_from_handle(params->device)->device, params->indirectCommandsLayout, NULL); + return STATUS_SUCCESS; } @@ -11219,7 +12253,9 @@ static NTSTATUS thunk64_vkDestroyPipeline(void *args) { struct vkDestroyPipeline_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyPipeline(wine_device_from_handle(params->device)->device, params->pipeline, NULL); + return STATUS_SUCCESS; } @@ -11229,7 +12265,9 @@ static NTSTATUS thunk32_vkDestroyPipeline(void *args) { struct vkDestroyPipeline_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyPipeline(wine_device_from_handle(params->device)->device, params->pipeline, NULL); + return STATUS_SUCCESS; } @@ -11241,7 +12279,9 @@ static NTSTATUS thunk64_vkDestroyPipelineCache(void *args) { struct vkDestroyPipelineCache_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyPipelineCache(wine_device_from_handle(params->device)->device, params->pipelineCache, NULL); + return STATUS_SUCCESS; } @@ -11251,7 +12291,9 @@ static NTSTATUS thunk32_vkDestroyPipelineCache(void *args) { struct vkDestroyPipelineCache_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyPipelineCache(wine_device_from_handle(params->device)->device, params->pipelineCache, NULL); + return STATUS_SUCCESS; } @@ -11263,7 +12305,9 @@ static NTSTATUS thunk64_vkDestroyPipelineLayout(void *args) { struct vkDestroyPipelineLayout_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipelineLayout), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyPipelineLayout(wine_device_from_handle(params->device)->device, params->pipelineLayout, NULL); + return STATUS_SUCCESS; } @@ -11273,7 +12317,9 @@ static NTSTATUS thunk32_vkDestroyPipelineLayout(void *args) { struct vkDestroyPipelineLayout_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipelineLayout), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyPipelineLayout(wine_device_from_handle(params->device)->device, params->pipelineLayout, NULL); + return STATUS_SUCCESS; } @@ -11285,7 +12331,9 @@ static NTSTATUS thunk64_vkDestroyPrivateDataSlot(void *args) { struct vkDestroyPrivateDataSlot_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->privateDataSlot), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyPrivateDataSlot(wine_device_from_handle(params->device)->device, params->privateDataSlot, NULL); + return STATUS_SUCCESS; } @@ -11295,7 +12343,9 @@ static NTSTATUS thunk32_vkDestroyPrivateDataSlot(void *args) { struct vkDestroyPrivateDataSlot_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->privateDataSlot), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyPrivateDataSlot(wine_device_from_handle(params->device)->device, params->privateDataSlot, NULL); + return STATUS_SUCCESS; } @@ -11307,7 +12357,9 @@ static NTSTATUS thunk64_vkDestroyPrivateDataSlotEXT(void *args) { struct vkDestroyPrivateDataSlotEXT_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->privateDataSlot), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyPrivateDataSlotEXT(wine_device_from_handle(params->device)->device, params->privateDataSlot, NULL); + return STATUS_SUCCESS; } @@ -11317,7 +12369,9 @@ static NTSTATUS thunk32_vkDestroyPrivateDataSlotEXT(void *args) { struct vkDestroyPrivateDataSlotEXT_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->privateDataSlot), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyPrivateDataSlotEXT(wine_device_from_handle(params->device)->device, params->privateDataSlot, NULL); + return STATUS_SUCCESS; } @@ -11329,7 +12383,9 @@ static NTSTATUS thunk64_vkDestroyQueryPool(void *args) { struct vkDestroyQueryPool_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->queryPool), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyQueryPool(wine_device_from_handle(params->device)->device, params->queryPool, NULL); + return STATUS_SUCCESS; } @@ -11339,7 +12395,9 @@ static NTSTATUS thunk32_vkDestroyQueryPool(void *args) { struct vkDestroyQueryPool_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->queryPool), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyQueryPool(wine_device_from_handle(params->device)->device, params->queryPool, NULL); + return STATUS_SUCCESS; } @@ -11351,7 +12409,9 @@ static NTSTATUS thunk64_vkDestroyRenderPass(void *args) { struct vkDestroyRenderPass_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->renderPass), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyRenderPass(wine_device_from_handle(params->device)->device, params->renderPass, NULL); + return STATUS_SUCCESS; } @@ -11361,7 +12421,9 @@ static NTSTATUS thunk32_vkDestroyRenderPass(void *args) { struct vkDestroyRenderPass_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->renderPass), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyRenderPass(wine_device_from_handle(params->device)->device, params->renderPass, NULL); + return STATUS_SUCCESS; } @@ -11373,7 +12435,9 @@ static NTSTATUS thunk64_vkDestroySampler(void *args) { struct vkDestroySampler_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->sampler), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroySampler(wine_device_from_handle(params->device)->device, params->sampler, NULL); + return STATUS_SUCCESS; } @@ -11383,7 +12447,9 @@ static NTSTATUS thunk32_vkDestroySampler(void *args) { struct vkDestroySampler_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->sampler), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroySampler(wine_device_from_handle(params->device)->device, params->sampler, NULL); + return STATUS_SUCCESS; } @@ -11395,7 +12461,9 @@ static NTSTATUS thunk64_vkDestroySamplerYcbcrConversion(void *args) { struct vkDestroySamplerYcbcrConversion_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->ycbcrConversion), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroySamplerYcbcrConversion(wine_device_from_handle(params->device)->device, params->ycbcrConversion, NULL); + return STATUS_SUCCESS; } @@ -11405,7 +12473,9 @@ static NTSTATUS thunk32_vkDestroySamplerYcbcrConversion(void *args) { struct vkDestroySamplerYcbcrConversion_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->ycbcrConversion), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroySamplerYcbcrConversion(wine_device_from_handle(params->device)->device, params->ycbcrConversion, NULL); + return STATUS_SUCCESS; } @@ -11417,7 +12487,9 @@ static NTSTATUS thunk64_vkDestroySamplerYcbcrConversionKHR(void *args) { struct vkDestroySamplerYcbcrConversionKHR_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->ycbcrConversion), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroySamplerYcbcrConversionKHR(wine_device_from_handle(params->device)->device, params->ycbcrConversion, NULL); + return STATUS_SUCCESS; } @@ -11427,7 +12499,9 @@ static NTSTATUS thunk32_vkDestroySamplerYcbcrConversionKHR(void *args) { struct vkDestroySamplerYcbcrConversionKHR_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->ycbcrConversion), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroySamplerYcbcrConversionKHR(wine_device_from_handle(params->device)->device, params->ycbcrConversion, NULL); + return STATUS_SUCCESS; } @@ -11439,7 +12513,9 @@ static NTSTATUS thunk64_vkDestroySemaphore(void *args) { struct vkDestroySemaphore_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->semaphore), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroySemaphore(wine_device_from_handle(params->device)->device, params->semaphore, NULL); + return STATUS_SUCCESS; } @@ -11449,7 +12525,9 @@ static NTSTATUS thunk32_vkDestroySemaphore(void *args) { struct vkDestroySemaphore_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->semaphore), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroySemaphore(wine_device_from_handle(params->device)->device, params->semaphore, NULL); + return STATUS_SUCCESS; } @@ -11461,7 +12539,9 @@ static NTSTATUS thunk64_vkDestroyShaderModule(void *args) { struct vkDestroyShaderModule_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->shaderModule), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyShaderModule(wine_device_from_handle(params->device)->device, params->shaderModule, NULL); + return STATUS_SUCCESS; } @@ -11471,7 +12551,9 @@ static NTSTATUS thunk32_vkDestroyShaderModule(void *args) { struct vkDestroyShaderModule_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->shaderModule), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyShaderModule(wine_device_from_handle(params->device)->device, params->shaderModule, NULL); + return STATUS_SUCCESS; } @@ -11483,7 +12565,9 @@ static NTSTATUS thunk64_vkDestroySwapchainKHR(void *args) { struct vkDestroySwapchainKHR_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->swapchain), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroySwapchainKHR(wine_device_from_handle(params->device)->device, params->swapchain, NULL); + return STATUS_SUCCESS; } @@ -11493,7 +12577,9 @@ static NTSTATUS thunk32_vkDestroySwapchainKHR(void *args) { struct vkDestroySwapchainKHR_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->swapchain), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroySwapchainKHR(wine_device_from_handle(params->device)->device, params->swapchain, NULL); + return STATUS_SUCCESS; } @@ -11505,7 +12591,9 @@ static NTSTATUS thunk64_vkDestroyValidationCacheEXT(void *args) { struct vkDestroyValidationCacheEXT_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->validationCache), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyValidationCacheEXT(wine_device_from_handle(params->device)->device, params->validationCache, NULL); + return STATUS_SUCCESS; } @@ -11515,7 +12603,9 @@ static NTSTATUS thunk32_vkDestroyValidationCacheEXT(void *args) { struct vkDestroyValidationCacheEXT_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->validationCache), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkDestroyValidationCacheEXT(wine_device_from_handle(params->device)->device, params->validationCache, NULL); + return STATUS_SUCCESS; } @@ -11526,8 +12616,12 @@ static NTSTATUS thunk32_vkDestroyValidationCacheEXT(void *args) static NTSTATUS thunk64_vkDeviceWaitIdle(void *args) { struct vkDeviceWaitIdle_params *params = args; + VkResult result; TRACE("%p\n", params->device); - return wine_device_from_handle(params->device)->funcs.p_vkDeviceWaitIdle(wine_device_from_handle(params->device)->device); + + result = wine_device_from_handle(params->device)->funcs.p_vkDeviceWaitIdle(wine_device_from_handle(params->device)->device); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -11535,8 +12629,12 @@ static NTSTATUS thunk64_vkDeviceWaitIdle(void *args) static NTSTATUS thunk32_vkDeviceWaitIdle(void *args) { struct vkDeviceWaitIdle_params *params = args; + VkResult result; TRACE("%p\n", params->device); - return wine_device_from_handle(params->device)->funcs.p_vkDeviceWaitIdle(wine_device_from_handle(params->device)->device); + + result = wine_device_from_handle(params->device)->funcs.p_vkDeviceWaitIdle(wine_device_from_handle(params->device)->device); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -11546,8 +12644,12 @@ static NTSTATUS thunk32_vkDeviceWaitIdle(void *args) static NTSTATUS thunk64_vkEndCommandBuffer(void *args) { struct vkEndCommandBuffer_params *params = args; + VkResult result; TRACE("%p\n", params->commandBuffer); - return wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkEndCommandBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + + result = wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkEndCommandBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -11555,8 +12657,12 @@ static NTSTATUS thunk64_vkEndCommandBuffer(void *args) static NTSTATUS thunk32_vkEndCommandBuffer(void *args) { struct vkEndCommandBuffer_params *params = args; + VkResult result; TRACE("%p\n", params->commandBuffer); - return wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkEndCommandBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + + result = wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkEndCommandBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -11566,8 +12672,12 @@ static NTSTATUS thunk32_vkEndCommandBuffer(void *args) static NTSTATUS thunk64_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(void *args) { struct vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR_params *params = args; + VkResult result; TRACE("%p, %u, %p, %p, %p\n", params->physicalDevice, params->queueFamilyIndex, params->pCounterCount, params->pCounters, params->pCounterDescriptions); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex, params->pCounterCount, params->pCounters, params->pCounterDescriptions); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex, params->pCounterCount, params->pCounters, params->pCounterDescriptions); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -11575,8 +12685,12 @@ static NTSTATUS thunk64_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCoun static NTSTATUS thunk32_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(void *args) { struct vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR_params *params = args; + VkResult result; TRACE("%p, %u, %p, %p, %p\n", params->physicalDevice, params->queueFamilyIndex, params->pCounterCount, params->pCounters, params->pCounterDescriptions); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex, params->pCounterCount, params->pCounters, params->pCounterDescriptions); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex, params->pCounterCount, params->pCounters, params->pCounterDescriptions); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -11586,8 +12700,12 @@ static NTSTATUS thunk32_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCoun static NTSTATUS thunk64_vkFlushMappedMemoryRanges(void *args) { struct vkFlushMappedMemoryRanges_params *params = args; + VkResult result; TRACE("%p, %u, %p\n", params->device, params->memoryRangeCount, params->pMemoryRanges); - return wine_device_from_handle(params->device)->funcs.p_vkFlushMappedMemoryRanges(wine_device_from_handle(params->device)->device, params->memoryRangeCount, params->pMemoryRanges); + + result = wine_device_from_handle(params->device)->funcs.p_vkFlushMappedMemoryRanges(wine_device_from_handle(params->device)->device, params->memoryRangeCount, params->pMemoryRanges); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -11613,8 +12731,12 @@ static NTSTATUS thunk32_vkFlushMappedMemoryRanges(void *args) static NTSTATUS thunk64_vkFreeDescriptorSets(void *args) { struct vkFreeDescriptorSets_params *params = args; + VkResult result; TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->descriptorPool), params->descriptorSetCount, params->pDescriptorSets); - return wine_device_from_handle(params->device)->funcs.p_vkFreeDescriptorSets(wine_device_from_handle(params->device)->device, params->descriptorPool, params->descriptorSetCount, params->pDescriptorSets); + + result = wine_device_from_handle(params->device)->funcs.p_vkFreeDescriptorSets(wine_device_from_handle(params->device)->device, params->descriptorPool, params->descriptorSetCount, params->pDescriptorSets); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -11622,8 +12744,12 @@ static NTSTATUS thunk64_vkFreeDescriptorSets(void *args) static NTSTATUS thunk32_vkFreeDescriptorSets(void *args) { struct vkFreeDescriptorSets_params *params = args; + VkResult result; TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->descriptorPool), params->descriptorSetCount, params->pDescriptorSets); - return wine_device_from_handle(params->device)->funcs.p_vkFreeDescriptorSets(wine_device_from_handle(params->device)->device, params->descriptorPool, params->descriptorSetCount, params->pDescriptorSets); + + result = wine_device_from_handle(params->device)->funcs.p_vkFreeDescriptorSets(wine_device_from_handle(params->device)->device, params->descriptorPool, params->descriptorSetCount, params->pDescriptorSets); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -11634,7 +12760,9 @@ static NTSTATUS thunk64_vkFreeMemory(void *args) { struct vkFreeMemory_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->memory), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkFreeMemory(wine_device_from_handle(params->device)->device, params->memory, NULL); + return STATUS_SUCCESS; } @@ -11644,7 +12772,9 @@ static NTSTATUS thunk32_vkFreeMemory(void *args) { struct vkFreeMemory_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->memory), params->pAllocator); + wine_device_from_handle(params->device)->funcs.p_vkFreeMemory(wine_device_from_handle(params->device)->device, params->memory, NULL); + return STATUS_SUCCESS; } @@ -11656,7 +12786,9 @@ static NTSTATUS thunk64_vkGetAccelerationStructureBuildSizesKHR(void *args) { struct vkGetAccelerationStructureBuildSizesKHR_params *params = args; TRACE("%p, %#x, %p, %p, %p\n", params->device, params->buildType, params->pBuildInfo, params->pMaxPrimitiveCounts, params->pSizeInfo); + wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureBuildSizesKHR(wine_device_from_handle(params->device)->device, params->buildType, params->pBuildInfo, params->pMaxPrimitiveCounts, params->pSizeInfo); + return STATUS_SUCCESS; } @@ -11684,7 +12816,9 @@ static NTSTATUS thunk64_vkGetAccelerationStructureDeviceAddressKHR(void *args) { struct vkGetAccelerationStructureDeviceAddressKHR_params *params = args; TRACE("%p, %p\n", params->device, params->pInfo); + params->result = wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureDeviceAddressKHR(wine_device_from_handle(params->device)->device, params->pInfo); + return STATUS_SUCCESS; } @@ -11709,8 +12843,12 @@ static NTSTATUS thunk32_vkGetAccelerationStructureDeviceAddressKHR(void *args) static NTSTATUS thunk64_vkGetAccelerationStructureHandleNV(void *args) { struct vkGetAccelerationStructureHandleNV_params *params = args; + VkResult result; TRACE("%p, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->accelerationStructure), wine_dbgstr_longlong(params->dataSize), params->pData); - return wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureHandleNV(wine_device_from_handle(params->device)->device, params->accelerationStructure, params->dataSize, params->pData); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureHandleNV(wine_device_from_handle(params->device)->device, params->accelerationStructure, params->dataSize, params->pData); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -11718,8 +12856,12 @@ static NTSTATUS thunk64_vkGetAccelerationStructureHandleNV(void *args) static NTSTATUS thunk32_vkGetAccelerationStructureHandleNV(void *args) { struct vkGetAccelerationStructureHandleNV_params *params = args; + VkResult result; TRACE("%p, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->accelerationStructure), wine_dbgstr_longlong(params->dataSize), params->pData); - return wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureHandleNV(wine_device_from_handle(params->device)->device, params->accelerationStructure, params->dataSize, params->pData); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureHandleNV(wine_device_from_handle(params->device)->device, params->accelerationStructure, params->dataSize, params->pData); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -11730,7 +12872,9 @@ static NTSTATUS thunk64_vkGetAccelerationStructureMemoryRequirementsNV(void *arg { struct vkGetAccelerationStructureMemoryRequirementsNV_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureMemoryRequirementsNV(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); + return STATUS_SUCCESS; } @@ -11759,7 +12903,9 @@ static NTSTATUS thunk64_vkGetBufferDeviceAddress(void *args) { struct vkGetBufferDeviceAddress_params *params = args; TRACE("%p, %p\n", params->device, params->pInfo); + params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferDeviceAddress(wine_device_from_handle(params->device)->device, params->pInfo); + return STATUS_SUCCESS; } @@ -11785,7 +12931,9 @@ static NTSTATUS thunk64_vkGetBufferDeviceAddressEXT(void *args) { struct vkGetBufferDeviceAddressEXT_params *params = args; TRACE("%p, %p\n", params->device, params->pInfo); + params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferDeviceAddressEXT(wine_device_from_handle(params->device)->device, params->pInfo); + return STATUS_SUCCESS; } @@ -11811,7 +12959,9 @@ static NTSTATUS thunk64_vkGetBufferDeviceAddressKHR(void *args) { struct vkGetBufferDeviceAddressKHR_params *params = args; TRACE("%p, %p\n", params->device, params->pInfo); + params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferDeviceAddressKHR(wine_device_from_handle(params->device)->device, params->pInfo); + return STATUS_SUCCESS; } @@ -11837,7 +12987,9 @@ static NTSTATUS thunk64_vkGetBufferMemoryRequirements(void *args) { struct vkGetBufferMemoryRequirements_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->buffer), params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetBufferMemoryRequirements(wine_device_from_handle(params->device)->device, params->buffer, params->pMemoryRequirements); + return STATUS_SUCCESS; } @@ -11863,7 +13015,9 @@ static NTSTATUS thunk64_vkGetBufferMemoryRequirements2(void *args) { struct vkGetBufferMemoryRequirements2_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetBufferMemoryRequirements2(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); + return STATUS_SUCCESS; } @@ -11892,7 +13046,9 @@ static NTSTATUS thunk64_vkGetBufferMemoryRequirements2KHR(void *args) { struct vkGetBufferMemoryRequirements2KHR_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetBufferMemoryRequirements2KHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); + return STATUS_SUCCESS; } @@ -11921,7 +13077,9 @@ static NTSTATUS thunk64_vkGetBufferOpaqueCaptureAddress(void *args) { struct vkGetBufferOpaqueCaptureAddress_params *params = args; TRACE("%p, %p\n", params->device, params->pInfo); + params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferOpaqueCaptureAddress(wine_device_from_handle(params->device)->device, params->pInfo); + return STATUS_SUCCESS; } @@ -11947,7 +13105,9 @@ static NTSTATUS thunk64_vkGetBufferOpaqueCaptureAddressKHR(void *args) { struct vkGetBufferOpaqueCaptureAddressKHR_params *params = args; TRACE("%p, %p\n", params->device, params->pInfo); + params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferOpaqueCaptureAddressKHR(wine_device_from_handle(params->device)->device, params->pInfo); + return STATUS_SUCCESS; } @@ -11972,8 +13132,12 @@ static NTSTATUS thunk32_vkGetBufferOpaqueCaptureAddressKHR(void *args) static NTSTATUS thunk64_vkGetDeferredOperationMaxConcurrencyKHR(void *args) { struct vkGetDeferredOperationMaxConcurrencyKHR_params *params = args; + uint32_t result; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->operation)); - return wine_device_from_handle(params->device)->funcs.p_vkGetDeferredOperationMaxConcurrencyKHR(wine_device_from_handle(params->device)->device, params->operation); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetDeferredOperationMaxConcurrencyKHR(wine_device_from_handle(params->device)->device, params->operation); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -11981,8 +13145,12 @@ static NTSTATUS thunk64_vkGetDeferredOperationMaxConcurrencyKHR(void *args) static NTSTATUS thunk32_vkGetDeferredOperationMaxConcurrencyKHR(void *args) { struct vkGetDeferredOperationMaxConcurrencyKHR_params *params = args; + uint32_t result; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->operation)); - return wine_device_from_handle(params->device)->funcs.p_vkGetDeferredOperationMaxConcurrencyKHR(wine_device_from_handle(params->device)->device, params->operation); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetDeferredOperationMaxConcurrencyKHR(wine_device_from_handle(params->device)->device, params->operation); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -11992,8 +13160,12 @@ static NTSTATUS thunk32_vkGetDeferredOperationMaxConcurrencyKHR(void *args) static NTSTATUS thunk64_vkGetDeferredOperationResultKHR(void *args) { struct vkGetDeferredOperationResultKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->operation)); - return wine_device_from_handle(params->device)->funcs.p_vkGetDeferredOperationResultKHR(wine_device_from_handle(params->device)->device, params->operation); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetDeferredOperationResultKHR(wine_device_from_handle(params->device)->device, params->operation); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -12001,8 +13173,12 @@ static NTSTATUS thunk64_vkGetDeferredOperationResultKHR(void *args) static NTSTATUS thunk32_vkGetDeferredOperationResultKHR(void *args) { struct vkGetDeferredOperationResultKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->operation)); - return wine_device_from_handle(params->device)->funcs.p_vkGetDeferredOperationResultKHR(wine_device_from_handle(params->device)->device, params->operation); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetDeferredOperationResultKHR(wine_device_from_handle(params->device)->device, params->operation); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -12013,7 +13189,9 @@ static NTSTATUS thunk64_vkGetDescriptorSetHostMappingVALVE(void *args) { struct vkGetDescriptorSetHostMappingVALVE_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSet), params->ppData); + wine_device_from_handle(params->device)->funcs.p_vkGetDescriptorSetHostMappingVALVE(wine_device_from_handle(params->device)->device, params->descriptorSet, params->ppData); + return STATUS_SUCCESS; } @@ -12023,7 +13201,9 @@ static NTSTATUS thunk32_vkGetDescriptorSetHostMappingVALVE(void *args) { struct vkGetDescriptorSetHostMappingVALVE_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSet), params->ppData); + wine_device_from_handle(params->device)->funcs.p_vkGetDescriptorSetHostMappingVALVE(wine_device_from_handle(params->device)->device, params->descriptorSet, params->ppData); + return STATUS_SUCCESS; } @@ -12035,7 +13215,9 @@ static NTSTATUS thunk64_vkGetDescriptorSetLayoutHostMappingInfoVALVE(void *args) { struct vkGetDescriptorSetLayoutHostMappingInfoVALVE_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pBindingReference, params->pHostMapping); + wine_device_from_handle(params->device)->funcs.p_vkGetDescriptorSetLayoutHostMappingInfoVALVE(wine_device_from_handle(params->device)->device, params->pBindingReference, params->pHostMapping); + return STATUS_SUCCESS; } @@ -12061,7 +13243,9 @@ static NTSTATUS thunk64_vkGetDescriptorSetLayoutSupport(void *args) { struct vkGetDescriptorSetLayoutSupport_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pCreateInfo, params->pSupport); + wine_device_from_handle(params->device)->funcs.p_vkGetDescriptorSetLayoutSupport(wine_device_from_handle(params->device)->device, params->pCreateInfo, params->pSupport); + return STATUS_SUCCESS; } @@ -12071,7 +13255,9 @@ static NTSTATUS thunk32_vkGetDescriptorSetLayoutSupport(void *args) { struct vkGetDescriptorSetLayoutSupport_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pCreateInfo, params->pSupport); + wine_device_from_handle(params->device)->funcs.p_vkGetDescriptorSetLayoutSupport(wine_device_from_handle(params->device)->device, params->pCreateInfo, params->pSupport); + return STATUS_SUCCESS; } @@ -12083,7 +13269,9 @@ static NTSTATUS thunk64_vkGetDescriptorSetLayoutSupportKHR(void *args) { struct vkGetDescriptorSetLayoutSupportKHR_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pCreateInfo, params->pSupport); + wine_device_from_handle(params->device)->funcs.p_vkGetDescriptorSetLayoutSupportKHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, params->pSupport); + return STATUS_SUCCESS; } @@ -12093,7 +13281,9 @@ static NTSTATUS thunk32_vkGetDescriptorSetLayoutSupportKHR(void *args) { struct vkGetDescriptorSetLayoutSupportKHR_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pCreateInfo, params->pSupport); + wine_device_from_handle(params->device)->funcs.p_vkGetDescriptorSetLayoutSupportKHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, params->pSupport); + return STATUS_SUCCESS; } @@ -12105,7 +13295,9 @@ static NTSTATUS thunk64_vkGetDeviceAccelerationStructureCompatibilityKHR(void *a { struct vkGetDeviceAccelerationStructureCompatibilityKHR_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pVersionInfo, params->pCompatibility); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceAccelerationStructureCompatibilityKHR(wine_device_from_handle(params->device)->device, params->pVersionInfo, params->pCompatibility); + return STATUS_SUCCESS; } @@ -12115,7 +13307,9 @@ static NTSTATUS thunk32_vkGetDeviceAccelerationStructureCompatibilityKHR(void *a { struct vkGetDeviceAccelerationStructureCompatibilityKHR_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pVersionInfo, params->pCompatibility); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceAccelerationStructureCompatibilityKHR(wine_device_from_handle(params->device)->device, params->pVersionInfo, params->pCompatibility); + return STATUS_SUCCESS; } @@ -12127,7 +13321,9 @@ static NTSTATUS thunk64_vkGetDeviceBufferMemoryRequirements(void *args) { struct vkGetDeviceBufferMemoryRequirements_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceBufferMemoryRequirements(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); + return STATUS_SUCCESS; } @@ -12157,7 +13353,9 @@ static NTSTATUS thunk64_vkGetDeviceBufferMemoryRequirementsKHR(void *args) { struct vkGetDeviceBufferMemoryRequirementsKHR_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceBufferMemoryRequirementsKHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); + return STATUS_SUCCESS; } @@ -12187,7 +13385,9 @@ static NTSTATUS thunk64_vkGetDeviceGroupPeerMemoryFeatures(void *args) { struct vkGetDeviceGroupPeerMemoryFeatures_params *params = args; TRACE("%p, %u, %u, %u, %p\n", params->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupPeerMemoryFeatures(wine_device_from_handle(params->device)->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures); + return STATUS_SUCCESS; } @@ -12197,7 +13397,9 @@ static NTSTATUS thunk32_vkGetDeviceGroupPeerMemoryFeatures(void *args) { struct vkGetDeviceGroupPeerMemoryFeatures_params *params = args; TRACE("%p, %u, %u, %u, %p\n", params->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupPeerMemoryFeatures(wine_device_from_handle(params->device)->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures); + return STATUS_SUCCESS; } @@ -12209,7 +13411,9 @@ static NTSTATUS thunk64_vkGetDeviceGroupPeerMemoryFeaturesKHR(void *args) { struct vkGetDeviceGroupPeerMemoryFeaturesKHR_params *params = args; TRACE("%p, %u, %u, %u, %p\n", params->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupPeerMemoryFeaturesKHR(wine_device_from_handle(params->device)->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures); + return STATUS_SUCCESS; } @@ -12219,7 +13423,9 @@ static NTSTATUS thunk32_vkGetDeviceGroupPeerMemoryFeaturesKHR(void *args) { struct vkGetDeviceGroupPeerMemoryFeaturesKHR_params *params = args; TRACE("%p, %u, %u, %u, %p\n", params->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupPeerMemoryFeaturesKHR(wine_device_from_handle(params->device)->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures); + return STATUS_SUCCESS; } @@ -12230,8 +13436,12 @@ static NTSTATUS thunk32_vkGetDeviceGroupPeerMemoryFeaturesKHR(void *args) static NTSTATUS thunk64_vkGetDeviceGroupPresentCapabilitiesKHR(void *args) { struct vkGetDeviceGroupPresentCapabilitiesKHR_params *params = args; + VkResult result; TRACE("%p, %p\n", params->device, params->pDeviceGroupPresentCapabilities); - return wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupPresentCapabilitiesKHR(wine_device_from_handle(params->device)->device, params->pDeviceGroupPresentCapabilities); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupPresentCapabilitiesKHR(wine_device_from_handle(params->device)->device, params->pDeviceGroupPresentCapabilities); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -12239,8 +13449,12 @@ static NTSTATUS thunk64_vkGetDeviceGroupPresentCapabilitiesKHR(void *args) static NTSTATUS thunk32_vkGetDeviceGroupPresentCapabilitiesKHR(void *args) { struct vkGetDeviceGroupPresentCapabilitiesKHR_params *params = args; + VkResult result; TRACE("%p, %p\n", params->device, params->pDeviceGroupPresentCapabilities); - return wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupPresentCapabilitiesKHR(wine_device_from_handle(params->device)->device, params->pDeviceGroupPresentCapabilities); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupPresentCapabilitiesKHR(wine_device_from_handle(params->device)->device, params->pDeviceGroupPresentCapabilities); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -12250,8 +13464,12 @@ static NTSTATUS thunk32_vkGetDeviceGroupPresentCapabilitiesKHR(void *args) static NTSTATUS thunk64_vkGetDeviceGroupSurfacePresentModesKHR(void *args) { struct vkGetDeviceGroupSurfacePresentModesKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->surface), params->pModes); - return wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupSurfacePresentModesKHR(wine_device_from_handle(params->device)->device, wine_surface_from_handle(params->surface)->driver_surface, params->pModes); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupSurfacePresentModesKHR(wine_device_from_handle(params->device)->device, wine_surface_from_handle(params->surface)->driver_surface, params->pModes); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -12259,8 +13477,12 @@ static NTSTATUS thunk64_vkGetDeviceGroupSurfacePresentModesKHR(void *args) static NTSTATUS thunk32_vkGetDeviceGroupSurfacePresentModesKHR(void *args) { struct vkGetDeviceGroupSurfacePresentModesKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->surface), params->pModes); - return wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupSurfacePresentModesKHR(wine_device_from_handle(params->device)->device, wine_surface_from_handle(params->surface)->driver_surface, params->pModes); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupSurfacePresentModesKHR(wine_device_from_handle(params->device)->device, wine_surface_from_handle(params->surface)->driver_surface, params->pModes); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -12271,7 +13493,9 @@ static NTSTATUS thunk64_vkGetDeviceImageMemoryRequirements(void *args) { struct vkGetDeviceImageMemoryRequirements_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceImageMemoryRequirements(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); + return STATUS_SUCCESS; } @@ -12298,7 +13522,9 @@ static NTSTATUS thunk64_vkGetDeviceImageMemoryRequirementsKHR(void *args) { struct vkGetDeviceImageMemoryRequirementsKHR_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceImageMemoryRequirementsKHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); + return STATUS_SUCCESS; } @@ -12325,7 +13551,9 @@ static NTSTATUS thunk64_vkGetDeviceImageSparseMemoryRequirements(void *args) { struct vkGetDeviceImageSparseMemoryRequirements_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceImageSparseMemoryRequirements(wine_device_from_handle(params->device)->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); + return STATUS_SUCCESS; } @@ -12335,7 +13563,9 @@ static NTSTATUS thunk32_vkGetDeviceImageSparseMemoryRequirements(void *args) { struct vkGetDeviceImageSparseMemoryRequirements_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceImageSparseMemoryRequirements(wine_device_from_handle(params->device)->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); + return STATUS_SUCCESS; } @@ -12347,7 +13577,9 @@ static NTSTATUS thunk64_vkGetDeviceImageSparseMemoryRequirementsKHR(void *args) { struct vkGetDeviceImageSparseMemoryRequirementsKHR_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceImageSparseMemoryRequirementsKHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); + return STATUS_SUCCESS; } @@ -12357,7 +13589,9 @@ static NTSTATUS thunk32_vkGetDeviceImageSparseMemoryRequirementsKHR(void *args) { struct vkGetDeviceImageSparseMemoryRequirementsKHR_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceImageSparseMemoryRequirementsKHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); + return STATUS_SUCCESS; } @@ -12369,7 +13603,9 @@ static NTSTATUS thunk64_vkGetDeviceMemoryCommitment(void *args) { struct vkGetDeviceMemoryCommitment_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->memory), params->pCommittedMemoryInBytes); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceMemoryCommitment(wine_device_from_handle(params->device)->device, params->memory, params->pCommittedMemoryInBytes); + return STATUS_SUCCESS; } @@ -12379,7 +13615,9 @@ static NTSTATUS thunk32_vkGetDeviceMemoryCommitment(void *args) { struct vkGetDeviceMemoryCommitment_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->memory), params->pCommittedMemoryInBytes); + wine_device_from_handle(params->device)->funcs.p_vkGetDeviceMemoryCommitment(wine_device_from_handle(params->device)->device, params->memory, params->pCommittedMemoryInBytes); + return STATUS_SUCCESS; } @@ -12391,7 +13629,9 @@ static NTSTATUS thunk64_vkGetDeviceMemoryOpaqueCaptureAddress(void *args) { struct vkGetDeviceMemoryOpaqueCaptureAddress_params *params = args; TRACE("%p, %p\n", params->device, params->pInfo); + params->result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceMemoryOpaqueCaptureAddress(wine_device_from_handle(params->device)->device, params->pInfo); + return STATUS_SUCCESS; } @@ -12417,7 +13657,9 @@ static NTSTATUS thunk64_vkGetDeviceMemoryOpaqueCaptureAddressKHR(void *args) { struct vkGetDeviceMemoryOpaqueCaptureAddressKHR_params *params = args; TRACE("%p, %p\n", params->device, params->pInfo); + params->result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceMemoryOpaqueCaptureAddressKHR(wine_device_from_handle(params->device)->device, params->pInfo); + return STATUS_SUCCESS; } @@ -12442,8 +13684,12 @@ static NTSTATUS thunk32_vkGetDeviceMemoryOpaqueCaptureAddressKHR(void *args) static NTSTATUS thunk64_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(void *args) { struct vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->renderpass), params->pMaxWorkgroupSize); - return wine_device_from_handle(params->device)->funcs.p_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(wine_device_from_handle(params->device)->device, params->renderpass, params->pMaxWorkgroupSize); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(wine_device_from_handle(params->device)->device, params->renderpass, params->pMaxWorkgroupSize); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -12451,8 +13697,12 @@ static NTSTATUS thunk64_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(void *ar static NTSTATUS thunk32_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(void *args) { struct vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->renderpass), params->pMaxWorkgroupSize); - return wine_device_from_handle(params->device)->funcs.p_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(wine_device_from_handle(params->device)->device, params->renderpass, params->pMaxWorkgroupSize); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(wine_device_from_handle(params->device)->device, params->renderpass, params->pMaxWorkgroupSize); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -12462,8 +13712,12 @@ static NTSTATUS thunk32_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(void *ar static NTSTATUS thunk64_vkGetDynamicRenderingTilePropertiesQCOM(void *args) { struct vkGetDynamicRenderingTilePropertiesQCOM_params *params = args; + VkResult result; TRACE("%p, %p, %p\n", params->device, params->pRenderingInfo, params->pProperties); - return wine_device_from_handle(params->device)->funcs.p_vkGetDynamicRenderingTilePropertiesQCOM(wine_device_from_handle(params->device)->device, params->pRenderingInfo, params->pProperties); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetDynamicRenderingTilePropertiesQCOM(wine_device_from_handle(params->device)->device, params->pRenderingInfo, params->pProperties); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -12489,8 +13743,12 @@ static NTSTATUS thunk32_vkGetDynamicRenderingTilePropertiesQCOM(void *args) static NTSTATUS thunk64_vkGetEventStatus(void *args) { struct vkGetEventStatus_params *params = args; + VkResult result; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->event)); - return wine_device_from_handle(params->device)->funcs.p_vkGetEventStatus(wine_device_from_handle(params->device)->device, params->event); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetEventStatus(wine_device_from_handle(params->device)->device, params->event); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -12498,8 +13756,12 @@ static NTSTATUS thunk64_vkGetEventStatus(void *args) static NTSTATUS thunk32_vkGetEventStatus(void *args) { struct vkGetEventStatus_params *params = args; + VkResult result; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->event)); - return wine_device_from_handle(params->device)->funcs.p_vkGetEventStatus(wine_device_from_handle(params->device)->device, params->event); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetEventStatus(wine_device_from_handle(params->device)->device, params->event); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -12509,8 +13771,12 @@ static NTSTATUS thunk32_vkGetEventStatus(void *args) static NTSTATUS thunk64_vkGetFenceStatus(void *args) { struct vkGetFenceStatus_params *params = args; + VkResult result; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->fence)); - return wine_device_from_handle(params->device)->funcs.p_vkGetFenceStatus(wine_device_from_handle(params->device)->device, params->fence); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetFenceStatus(wine_device_from_handle(params->device)->device, params->fence); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -12518,8 +13784,12 @@ static NTSTATUS thunk64_vkGetFenceStatus(void *args) static NTSTATUS thunk32_vkGetFenceStatus(void *args) { struct vkGetFenceStatus_params *params = args; + VkResult result; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->fence)); - return wine_device_from_handle(params->device)->funcs.p_vkGetFenceStatus(wine_device_from_handle(params->device)->device, params->fence); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetFenceStatus(wine_device_from_handle(params->device)->device, params->fence); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -12529,8 +13799,12 @@ static NTSTATUS thunk32_vkGetFenceStatus(void *args) static NTSTATUS thunk64_vkGetFramebufferTilePropertiesQCOM(void *args) { struct vkGetFramebufferTilePropertiesQCOM_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->framebuffer), params->pPropertiesCount, params->pProperties); - return wine_device_from_handle(params->device)->funcs.p_vkGetFramebufferTilePropertiesQCOM(wine_device_from_handle(params->device)->device, params->framebuffer, params->pPropertiesCount, params->pProperties); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetFramebufferTilePropertiesQCOM(wine_device_from_handle(params->device)->device, params->framebuffer, params->pPropertiesCount, params->pProperties); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -12538,8 +13812,12 @@ static NTSTATUS thunk64_vkGetFramebufferTilePropertiesQCOM(void *args) static NTSTATUS thunk32_vkGetFramebufferTilePropertiesQCOM(void *args) { struct vkGetFramebufferTilePropertiesQCOM_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->framebuffer), params->pPropertiesCount, params->pProperties); - return wine_device_from_handle(params->device)->funcs.p_vkGetFramebufferTilePropertiesQCOM(wine_device_from_handle(params->device)->device, params->framebuffer, params->pPropertiesCount, params->pProperties); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetFramebufferTilePropertiesQCOM(wine_device_from_handle(params->device)->device, params->framebuffer, params->pPropertiesCount, params->pProperties); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -12550,7 +13828,9 @@ static NTSTATUS thunk64_vkGetGeneratedCommandsMemoryRequirementsNV(void *args) { struct vkGetGeneratedCommandsMemoryRequirementsNV_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetGeneratedCommandsMemoryRequirementsNV(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); + return STATUS_SUCCESS; } @@ -12579,7 +13859,9 @@ static NTSTATUS thunk64_vkGetImageMemoryRequirements(void *args) { struct vkGetImageMemoryRequirements_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetImageMemoryRequirements(wine_device_from_handle(params->device)->device, params->image, params->pMemoryRequirements); + return STATUS_SUCCESS; } @@ -12605,7 +13887,9 @@ static NTSTATUS thunk64_vkGetImageMemoryRequirements2(void *args) { struct vkGetImageMemoryRequirements2_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetImageMemoryRequirements2(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); + return STATUS_SUCCESS; } @@ -12634,7 +13918,9 @@ static NTSTATUS thunk64_vkGetImageMemoryRequirements2KHR(void *args) { struct vkGetImageMemoryRequirements2KHR_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetImageMemoryRequirements2KHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); + return STATUS_SUCCESS; } @@ -12663,7 +13949,9 @@ static NTSTATUS thunk64_vkGetImageSparseMemoryRequirements(void *args) { struct vkGetImageSparseMemoryRequirements_params *params = args; TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetImageSparseMemoryRequirements(wine_device_from_handle(params->device)->device, params->image, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); + return STATUS_SUCCESS; } @@ -12673,7 +13961,9 @@ static NTSTATUS thunk32_vkGetImageSparseMemoryRequirements(void *args) { struct vkGetImageSparseMemoryRequirements_params *params = args; TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetImageSparseMemoryRequirements(wine_device_from_handle(params->device)->device, params->image, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); + return STATUS_SUCCESS; } @@ -12685,7 +13975,9 @@ static NTSTATUS thunk64_vkGetImageSparseMemoryRequirements2(void *args) { struct vkGetImageSparseMemoryRequirements2_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetImageSparseMemoryRequirements2(wine_device_from_handle(params->device)->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); + return STATUS_SUCCESS; } @@ -12711,7 +14003,9 @@ static NTSTATUS thunk64_vkGetImageSparseMemoryRequirements2KHR(void *args) { struct vkGetImageSparseMemoryRequirements2KHR_params *params = args; TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); + wine_device_from_handle(params->device)->funcs.p_vkGetImageSparseMemoryRequirements2KHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); + return STATUS_SUCCESS; } @@ -12737,7 +14031,9 @@ static NTSTATUS thunk64_vkGetImageSubresourceLayout(void *args) { struct vkGetImageSubresourceLayout_params *params = args; TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pSubresource, params->pLayout); + wine_device_from_handle(params->device)->funcs.p_vkGetImageSubresourceLayout(wine_device_from_handle(params->device)->device, params->image, params->pSubresource, params->pLayout); + return STATUS_SUCCESS; } @@ -12763,7 +14059,9 @@ static NTSTATUS thunk64_vkGetImageSubresourceLayout2EXT(void *args) { struct vkGetImageSubresourceLayout2EXT_params *params = args; TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pSubresource, params->pLayout); + wine_device_from_handle(params->device)->funcs.p_vkGetImageSubresourceLayout2EXT(wine_device_from_handle(params->device)->device, params->image, params->pSubresource, params->pLayout); + return STATUS_SUCCESS; } @@ -12789,8 +14087,12 @@ static NTSTATUS thunk32_vkGetImageSubresourceLayout2EXT(void *args) static NTSTATUS thunk64_vkGetImageViewAddressNVX(void *args) { struct vkGetImageViewAddressNVX_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->imageView), params->pProperties); - return wine_device_from_handle(params->device)->funcs.p_vkGetImageViewAddressNVX(wine_device_from_handle(params->device)->device, params->imageView, params->pProperties); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetImageViewAddressNVX(wine_device_from_handle(params->device)->device, params->imageView, params->pProperties); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -12816,8 +14118,12 @@ static NTSTATUS thunk32_vkGetImageViewAddressNVX(void *args) static NTSTATUS thunk64_vkGetImageViewHandleNVX(void *args) { struct vkGetImageViewHandleNVX_params *params = args; + uint32_t result; TRACE("%p, %p\n", params->device, params->pInfo); - return wine_device_from_handle(params->device)->funcs.p_vkGetImageViewHandleNVX(wine_device_from_handle(params->device)->device, params->pInfo); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetImageViewHandleNVX(wine_device_from_handle(params->device)->device, params->pInfo); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -12842,8 +14148,12 @@ static NTSTATUS thunk32_vkGetImageViewHandleNVX(void *args) static NTSTATUS thunk64_vkGetMemoryHostPointerPropertiesEXT(void *args) { struct vkGetMemoryHostPointerPropertiesEXT_params *params = args; + VkResult result; TRACE("%p, %#x, %p, %p\n", params->device, params->handleType, params->pHostPointer, params->pMemoryHostPointerProperties); - return wine_device_from_handle(params->device)->funcs.p_vkGetMemoryHostPointerPropertiesEXT(wine_device_from_handle(params->device)->device, params->handleType, params->pHostPointer, params->pMemoryHostPointerProperties); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetMemoryHostPointerPropertiesEXT(wine_device_from_handle(params->device)->device, params->handleType, params->pHostPointer, params->pMemoryHostPointerProperties); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -12851,8 +14161,12 @@ static NTSTATUS thunk64_vkGetMemoryHostPointerPropertiesEXT(void *args) static NTSTATUS thunk32_vkGetMemoryHostPointerPropertiesEXT(void *args) { struct vkGetMemoryHostPointerPropertiesEXT_params *params = args; + VkResult result; TRACE("%p, %#x, %p, %p\n", params->device, params->handleType, params->pHostPointer, params->pMemoryHostPointerProperties); - return wine_device_from_handle(params->device)->funcs.p_vkGetMemoryHostPointerPropertiesEXT(wine_device_from_handle(params->device)->device, params->handleType, params->pHostPointer, params->pMemoryHostPointerProperties); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetMemoryHostPointerPropertiesEXT(wine_device_from_handle(params->device)->device, params->handleType, params->pHostPointer, params->pMemoryHostPointerProperties); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -12862,8 +14176,12 @@ static NTSTATUS thunk32_vkGetMemoryHostPointerPropertiesEXT(void *args) static NTSTATUS thunk64_vkGetPerformanceParameterINTEL(void *args) { struct vkGetPerformanceParameterINTEL_params *params = args; + VkResult result; TRACE("%p, %#x, %p\n", params->device, params->parameter, params->pValue); - return wine_device_from_handle(params->device)->funcs.p_vkGetPerformanceParameterINTEL(wine_device_from_handle(params->device)->device, params->parameter, params->pValue); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetPerformanceParameterINTEL(wine_device_from_handle(params->device)->device, params->parameter, params->pValue); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -12871,8 +14189,12 @@ static NTSTATUS thunk64_vkGetPerformanceParameterINTEL(void *args) static NTSTATUS thunk32_vkGetPerformanceParameterINTEL(void *args) { struct vkGetPerformanceParameterINTEL_params *params = args; + VkResult result; TRACE("%p, %#x, %p\n", params->device, params->parameter, params->pValue); - return wine_device_from_handle(params->device)->funcs.p_vkGetPerformanceParameterINTEL(wine_device_from_handle(params->device)->device, params->parameter, params->pValue); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetPerformanceParameterINTEL(wine_device_from_handle(params->device)->device, params->parameter, params->pValue); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -12882,8 +14204,12 @@ static NTSTATUS thunk32_vkGetPerformanceParameterINTEL(void *args) static NTSTATUS thunk64_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(void *args) { struct vkGetPhysicalDeviceCooperativeMatrixPropertiesNV_params *params = args; + VkResult result; TRACE("%p, %p, %p\n", params->physicalDevice, params->pPropertyCount, params->pProperties); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pPropertyCount, params->pProperties); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pPropertyCount, params->pProperties); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -12891,8 +14217,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(void *a static NTSTATUS thunk32_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(void *args) { struct vkGetPhysicalDeviceCooperativeMatrixPropertiesNV_params *params = args; + VkResult result; TRACE("%p, %p, %p\n", params->physicalDevice, params->pPropertyCount, params->pProperties); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pPropertyCount, params->pProperties); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pPropertyCount, params->pProperties); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -12903,7 +14233,9 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceFeatures(void *args) { struct vkGetPhysicalDeviceFeatures_params *params = args; TRACE("%p, %p\n", params->physicalDevice, params->pFeatures); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFeatures(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFeatures); + return STATUS_SUCCESS; } @@ -12913,7 +14245,9 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceFeatures(void *args) { struct vkGetPhysicalDeviceFeatures_params *params = args; TRACE("%p, %p\n", params->physicalDevice, params->pFeatures); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFeatures(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFeatures); + return STATUS_SUCCESS; } @@ -12925,7 +14259,9 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceFeatures2(void *args) { struct vkGetPhysicalDeviceFeatures2_params *params = args; TRACE("%p, %p\n", params->physicalDevice, params->pFeatures); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFeatures2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFeatures); + return STATUS_SUCCESS; } @@ -12935,7 +14271,9 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceFeatures2(void *args) { struct vkGetPhysicalDeviceFeatures2_params *params = args; TRACE("%p, %p\n", params->physicalDevice, params->pFeatures); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFeatures2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFeatures); + return STATUS_SUCCESS; } @@ -12947,7 +14285,9 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceFeatures2KHR(void *args) { struct vkGetPhysicalDeviceFeatures2KHR_params *params = args; TRACE("%p, %p\n", params->physicalDevice, params->pFeatures); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFeatures2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFeatures); + return STATUS_SUCCESS; } @@ -12957,7 +14297,9 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceFeatures2KHR(void *args) { struct vkGetPhysicalDeviceFeatures2KHR_params *params = args; TRACE("%p, %p\n", params->physicalDevice, params->pFeatures); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFeatures2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFeatures); + return STATUS_SUCCESS; } @@ -12969,7 +14311,9 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceFormatProperties(void *args) { struct vkGetPhysicalDeviceFormatProperties_params *params = args; TRACE("%p, %#x, %p\n", params->physicalDevice, params->format, params->pFormatProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFormatProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->pFormatProperties); + return STATUS_SUCCESS; } @@ -12979,7 +14323,9 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceFormatProperties(void *args) { struct vkGetPhysicalDeviceFormatProperties_params *params = args; TRACE("%p, %#x, %p\n", params->physicalDevice, params->format, params->pFormatProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFormatProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->pFormatProperties); + return STATUS_SUCCESS; } @@ -12991,7 +14337,9 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceFormatProperties2(void *args) { struct vkGetPhysicalDeviceFormatProperties2_params *params = args; TRACE("%p, %#x, %p\n", params->physicalDevice, params->format, params->pFormatProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFormatProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->pFormatProperties); + return STATUS_SUCCESS; } @@ -13001,7 +14349,9 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceFormatProperties2(void *args) { struct vkGetPhysicalDeviceFormatProperties2_params *params = args; TRACE("%p, %#x, %p\n", params->physicalDevice, params->format, params->pFormatProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFormatProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->pFormatProperties); + return STATUS_SUCCESS; } @@ -13013,7 +14363,9 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceFormatProperties2KHR(void *args) { struct vkGetPhysicalDeviceFormatProperties2KHR_params *params = args; TRACE("%p, %#x, %p\n", params->physicalDevice, params->format, params->pFormatProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFormatProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->pFormatProperties); + return STATUS_SUCCESS; } @@ -13023,7 +14375,9 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceFormatProperties2KHR(void *args) { struct vkGetPhysicalDeviceFormatProperties2KHR_params *params = args; TRACE("%p, %#x, %p\n", params->physicalDevice, params->format, params->pFormatProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFormatProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->pFormatProperties); + return STATUS_SUCCESS; } @@ -13034,8 +14388,12 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceFormatProperties2KHR(void *args) static NTSTATUS thunk64_vkGetPhysicalDeviceFragmentShadingRatesKHR(void *args) { struct vkGetPhysicalDeviceFragmentShadingRatesKHR_params *params = args; + VkResult result; TRACE("%p, %p, %p\n", params->physicalDevice, params->pFragmentShadingRateCount, params->pFragmentShadingRates); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFragmentShadingRatesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFragmentShadingRateCount, params->pFragmentShadingRates); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFragmentShadingRatesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFragmentShadingRateCount, params->pFragmentShadingRates); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -13043,8 +14401,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceFragmentShadingRatesKHR(void *args) static NTSTATUS thunk32_vkGetPhysicalDeviceFragmentShadingRatesKHR(void *args) { struct vkGetPhysicalDeviceFragmentShadingRatesKHR_params *params = args; + VkResult result; TRACE("%p, %p, %p\n", params->physicalDevice, params->pFragmentShadingRateCount, params->pFragmentShadingRates); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFragmentShadingRatesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFragmentShadingRateCount, params->pFragmentShadingRates); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFragmentShadingRatesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFragmentShadingRateCount, params->pFragmentShadingRates); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -13054,8 +14416,12 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceFragmentShadingRatesKHR(void *args) static NTSTATUS thunk64_vkGetPhysicalDeviceImageFormatProperties(void *args) { struct vkGetPhysicalDeviceImageFormatProperties_params *params = args; + VkResult result; TRACE("%p, %#x, %#x, %#x, %#x, %#x, %p\n", params->physicalDevice, params->format, params->type, params->tiling, params->usage, params->flags, params->pImageFormatProperties); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceImageFormatProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->type, params->tiling, params->usage, params->flags, params->pImageFormatProperties); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceImageFormatProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->type, params->tiling, params->usage, params->flags, params->pImageFormatProperties); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -13079,7 +14445,10 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceImageFormatProperties(void *args) VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) { - return wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceImageFormatProperties2(wine_phys_dev_from_handle(physicalDevice)->phys_dev, pImageFormatInfo, pImageFormatProperties); + VkResult result; + result = wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceImageFormatProperties2(wine_phys_dev_from_handle(physicalDevice)->phys_dev, pImageFormatInfo, pImageFormatProperties); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -13101,7 +14470,10 @@ VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physic VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) { - return wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceImageFormatProperties2KHR(wine_phys_dev_from_handle(physicalDevice)->phys_dev, pImageFormatInfo, pImageFormatProperties); + VkResult result; + result = wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceImageFormatProperties2KHR(wine_phys_dev_from_handle(physicalDevice)->phys_dev, pImageFormatInfo, pImageFormatProperties); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -13125,7 +14497,9 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceMemoryProperties(void *args) { struct vkGetPhysicalDeviceMemoryProperties_params *params = args; TRACE("%p, %p\n", params->physicalDevice, params->pMemoryProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceMemoryProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pMemoryProperties); + return STATUS_SUCCESS; } @@ -13151,7 +14525,9 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceMemoryProperties2(void *args) { struct vkGetPhysicalDeviceMemoryProperties2_params *params = args; TRACE("%p, %p\n", params->physicalDevice, params->pMemoryProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceMemoryProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pMemoryProperties); + return STATUS_SUCCESS; } @@ -13178,7 +14554,9 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceMemoryProperties2KHR(void *args) { struct vkGetPhysicalDeviceMemoryProperties2KHR_params *params = args; TRACE("%p, %p\n", params->physicalDevice, params->pMemoryProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceMemoryProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pMemoryProperties); + return STATUS_SUCCESS; } @@ -13205,7 +14583,9 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceMultisamplePropertiesEXT(void *args) { struct vkGetPhysicalDeviceMultisamplePropertiesEXT_params *params = args; TRACE("%p, %#x, %p\n", params->physicalDevice, params->samples, params->pMultisampleProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceMultisamplePropertiesEXT(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->samples, params->pMultisampleProperties); + return STATUS_SUCCESS; } @@ -13215,7 +14595,9 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceMultisamplePropertiesEXT(void *args) { struct vkGetPhysicalDeviceMultisamplePropertiesEXT_params *params = args; TRACE("%p, %#x, %p\n", params->physicalDevice, params->samples, params->pMultisampleProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceMultisamplePropertiesEXT(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->samples, params->pMultisampleProperties); + return STATUS_SUCCESS; } @@ -13226,8 +14608,12 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceMultisamplePropertiesEXT(void *args) static NTSTATUS thunk64_vkGetPhysicalDevicePresentRectanglesKHR(void *args) { struct vkGetPhysicalDevicePresentRectanglesKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pRectCount, params->pRects); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDevicePresentRectanglesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pRectCount, params->pRects); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDevicePresentRectanglesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pRectCount, params->pRects); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -13235,8 +14621,12 @@ static NTSTATUS thunk64_vkGetPhysicalDevicePresentRectanglesKHR(void *args) static NTSTATUS thunk32_vkGetPhysicalDevicePresentRectanglesKHR(void *args) { struct vkGetPhysicalDevicePresentRectanglesKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pRectCount, params->pRects); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDevicePresentRectanglesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pRectCount, params->pRects); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDevicePresentRectanglesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pRectCount, params->pRects); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -13247,7 +14637,9 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceProperties(void *args) { struct vkGetPhysicalDeviceProperties_params *params = args; TRACE("%p, %p\n", params->physicalDevice, params->pProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pProperties); + return STATUS_SUCCESS; } @@ -13273,7 +14665,9 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceProperties2(void *args) { struct vkGetPhysicalDeviceProperties2_params *params = args; TRACE("%p, %p\n", params->physicalDevice, params->pProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pProperties); + return STATUS_SUCCESS; } @@ -13300,7 +14694,9 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceProperties2KHR(void *args) { struct vkGetPhysicalDeviceProperties2KHR_params *params = args; TRACE("%p, %p\n", params->physicalDevice, params->pProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pProperties); + return STATUS_SUCCESS; } @@ -13327,7 +14723,9 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR( { struct vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR_params *params = args; TRACE("%p, %p, %p\n", params->physicalDevice, params->pPerformanceQueryCreateInfo, params->pNumPasses); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pPerformanceQueryCreateInfo, params->pNumPasses); + return STATUS_SUCCESS; } @@ -13337,7 +14735,9 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR( { struct vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR_params *params = args; TRACE("%p, %p, %p\n", params->physicalDevice, params->pPerformanceQueryCreateInfo, params->pNumPasses); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pPerformanceQueryCreateInfo, params->pNumPasses); + return STATUS_SUCCESS; } @@ -13349,7 +14749,9 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceQueueFamilyProperties(void *args) { struct vkGetPhysicalDeviceQueueFamilyProperties_params *params = args; TRACE("%p, %p, %p\n", params->physicalDevice, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); + return STATUS_SUCCESS; } @@ -13359,7 +14761,9 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceQueueFamilyProperties(void *args) { struct vkGetPhysicalDeviceQueueFamilyProperties_params *params = args; TRACE("%p, %p, %p\n", params->physicalDevice, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); + return STATUS_SUCCESS; } @@ -13371,7 +14775,9 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceQueueFamilyProperties2(void *args) { struct vkGetPhysicalDeviceQueueFamilyProperties2_params *params = args; TRACE("%p, %p, %p\n", params->physicalDevice, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); + return STATUS_SUCCESS; } @@ -13381,7 +14787,9 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceQueueFamilyProperties2(void *args) { struct vkGetPhysicalDeviceQueueFamilyProperties2_params *params = args; TRACE("%p, %p, %p\n", params->physicalDevice, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); + return STATUS_SUCCESS; } @@ -13393,7 +14801,9 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceQueueFamilyProperties2KHR(void *args) { struct vkGetPhysicalDeviceQueueFamilyProperties2KHR_params *params = args; TRACE("%p, %p, %p\n", params->physicalDevice, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); + return STATUS_SUCCESS; } @@ -13403,7 +14813,9 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceQueueFamilyProperties2KHR(void *args) { struct vkGetPhysicalDeviceQueueFamilyProperties2KHR_params *params = args; TRACE("%p, %p, %p\n", params->physicalDevice, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); + return STATUS_SUCCESS; } @@ -13415,7 +14827,9 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSparseImageFormatProperties(void *arg { struct vkGetPhysicalDeviceSparseImageFormatProperties_params *params = args; TRACE("%p, %#x, %#x, %#x, %#x, %#x, %p, %p\n", params->physicalDevice, params->format, params->type, params->samples, params->usage, params->tiling, params->pPropertyCount, params->pProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSparseImageFormatProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->type, params->samples, params->usage, params->tiling, params->pPropertyCount, params->pProperties); + return STATUS_SUCCESS; } @@ -13425,7 +14839,9 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSparseImageFormatProperties(void *arg { struct vkGetPhysicalDeviceSparseImageFormatProperties_params *params = args; TRACE("%p, %#x, %#x, %#x, %#x, %#x, %p, %p\n", params->physicalDevice, params->format, params->type, params->samples, params->usage, params->tiling, params->pPropertyCount, params->pProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSparseImageFormatProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->type, params->samples, params->usage, params->tiling, params->pPropertyCount, params->pProperties); + return STATUS_SUCCESS; } @@ -13437,7 +14853,9 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSparseImageFormatProperties2(void *ar { struct vkGetPhysicalDeviceSparseImageFormatProperties2_params *params = args; TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pFormatInfo, params->pPropertyCount, params->pProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSparseImageFormatProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFormatInfo, params->pPropertyCount, params->pProperties); + return STATUS_SUCCESS; } @@ -13447,7 +14865,9 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSparseImageFormatProperties2(void *ar { struct vkGetPhysicalDeviceSparseImageFormatProperties2_params *params = args; TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pFormatInfo, params->pPropertyCount, params->pProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSparseImageFormatProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFormatInfo, params->pPropertyCount, params->pProperties); + return STATUS_SUCCESS; } @@ -13459,7 +14879,9 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSparseImageFormatProperties2KHR(void { struct vkGetPhysicalDeviceSparseImageFormatProperties2KHR_params *params = args; TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pFormatInfo, params->pPropertyCount, params->pProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSparseImageFormatProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFormatInfo, params->pPropertyCount, params->pProperties); + return STATUS_SUCCESS; } @@ -13469,7 +14891,9 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSparseImageFormatProperties2KHR(void { struct vkGetPhysicalDeviceSparseImageFormatProperties2KHR_params *params = args; TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pFormatInfo, params->pPropertyCount, params->pProperties); + wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSparseImageFormatProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFormatInfo, params->pPropertyCount, params->pProperties); + return STATUS_SUCCESS; } @@ -13480,8 +14904,12 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSparseImageFormatProperties2KHR(void static NTSTATUS thunk64_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(void *args) { struct vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV_params *params = args; + VkResult result; TRACE("%p, %p, %p\n", params->physicalDevice, params->pCombinationCount, params->pCombinations); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pCombinationCount, params->pCombinations); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pCombinationCount, params->pCombinations); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -13489,8 +14917,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombi static NTSTATUS thunk32_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(void *args) { struct vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV_params *params = args; + VkResult result; TRACE("%p, %p, %p\n", params->physicalDevice, params->pCombinationCount, params->pCombinations); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pCombinationCount, params->pCombinations); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pCombinationCount, params->pCombinations); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -13525,14 +14957,20 @@ VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physi VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) { - return wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(wine_phys_dev_from_handle(physicalDevice)->phys_dev, wine_surface_from_handle(surface)->driver_surface, pSurfaceCapabilities); + VkResult result; + result = wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(wine_phys_dev_from_handle(physicalDevice)->phys_dev, wine_surface_from_handle(surface)->driver_surface, pSurfaceCapabilities); + + return result; } #else /* USE_STRUCT_CONVERSION */ VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) { - return wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(wine_phys_dev_from_handle(physicalDevice)->phys_dev, wine_surface_from_handle(surface)->driver_surface, pSurfaceCapabilities); + VkResult result; + result = wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(wine_phys_dev_from_handle(physicalDevice)->phys_dev, wine_surface_from_handle(surface)->driver_surface, pSurfaceCapabilities); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -13574,8 +15012,12 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceFormats2KHR(void *args) static NTSTATUS thunk64_vkGetPhysicalDeviceSurfaceFormatsKHR(void *args) { struct vkGetPhysicalDeviceSurfaceFormatsKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pSurfaceFormatCount, params->pSurfaceFormats); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceFormatsKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pSurfaceFormatCount, params->pSurfaceFormats); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceFormatsKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pSurfaceFormatCount, params->pSurfaceFormats); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -13583,8 +15025,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSurfaceFormatsKHR(void *args) static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceFormatsKHR(void *args) { struct vkGetPhysicalDeviceSurfaceFormatsKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pSurfaceFormatCount, params->pSurfaceFormats); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceFormatsKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pSurfaceFormatCount, params->pSurfaceFormats); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceFormatsKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pSurfaceFormatCount, params->pSurfaceFormats); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -13594,8 +15040,12 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceFormatsKHR(void *args) static NTSTATUS thunk64_vkGetPhysicalDeviceSurfacePresentModesKHR(void *args) { struct vkGetPhysicalDeviceSurfacePresentModesKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pPresentModeCount, params->pPresentModes); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfacePresentModesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pPresentModeCount, params->pPresentModes); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfacePresentModesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pPresentModeCount, params->pPresentModes); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -13603,8 +15053,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSurfacePresentModesKHR(void *args) static NTSTATUS thunk32_vkGetPhysicalDeviceSurfacePresentModesKHR(void *args) { struct vkGetPhysicalDeviceSurfacePresentModesKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pPresentModeCount, params->pPresentModes); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfacePresentModesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pPresentModeCount, params->pPresentModes); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfacePresentModesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pPresentModeCount, params->pPresentModes); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -13614,8 +15068,12 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSurfacePresentModesKHR(void *args) static NTSTATUS thunk64_vkGetPhysicalDeviceSurfaceSupportKHR(void *args) { struct vkGetPhysicalDeviceSurfaceSupportKHR_params *params = args; + VkResult result; TRACE("%p, %u, 0x%s, %p\n", params->physicalDevice, params->queueFamilyIndex, wine_dbgstr_longlong(params->surface), params->pSupported); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceSupportKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex, wine_surface_from_handle(params->surface)->driver_surface, params->pSupported); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceSupportKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex, wine_surface_from_handle(params->surface)->driver_surface, params->pSupported); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -13623,8 +15081,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSurfaceSupportKHR(void *args) static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceSupportKHR(void *args) { struct vkGetPhysicalDeviceSurfaceSupportKHR_params *params = args; + VkResult result; TRACE("%p, %u, 0x%s, %p\n", params->physicalDevice, params->queueFamilyIndex, wine_dbgstr_longlong(params->surface), params->pSupported); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceSupportKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex, wine_surface_from_handle(params->surface)->driver_surface, params->pSupported); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceSupportKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex, wine_surface_from_handle(params->surface)->driver_surface, params->pSupported); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -13634,8 +15096,12 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceSupportKHR(void *args) static NTSTATUS thunk64_vkGetPhysicalDeviceToolProperties(void *args) { struct vkGetPhysicalDeviceToolProperties_params *params = args; + VkResult result; TRACE("%p, %p, %p\n", params->physicalDevice, params->pToolCount, params->pToolProperties); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceToolProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pToolCount, params->pToolProperties); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceToolProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pToolCount, params->pToolProperties); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -13643,8 +15109,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceToolProperties(void *args) static NTSTATUS thunk32_vkGetPhysicalDeviceToolProperties(void *args) { struct vkGetPhysicalDeviceToolProperties_params *params = args; + VkResult result; TRACE("%p, %p, %p\n", params->physicalDevice, params->pToolCount, params->pToolProperties); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceToolProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pToolCount, params->pToolProperties); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceToolProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pToolCount, params->pToolProperties); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -13654,8 +15124,12 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceToolProperties(void *args) static NTSTATUS thunk64_vkGetPhysicalDeviceToolPropertiesEXT(void *args) { struct vkGetPhysicalDeviceToolPropertiesEXT_params *params = args; + VkResult result; TRACE("%p, %p, %p\n", params->physicalDevice, params->pToolCount, params->pToolProperties); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceToolPropertiesEXT(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pToolCount, params->pToolProperties); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceToolPropertiesEXT(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pToolCount, params->pToolProperties); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -13663,8 +15137,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceToolPropertiesEXT(void *args) static NTSTATUS thunk32_vkGetPhysicalDeviceToolPropertiesEXT(void *args) { struct vkGetPhysicalDeviceToolPropertiesEXT_params *params = args; + VkResult result; TRACE("%p, %p, %p\n", params->physicalDevice, params->pToolCount, params->pToolProperties); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceToolPropertiesEXT(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pToolCount, params->pToolProperties); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceToolPropertiesEXT(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pToolCount, params->pToolProperties); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -13674,8 +15152,12 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceToolPropertiesEXT(void *args) static NTSTATUS thunk64_vkGetPhysicalDeviceWin32PresentationSupportKHR(void *args) { struct vkGetPhysicalDeviceWin32PresentationSupportKHR_params *params = args; + VkBool32 result; TRACE("%p, %u\n", params->physicalDevice, params->queueFamilyIndex); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceWin32PresentationSupportKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceWin32PresentationSupportKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -13683,8 +15165,12 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceWin32PresentationSupportKHR(void *arg static NTSTATUS thunk32_vkGetPhysicalDeviceWin32PresentationSupportKHR(void *args) { struct vkGetPhysicalDeviceWin32PresentationSupportKHR_params *params = args; + VkBool32 result; TRACE("%p, %u\n", params->physicalDevice, params->queueFamilyIndex); - return wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceWin32PresentationSupportKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceWin32PresentationSupportKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -13694,8 +15180,12 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceWin32PresentationSupportKHR(void *arg static NTSTATUS thunk64_vkGetPipelineCacheData(void *args) { struct vkGetPipelineCacheData_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->pDataSize, params->pData); - return wine_device_from_handle(params->device)->funcs.p_vkGetPipelineCacheData(wine_device_from_handle(params->device)->device, params->pipelineCache, params->pDataSize, params->pData); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelineCacheData(wine_device_from_handle(params->device)->device, params->pipelineCache, params->pDataSize, params->pData); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -13703,8 +15193,12 @@ static NTSTATUS thunk64_vkGetPipelineCacheData(void *args) static NTSTATUS thunk32_vkGetPipelineCacheData(void *args) { struct vkGetPipelineCacheData_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->pDataSize, params->pData); - return wine_device_from_handle(params->device)->funcs.p_vkGetPipelineCacheData(wine_device_from_handle(params->device)->device, params->pipelineCache, params->pDataSize, params->pData); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelineCacheData(wine_device_from_handle(params->device)->device, params->pipelineCache, params->pDataSize, params->pData); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -13714,8 +15208,12 @@ static NTSTATUS thunk32_vkGetPipelineCacheData(void *args) static NTSTATUS thunk64_vkGetPipelineExecutableInternalRepresentationsKHR(void *args) { struct vkGetPipelineExecutableInternalRepresentationsKHR_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pExecutableInfo, params->pInternalRepresentationCount, params->pInternalRepresentations); - return wine_device_from_handle(params->device)->funcs.p_vkGetPipelineExecutableInternalRepresentationsKHR(wine_device_from_handle(params->device)->device, params->pExecutableInfo, params->pInternalRepresentationCount, params->pInternalRepresentations); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelineExecutableInternalRepresentationsKHR(wine_device_from_handle(params->device)->device, params->pExecutableInfo, params->pInternalRepresentationCount, params->pInternalRepresentations); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -13740,8 +15238,12 @@ static NTSTATUS thunk32_vkGetPipelineExecutableInternalRepresentationsKHR(void * static NTSTATUS thunk64_vkGetPipelineExecutablePropertiesKHR(void *args) { struct vkGetPipelineExecutablePropertiesKHR_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pPipelineInfo, params->pExecutableCount, params->pProperties); - return wine_device_from_handle(params->device)->funcs.p_vkGetPipelineExecutablePropertiesKHR(wine_device_from_handle(params->device)->device, params->pPipelineInfo, params->pExecutableCount, params->pProperties); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelineExecutablePropertiesKHR(wine_device_from_handle(params->device)->device, params->pPipelineInfo, params->pExecutableCount, params->pProperties); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -13766,8 +15268,12 @@ static NTSTATUS thunk32_vkGetPipelineExecutablePropertiesKHR(void *args) static NTSTATUS thunk64_vkGetPipelineExecutableStatisticsKHR(void *args) { struct vkGetPipelineExecutableStatisticsKHR_params *params = args; + VkResult result; TRACE("%p, %p, %p, %p\n", params->device, params->pExecutableInfo, params->pStatisticCount, params->pStatistics); - return wine_device_from_handle(params->device)->funcs.p_vkGetPipelineExecutableStatisticsKHR(wine_device_from_handle(params->device)->device, params->pExecutableInfo, params->pStatisticCount, params->pStatistics); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelineExecutableStatisticsKHR(wine_device_from_handle(params->device)->device, params->pExecutableInfo, params->pStatisticCount, params->pStatistics); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -13792,8 +15298,12 @@ static NTSTATUS thunk32_vkGetPipelineExecutableStatisticsKHR(void *args) static NTSTATUS thunk64_vkGetPipelinePropertiesEXT(void *args) { struct vkGetPipelinePropertiesEXT_params *params = args; + VkResult result; TRACE("%p, %p, %p\n", params->device, params->pPipelineInfo, params->pPipelineProperties); - return wine_device_from_handle(params->device)->funcs.p_vkGetPipelinePropertiesEXT(wine_device_from_handle(params->device)->device, params->pPipelineInfo, params->pPipelineProperties); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelinePropertiesEXT(wine_device_from_handle(params->device)->device, params->pPipelineInfo, params->pPipelineProperties); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -13819,7 +15329,9 @@ static NTSTATUS thunk64_vkGetPrivateData(void *args) { struct vkGetPrivateData_params *params = args; TRACE("%p, %#x, 0x%s, 0x%s, %p\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), params->pData); + wine_device_from_handle(params->device)->funcs.p_vkGetPrivateData(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->pData); + return STATUS_SUCCESS; } @@ -13829,7 +15341,9 @@ static NTSTATUS thunk32_vkGetPrivateData(void *args) { struct vkGetPrivateData_params *params = args; TRACE("%p, %#x, 0x%s, 0x%s, %p\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), params->pData); + wine_device_from_handle(params->device)->funcs.p_vkGetPrivateData(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->pData); + return STATUS_SUCCESS; } @@ -13841,7 +15355,9 @@ static NTSTATUS thunk64_vkGetPrivateDataEXT(void *args) { struct vkGetPrivateDataEXT_params *params = args; TRACE("%p, %#x, 0x%s, 0x%s, %p\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), params->pData); + wine_device_from_handle(params->device)->funcs.p_vkGetPrivateDataEXT(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->pData); + return STATUS_SUCCESS; } @@ -13851,7 +15367,9 @@ static NTSTATUS thunk32_vkGetPrivateDataEXT(void *args) { struct vkGetPrivateDataEXT_params *params = args; TRACE("%p, %#x, 0x%s, 0x%s, %p\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), params->pData); + wine_device_from_handle(params->device)->funcs.p_vkGetPrivateDataEXT(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->pData); + return STATUS_SUCCESS; } @@ -13862,8 +15380,12 @@ static NTSTATUS thunk32_vkGetPrivateDataEXT(void *args) static NTSTATUS thunk64_vkGetQueryPoolResults(void *args) { struct vkGetQueryPoolResults_params *params = args; + VkResult result; TRACE("%p, 0x%s, %u, %u, 0x%s, %p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount, wine_dbgstr_longlong(params->dataSize), params->pData, wine_dbgstr_longlong(params->stride), params->flags); - return wine_device_from_handle(params->device)->funcs.p_vkGetQueryPoolResults(wine_device_from_handle(params->device)->device, params->queryPool, params->firstQuery, params->queryCount, params->dataSize, params->pData, params->stride, params->flags); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetQueryPoolResults(wine_device_from_handle(params->device)->device, params->queryPool, params->firstQuery, params->queryCount, params->dataSize, params->pData, params->stride, params->flags); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -13871,8 +15393,12 @@ static NTSTATUS thunk64_vkGetQueryPoolResults(void *args) static NTSTATUS thunk32_vkGetQueryPoolResults(void *args) { struct vkGetQueryPoolResults_params *params = args; + VkResult result; TRACE("%p, 0x%s, %u, %u, 0x%s, %p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount, wine_dbgstr_longlong(params->dataSize), params->pData, wine_dbgstr_longlong(params->stride), params->flags); - return wine_device_from_handle(params->device)->funcs.p_vkGetQueryPoolResults(wine_device_from_handle(params->device)->device, params->queryPool, params->firstQuery, params->queryCount, params->dataSize, params->pData, params->stride, params->flags); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetQueryPoolResults(wine_device_from_handle(params->device)->device, params->queryPool, params->firstQuery, params->queryCount, params->dataSize, params->pData, params->stride, params->flags); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -13883,7 +15409,9 @@ static NTSTATUS thunk64_vkGetQueueCheckpointData2NV(void *args) { struct vkGetQueueCheckpointData2NV_params *params = args; TRACE("%p, %p, %p\n", params->queue, params->pCheckpointDataCount, params->pCheckpointData); + wine_queue_from_handle(params->queue)->device->funcs.p_vkGetQueueCheckpointData2NV(wine_queue_from_handle(params->queue)->queue, params->pCheckpointDataCount, params->pCheckpointData); + return STATUS_SUCCESS; } @@ -13893,7 +15421,9 @@ static NTSTATUS thunk32_vkGetQueueCheckpointData2NV(void *args) { struct vkGetQueueCheckpointData2NV_params *params = args; TRACE("%p, %p, %p\n", params->queue, params->pCheckpointDataCount, params->pCheckpointData); + wine_queue_from_handle(params->queue)->device->funcs.p_vkGetQueueCheckpointData2NV(wine_queue_from_handle(params->queue)->queue, params->pCheckpointDataCount, params->pCheckpointData); + return STATUS_SUCCESS; } @@ -13905,7 +15435,9 @@ static NTSTATUS thunk64_vkGetQueueCheckpointDataNV(void *args) { struct vkGetQueueCheckpointDataNV_params *params = args; TRACE("%p, %p, %p\n", params->queue, params->pCheckpointDataCount, params->pCheckpointData); + wine_queue_from_handle(params->queue)->device->funcs.p_vkGetQueueCheckpointDataNV(wine_queue_from_handle(params->queue)->queue, params->pCheckpointDataCount, params->pCheckpointData); + return STATUS_SUCCESS; } @@ -13915,7 +15447,9 @@ static NTSTATUS thunk32_vkGetQueueCheckpointDataNV(void *args) { struct vkGetQueueCheckpointDataNV_params *params = args; TRACE("%p, %p, %p\n", params->queue, params->pCheckpointDataCount, params->pCheckpointData); + wine_queue_from_handle(params->queue)->device->funcs.p_vkGetQueueCheckpointDataNV(wine_queue_from_handle(params->queue)->queue, params->pCheckpointDataCount, params->pCheckpointData); + return STATUS_SUCCESS; } @@ -13926,8 +15460,12 @@ static NTSTATUS thunk32_vkGetQueueCheckpointDataNV(void *args) static NTSTATUS thunk64_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(void *args) { struct vkGetRayTracingCaptureReplayShaderGroupHandlesKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, %u, %u, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->firstGroup, params->groupCount, wine_dbgstr_longlong(params->dataSize), params->pData); - return wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -13935,8 +15473,12 @@ static NTSTATUS thunk64_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(void * static NTSTATUS thunk32_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(void *args) { struct vkGetRayTracingCaptureReplayShaderGroupHandlesKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, %u, %u, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->firstGroup, params->groupCount, wine_dbgstr_longlong(params->dataSize), params->pData); - return wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -13946,8 +15488,12 @@ static NTSTATUS thunk32_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(void * static NTSTATUS thunk64_vkGetRayTracingShaderGroupHandlesKHR(void *args) { struct vkGetRayTracingShaderGroupHandlesKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, %u, %u, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->firstGroup, params->groupCount, wine_dbgstr_longlong(params->dataSize), params->pData); - return wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupHandlesKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupHandlesKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -13955,8 +15501,12 @@ static NTSTATUS thunk64_vkGetRayTracingShaderGroupHandlesKHR(void *args) static NTSTATUS thunk32_vkGetRayTracingShaderGroupHandlesKHR(void *args) { struct vkGetRayTracingShaderGroupHandlesKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, %u, %u, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->firstGroup, params->groupCount, wine_dbgstr_longlong(params->dataSize), params->pData); - return wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupHandlesKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupHandlesKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -13966,8 +15516,12 @@ static NTSTATUS thunk32_vkGetRayTracingShaderGroupHandlesKHR(void *args) static NTSTATUS thunk64_vkGetRayTracingShaderGroupHandlesNV(void *args) { struct vkGetRayTracingShaderGroupHandlesNV_params *params = args; + VkResult result; TRACE("%p, 0x%s, %u, %u, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->firstGroup, params->groupCount, wine_dbgstr_longlong(params->dataSize), params->pData); - return wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupHandlesNV(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupHandlesNV(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -13975,8 +15529,12 @@ static NTSTATUS thunk64_vkGetRayTracingShaderGroupHandlesNV(void *args) static NTSTATUS thunk32_vkGetRayTracingShaderGroupHandlesNV(void *args) { struct vkGetRayTracingShaderGroupHandlesNV_params *params = args; + VkResult result; TRACE("%p, 0x%s, %u, %u, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->firstGroup, params->groupCount, wine_dbgstr_longlong(params->dataSize), params->pData); - return wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupHandlesNV(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupHandlesNV(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -13986,8 +15544,12 @@ static NTSTATUS thunk32_vkGetRayTracingShaderGroupHandlesNV(void *args) static NTSTATUS thunk64_vkGetRayTracingShaderGroupStackSizeKHR(void *args) { struct vkGetRayTracingShaderGroupStackSizeKHR_params *params = args; + VkDeviceSize result; TRACE("%p, 0x%s, %u, %#x\n", params->device, wine_dbgstr_longlong(params->pipeline), params->group, params->groupShader); - return wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupStackSizeKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->group, params->groupShader); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupStackSizeKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->group, params->groupShader); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -13995,8 +15557,12 @@ static NTSTATUS thunk64_vkGetRayTracingShaderGroupStackSizeKHR(void *args) static NTSTATUS thunk32_vkGetRayTracingShaderGroupStackSizeKHR(void *args) { struct vkGetRayTracingShaderGroupStackSizeKHR_params *params = args; + VkDeviceSize result; TRACE("%p, 0x%s, %u, %#x\n", params->device, wine_dbgstr_longlong(params->pipeline), params->group, params->groupShader); - return wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupStackSizeKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->group, params->groupShader); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupStackSizeKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->group, params->groupShader); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -14007,7 +15573,9 @@ static NTSTATUS thunk64_vkGetRenderAreaGranularity(void *args) { struct vkGetRenderAreaGranularity_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->renderPass), params->pGranularity); + wine_device_from_handle(params->device)->funcs.p_vkGetRenderAreaGranularity(wine_device_from_handle(params->device)->device, params->renderPass, params->pGranularity); + return STATUS_SUCCESS; } @@ -14017,7 +15585,9 @@ static NTSTATUS thunk32_vkGetRenderAreaGranularity(void *args) { struct vkGetRenderAreaGranularity_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->renderPass), params->pGranularity); + wine_device_from_handle(params->device)->funcs.p_vkGetRenderAreaGranularity(wine_device_from_handle(params->device)->device, params->renderPass, params->pGranularity); + return STATUS_SUCCESS; } @@ -14028,8 +15598,12 @@ static NTSTATUS thunk32_vkGetRenderAreaGranularity(void *args) static NTSTATUS thunk64_vkGetSemaphoreCounterValue(void *args) { struct vkGetSemaphoreCounterValue_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->semaphore), params->pValue); - return wine_device_from_handle(params->device)->funcs.p_vkGetSemaphoreCounterValue(wine_device_from_handle(params->device)->device, params->semaphore, params->pValue); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetSemaphoreCounterValue(wine_device_from_handle(params->device)->device, params->semaphore, params->pValue); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14037,8 +15611,12 @@ static NTSTATUS thunk64_vkGetSemaphoreCounterValue(void *args) static NTSTATUS thunk32_vkGetSemaphoreCounterValue(void *args) { struct vkGetSemaphoreCounterValue_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->semaphore), params->pValue); - return wine_device_from_handle(params->device)->funcs.p_vkGetSemaphoreCounterValue(wine_device_from_handle(params->device)->device, params->semaphore, params->pValue); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetSemaphoreCounterValue(wine_device_from_handle(params->device)->device, params->semaphore, params->pValue); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -14048,8 +15626,12 @@ static NTSTATUS thunk32_vkGetSemaphoreCounterValue(void *args) static NTSTATUS thunk64_vkGetSemaphoreCounterValueKHR(void *args) { struct vkGetSemaphoreCounterValueKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->semaphore), params->pValue); - return wine_device_from_handle(params->device)->funcs.p_vkGetSemaphoreCounterValueKHR(wine_device_from_handle(params->device)->device, params->semaphore, params->pValue); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetSemaphoreCounterValueKHR(wine_device_from_handle(params->device)->device, params->semaphore, params->pValue); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14057,8 +15639,12 @@ static NTSTATUS thunk64_vkGetSemaphoreCounterValueKHR(void *args) static NTSTATUS thunk32_vkGetSemaphoreCounterValueKHR(void *args) { struct vkGetSemaphoreCounterValueKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->semaphore), params->pValue); - return wine_device_from_handle(params->device)->funcs.p_vkGetSemaphoreCounterValueKHR(wine_device_from_handle(params->device)->device, params->semaphore, params->pValue); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetSemaphoreCounterValueKHR(wine_device_from_handle(params->device)->device, params->semaphore, params->pValue); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -14068,8 +15654,12 @@ static NTSTATUS thunk32_vkGetSemaphoreCounterValueKHR(void *args) static NTSTATUS thunk64_vkGetShaderInfoAMD(void *args) { struct vkGetShaderInfoAMD_params *params = args; + VkResult result; TRACE("%p, 0x%s, %#x, %#x, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->shaderStage, params->infoType, params->pInfoSize, params->pInfo); - return wine_device_from_handle(params->device)->funcs.p_vkGetShaderInfoAMD(wine_device_from_handle(params->device)->device, params->pipeline, params->shaderStage, params->infoType, params->pInfoSize, params->pInfo); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetShaderInfoAMD(wine_device_from_handle(params->device)->device, params->pipeline, params->shaderStage, params->infoType, params->pInfoSize, params->pInfo); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14077,8 +15667,12 @@ static NTSTATUS thunk64_vkGetShaderInfoAMD(void *args) static NTSTATUS thunk32_vkGetShaderInfoAMD(void *args) { struct vkGetShaderInfoAMD_params *params = args; + VkResult result; TRACE("%p, 0x%s, %#x, %#x, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->shaderStage, params->infoType, params->pInfoSize, params->pInfo); - return wine_device_from_handle(params->device)->funcs.p_vkGetShaderInfoAMD(wine_device_from_handle(params->device)->device, params->pipeline, params->shaderStage, params->infoType, params->pInfoSize, params->pInfo); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetShaderInfoAMD(wine_device_from_handle(params->device)->device, params->pipeline, params->shaderStage, params->infoType, params->pInfoSize, params->pInfo); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -14089,7 +15683,9 @@ static NTSTATUS thunk64_vkGetShaderModuleCreateInfoIdentifierEXT(void *args) { struct vkGetShaderModuleCreateInfoIdentifierEXT_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pCreateInfo, params->pIdentifier); + wine_device_from_handle(params->device)->funcs.p_vkGetShaderModuleCreateInfoIdentifierEXT(wine_device_from_handle(params->device)->device, params->pCreateInfo, params->pIdentifier); + return STATUS_SUCCESS; } @@ -14099,7 +15695,9 @@ static NTSTATUS thunk32_vkGetShaderModuleCreateInfoIdentifierEXT(void *args) { struct vkGetShaderModuleCreateInfoIdentifierEXT_params *params = args; TRACE("%p, %p, %p\n", params->device, params->pCreateInfo, params->pIdentifier); + wine_device_from_handle(params->device)->funcs.p_vkGetShaderModuleCreateInfoIdentifierEXT(wine_device_from_handle(params->device)->device, params->pCreateInfo, params->pIdentifier); + return STATUS_SUCCESS; } @@ -14111,7 +15709,9 @@ static NTSTATUS thunk64_vkGetShaderModuleIdentifierEXT(void *args) { struct vkGetShaderModuleIdentifierEXT_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->shaderModule), params->pIdentifier); + wine_device_from_handle(params->device)->funcs.p_vkGetShaderModuleIdentifierEXT(wine_device_from_handle(params->device)->device, params->shaderModule, params->pIdentifier); + return STATUS_SUCCESS; } @@ -14121,7 +15721,9 @@ static NTSTATUS thunk32_vkGetShaderModuleIdentifierEXT(void *args) { struct vkGetShaderModuleIdentifierEXT_params *params = args; TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->shaderModule), params->pIdentifier); + wine_device_from_handle(params->device)->funcs.p_vkGetShaderModuleIdentifierEXT(wine_device_from_handle(params->device)->device, params->shaderModule, params->pIdentifier); + return STATUS_SUCCESS; } @@ -14132,8 +15734,12 @@ static NTSTATUS thunk32_vkGetShaderModuleIdentifierEXT(void *args) static NTSTATUS thunk64_vkGetSwapchainImagesKHR(void *args) { struct vkGetSwapchainImagesKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->swapchain), params->pSwapchainImageCount, params->pSwapchainImages); - return wine_device_from_handle(params->device)->funcs.p_vkGetSwapchainImagesKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->pSwapchainImageCount, params->pSwapchainImages); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetSwapchainImagesKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->pSwapchainImageCount, params->pSwapchainImages); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14141,8 +15747,12 @@ static NTSTATUS thunk64_vkGetSwapchainImagesKHR(void *args) static NTSTATUS thunk32_vkGetSwapchainImagesKHR(void *args) { struct vkGetSwapchainImagesKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->swapchain), params->pSwapchainImageCount, params->pSwapchainImages); - return wine_device_from_handle(params->device)->funcs.p_vkGetSwapchainImagesKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->pSwapchainImageCount, params->pSwapchainImages); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetSwapchainImagesKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->pSwapchainImageCount, params->pSwapchainImages); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -14152,8 +15762,12 @@ static NTSTATUS thunk32_vkGetSwapchainImagesKHR(void *args) static NTSTATUS thunk64_vkGetValidationCacheDataEXT(void *args) { struct vkGetValidationCacheDataEXT_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->validationCache), params->pDataSize, params->pData); - return wine_device_from_handle(params->device)->funcs.p_vkGetValidationCacheDataEXT(wine_device_from_handle(params->device)->device, params->validationCache, params->pDataSize, params->pData); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetValidationCacheDataEXT(wine_device_from_handle(params->device)->device, params->validationCache, params->pDataSize, params->pData); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14161,8 +15775,12 @@ static NTSTATUS thunk64_vkGetValidationCacheDataEXT(void *args) static NTSTATUS thunk32_vkGetValidationCacheDataEXT(void *args) { struct vkGetValidationCacheDataEXT_params *params = args; + VkResult result; TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->validationCache), params->pDataSize, params->pData); - return wine_device_from_handle(params->device)->funcs.p_vkGetValidationCacheDataEXT(wine_device_from_handle(params->device)->device, params->validationCache, params->pDataSize, params->pData); + + result = wine_device_from_handle(params->device)->funcs.p_vkGetValidationCacheDataEXT(wine_device_from_handle(params->device)->device, params->validationCache, params->pDataSize, params->pData); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -14172,8 +15790,12 @@ static NTSTATUS thunk32_vkGetValidationCacheDataEXT(void *args) static NTSTATUS thunk64_vkInitializePerformanceApiINTEL(void *args) { struct vkInitializePerformanceApiINTEL_params *params = args; + VkResult result; TRACE("%p, %p\n", params->device, params->pInitializeInfo); - return wine_device_from_handle(params->device)->funcs.p_vkInitializePerformanceApiINTEL(wine_device_from_handle(params->device)->device, params->pInitializeInfo); + + result = wine_device_from_handle(params->device)->funcs.p_vkInitializePerformanceApiINTEL(wine_device_from_handle(params->device)->device, params->pInitializeInfo); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14181,8 +15803,12 @@ static NTSTATUS thunk64_vkInitializePerformanceApiINTEL(void *args) static NTSTATUS thunk32_vkInitializePerformanceApiINTEL(void *args) { struct vkInitializePerformanceApiINTEL_params *params = args; + VkResult result; TRACE("%p, %p\n", params->device, params->pInitializeInfo); - return wine_device_from_handle(params->device)->funcs.p_vkInitializePerformanceApiINTEL(wine_device_from_handle(params->device)->device, params->pInitializeInfo); + + result = wine_device_from_handle(params->device)->funcs.p_vkInitializePerformanceApiINTEL(wine_device_from_handle(params->device)->device, params->pInitializeInfo); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -14192,8 +15818,12 @@ static NTSTATUS thunk32_vkInitializePerformanceApiINTEL(void *args) static NTSTATUS thunk64_vkInvalidateMappedMemoryRanges(void *args) { struct vkInvalidateMappedMemoryRanges_params *params = args; + VkResult result; TRACE("%p, %u, %p\n", params->device, params->memoryRangeCount, params->pMemoryRanges); - return wine_device_from_handle(params->device)->funcs.p_vkInvalidateMappedMemoryRanges(wine_device_from_handle(params->device)->device, params->memoryRangeCount, params->pMemoryRanges); + + result = wine_device_from_handle(params->device)->funcs.p_vkInvalidateMappedMemoryRanges(wine_device_from_handle(params->device)->device, params->memoryRangeCount, params->pMemoryRanges); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14219,8 +15849,12 @@ static NTSTATUS thunk32_vkInvalidateMappedMemoryRanges(void *args) static NTSTATUS thunk64_vkMapMemory(void *args) { struct vkMapMemory_params *params = args; + VkResult result; TRACE("%p, 0x%s, 0x%s, 0x%s, %#x, %p\n", params->device, wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->size), params->flags, params->ppData); - return wine_device_from_handle(params->device)->funcs.p_vkMapMemory(wine_device_from_handle(params->device)->device, params->memory, params->offset, params->size, params->flags, params->ppData); + + result = wine_device_from_handle(params->device)->funcs.p_vkMapMemory(wine_device_from_handle(params->device)->device, params->memory, params->offset, params->size, params->flags, params->ppData); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14228,8 +15862,12 @@ static NTSTATUS thunk64_vkMapMemory(void *args) static NTSTATUS thunk32_vkMapMemory(void *args) { struct vkMapMemory_params *params = args; + VkResult result; TRACE("%p, 0x%s, 0x%s, 0x%s, %#x, %p\n", params->device, wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->size), params->flags, params->ppData); - return wine_device_from_handle(params->device)->funcs.p_vkMapMemory(wine_device_from_handle(params->device)->device, params->memory, params->offset, params->size, params->flags, params->ppData); + + result = wine_device_from_handle(params->device)->funcs.p_vkMapMemory(wine_device_from_handle(params->device)->device, params->memory, params->offset, params->size, params->flags, params->ppData); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -14239,8 +15877,12 @@ static NTSTATUS thunk32_vkMapMemory(void *args) static NTSTATUS thunk64_vkMergePipelineCaches(void *args) { struct vkMergePipelineCaches_params *params = args; + VkResult result; TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->dstCache), params->srcCacheCount, params->pSrcCaches); - return wine_device_from_handle(params->device)->funcs.p_vkMergePipelineCaches(wine_device_from_handle(params->device)->device, params->dstCache, params->srcCacheCount, params->pSrcCaches); + + result = wine_device_from_handle(params->device)->funcs.p_vkMergePipelineCaches(wine_device_from_handle(params->device)->device, params->dstCache, params->srcCacheCount, params->pSrcCaches); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14248,8 +15890,12 @@ static NTSTATUS thunk64_vkMergePipelineCaches(void *args) static NTSTATUS thunk32_vkMergePipelineCaches(void *args) { struct vkMergePipelineCaches_params *params = args; + VkResult result; TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->dstCache), params->srcCacheCount, params->pSrcCaches); - return wine_device_from_handle(params->device)->funcs.p_vkMergePipelineCaches(wine_device_from_handle(params->device)->device, params->dstCache, params->srcCacheCount, params->pSrcCaches); + + result = wine_device_from_handle(params->device)->funcs.p_vkMergePipelineCaches(wine_device_from_handle(params->device)->device, params->dstCache, params->srcCacheCount, params->pSrcCaches); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -14259,8 +15905,12 @@ static NTSTATUS thunk32_vkMergePipelineCaches(void *args) static NTSTATUS thunk64_vkMergeValidationCachesEXT(void *args) { struct vkMergeValidationCachesEXT_params *params = args; + VkResult result; TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->dstCache), params->srcCacheCount, params->pSrcCaches); - return wine_device_from_handle(params->device)->funcs.p_vkMergeValidationCachesEXT(wine_device_from_handle(params->device)->device, params->dstCache, params->srcCacheCount, params->pSrcCaches); + + result = wine_device_from_handle(params->device)->funcs.p_vkMergeValidationCachesEXT(wine_device_from_handle(params->device)->device, params->dstCache, params->srcCacheCount, params->pSrcCaches); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14268,8 +15918,12 @@ static NTSTATUS thunk64_vkMergeValidationCachesEXT(void *args) static NTSTATUS thunk32_vkMergeValidationCachesEXT(void *args) { struct vkMergeValidationCachesEXT_params *params = args; + VkResult result; TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->dstCache), params->srcCacheCount, params->pSrcCaches); - return wine_device_from_handle(params->device)->funcs.p_vkMergeValidationCachesEXT(wine_device_from_handle(params->device)->device, params->dstCache, params->srcCacheCount, params->pSrcCaches); + + result = wine_device_from_handle(params->device)->funcs.p_vkMergeValidationCachesEXT(wine_device_from_handle(params->device)->device, params->dstCache, params->srcCacheCount, params->pSrcCaches); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -14280,7 +15934,9 @@ static NTSTATUS thunk64_vkQueueBeginDebugUtilsLabelEXT(void *args) { struct vkQueueBeginDebugUtilsLabelEXT_params *params = args; TRACE("%p, %p\n", params->queue, params->pLabelInfo); + wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueBeginDebugUtilsLabelEXT(wine_queue_from_handle(params->queue)->queue, params->pLabelInfo); + return STATUS_SUCCESS; } @@ -14290,7 +15946,9 @@ static NTSTATUS thunk32_vkQueueBeginDebugUtilsLabelEXT(void *args) { struct vkQueueBeginDebugUtilsLabelEXT_params *params = args; TRACE("%p, %p\n", params->queue, params->pLabelInfo); + wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueBeginDebugUtilsLabelEXT(wine_queue_from_handle(params->queue)->queue, params->pLabelInfo); + return STATUS_SUCCESS; } @@ -14301,8 +15959,12 @@ static NTSTATUS thunk32_vkQueueBeginDebugUtilsLabelEXT(void *args) static NTSTATUS thunk64_vkQueueBindSparse(void *args) { struct vkQueueBindSparse_params *params = args; + VkResult result; TRACE("%p, %u, %p, 0x%s\n", params->queue, params->bindInfoCount, params->pBindInfo, wine_dbgstr_longlong(params->fence)); - return wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueBindSparse(wine_queue_from_handle(params->queue)->queue, params->bindInfoCount, params->pBindInfo, params->fence); + + result = wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueBindSparse(wine_queue_from_handle(params->queue)->queue, params->bindInfoCount, params->pBindInfo, params->fence); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14329,7 +15991,9 @@ static NTSTATUS thunk64_vkQueueEndDebugUtilsLabelEXT(void *args) { struct vkQueueEndDebugUtilsLabelEXT_params *params = args; TRACE("%p\n", params->queue); + wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueEndDebugUtilsLabelEXT(wine_queue_from_handle(params->queue)->queue); + return STATUS_SUCCESS; } @@ -14339,7 +16003,9 @@ static NTSTATUS thunk32_vkQueueEndDebugUtilsLabelEXT(void *args) { struct vkQueueEndDebugUtilsLabelEXT_params *params = args; TRACE("%p\n", params->queue); + wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueEndDebugUtilsLabelEXT(wine_queue_from_handle(params->queue)->queue); + return STATUS_SUCCESS; } @@ -14351,7 +16017,9 @@ static NTSTATUS thunk64_vkQueueInsertDebugUtilsLabelEXT(void *args) { struct vkQueueInsertDebugUtilsLabelEXT_params *params = args; TRACE("%p, %p\n", params->queue, params->pLabelInfo); + wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueInsertDebugUtilsLabelEXT(wine_queue_from_handle(params->queue)->queue, params->pLabelInfo); + return STATUS_SUCCESS; } @@ -14361,7 +16029,9 @@ static NTSTATUS thunk32_vkQueueInsertDebugUtilsLabelEXT(void *args) { struct vkQueueInsertDebugUtilsLabelEXT_params *params = args; TRACE("%p, %p\n", params->queue, params->pLabelInfo); + wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueInsertDebugUtilsLabelEXT(wine_queue_from_handle(params->queue)->queue, params->pLabelInfo); + return STATUS_SUCCESS; } @@ -14372,8 +16042,12 @@ static NTSTATUS thunk32_vkQueueInsertDebugUtilsLabelEXT(void *args) static NTSTATUS thunk64_vkQueuePresentKHR(void *args) { struct vkQueuePresentKHR_params *params = args; + VkResult result; TRACE("%p, %p\n", params->queue, params->pPresentInfo); - return wine_queue_from_handle(params->queue)->device->funcs.p_vkQueuePresentKHR(wine_queue_from_handle(params->queue)->queue, params->pPresentInfo); + + result = wine_queue_from_handle(params->queue)->device->funcs.p_vkQueuePresentKHR(wine_queue_from_handle(params->queue)->queue, params->pPresentInfo); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14381,8 +16055,12 @@ static NTSTATUS thunk64_vkQueuePresentKHR(void *args) static NTSTATUS thunk32_vkQueuePresentKHR(void *args) { struct vkQueuePresentKHR_params *params = args; + VkResult result; TRACE("%p, %p\n", params->queue, params->pPresentInfo); - return wine_queue_from_handle(params->queue)->device->funcs.p_vkQueuePresentKHR(wine_queue_from_handle(params->queue)->queue, params->pPresentInfo); + + result = wine_queue_from_handle(params->queue)->device->funcs.p_vkQueuePresentKHR(wine_queue_from_handle(params->queue)->queue, params->pPresentInfo); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -14392,8 +16070,12 @@ static NTSTATUS thunk32_vkQueuePresentKHR(void *args) static NTSTATUS thunk64_vkQueueSetPerformanceConfigurationINTEL(void *args) { struct vkQueueSetPerformanceConfigurationINTEL_params *params = args; + VkResult result; TRACE("%p, 0x%s\n", params->queue, wine_dbgstr_longlong(params->configuration)); - return wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueSetPerformanceConfigurationINTEL(wine_queue_from_handle(params->queue)->queue, params->configuration); + + result = wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueSetPerformanceConfigurationINTEL(wine_queue_from_handle(params->queue)->queue, params->configuration); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14401,8 +16083,12 @@ static NTSTATUS thunk64_vkQueueSetPerformanceConfigurationINTEL(void *args) static NTSTATUS thunk32_vkQueueSetPerformanceConfigurationINTEL(void *args) { struct vkQueueSetPerformanceConfigurationINTEL_params *params = args; + VkResult result; TRACE("%p, 0x%s\n", params->queue, wine_dbgstr_longlong(params->configuration)); - return wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueSetPerformanceConfigurationINTEL(wine_queue_from_handle(params->queue)->queue, params->configuration); + + result = wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueSetPerformanceConfigurationINTEL(wine_queue_from_handle(params->queue)->queue, params->configuration); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -14514,8 +16200,12 @@ static NTSTATUS thunk32_vkQueueSubmit2KHR(void *args) static NTSTATUS thunk64_vkQueueWaitIdle(void *args) { struct vkQueueWaitIdle_params *params = args; + VkResult result; TRACE("%p\n", params->queue); - return wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueWaitIdle(wine_queue_from_handle(params->queue)->queue); + + result = wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueWaitIdle(wine_queue_from_handle(params->queue)->queue); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14523,8 +16213,12 @@ static NTSTATUS thunk64_vkQueueWaitIdle(void *args) static NTSTATUS thunk32_vkQueueWaitIdle(void *args) { struct vkQueueWaitIdle_params *params = args; + VkResult result; TRACE("%p\n", params->queue); - return wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueWaitIdle(wine_queue_from_handle(params->queue)->queue); + + result = wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueWaitIdle(wine_queue_from_handle(params->queue)->queue); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -14534,8 +16228,12 @@ static NTSTATUS thunk32_vkQueueWaitIdle(void *args) static NTSTATUS thunk64_vkReleasePerformanceConfigurationINTEL(void *args) { struct vkReleasePerformanceConfigurationINTEL_params *params = args; + VkResult result; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->configuration)); - return wine_device_from_handle(params->device)->funcs.p_vkReleasePerformanceConfigurationINTEL(wine_device_from_handle(params->device)->device, params->configuration); + + result = wine_device_from_handle(params->device)->funcs.p_vkReleasePerformanceConfigurationINTEL(wine_device_from_handle(params->device)->device, params->configuration); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14543,8 +16241,12 @@ static NTSTATUS thunk64_vkReleasePerformanceConfigurationINTEL(void *args) static NTSTATUS thunk32_vkReleasePerformanceConfigurationINTEL(void *args) { struct vkReleasePerformanceConfigurationINTEL_params *params = args; + VkResult result; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->configuration)); - return wine_device_from_handle(params->device)->funcs.p_vkReleasePerformanceConfigurationINTEL(wine_device_from_handle(params->device)->device, params->configuration); + + result = wine_device_from_handle(params->device)->funcs.p_vkReleasePerformanceConfigurationINTEL(wine_device_from_handle(params->device)->device, params->configuration); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -14555,7 +16257,9 @@ static NTSTATUS thunk64_vkReleaseProfilingLockKHR(void *args) { struct vkReleaseProfilingLockKHR_params *params = args; TRACE("%p\n", params->device); + wine_device_from_handle(params->device)->funcs.p_vkReleaseProfilingLockKHR(wine_device_from_handle(params->device)->device); + return STATUS_SUCCESS; } @@ -14565,7 +16269,9 @@ static NTSTATUS thunk32_vkReleaseProfilingLockKHR(void *args) { struct vkReleaseProfilingLockKHR_params *params = args; TRACE("%p\n", params->device); + wine_device_from_handle(params->device)->funcs.p_vkReleaseProfilingLockKHR(wine_device_from_handle(params->device)->device); + return STATUS_SUCCESS; } @@ -14576,8 +16282,12 @@ static NTSTATUS thunk32_vkReleaseProfilingLockKHR(void *args) static NTSTATUS thunk64_vkResetCommandBuffer(void *args) { struct vkResetCommandBuffer_params *params = args; + VkResult result; TRACE("%p, %#x\n", params->commandBuffer, params->flags); - return wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkResetCommandBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->flags); + + result = wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkResetCommandBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->flags); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14585,8 +16295,12 @@ static NTSTATUS thunk64_vkResetCommandBuffer(void *args) static NTSTATUS thunk32_vkResetCommandBuffer(void *args) { struct vkResetCommandBuffer_params *params = args; + VkResult result; TRACE("%p, %#x\n", params->commandBuffer, params->flags); - return wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkResetCommandBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->flags); + + result = wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkResetCommandBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->flags); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -14596,8 +16310,12 @@ static NTSTATUS thunk32_vkResetCommandBuffer(void *args) static NTSTATUS thunk64_vkResetCommandPool(void *args) { struct vkResetCommandPool_params *params = args; + VkResult result; TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->commandPool), params->flags); - return wine_device_from_handle(params->device)->funcs.p_vkResetCommandPool(wine_device_from_handle(params->device)->device, wine_cmd_pool_from_handle(params->commandPool)->command_pool, params->flags); + + result = wine_device_from_handle(params->device)->funcs.p_vkResetCommandPool(wine_device_from_handle(params->device)->device, wine_cmd_pool_from_handle(params->commandPool)->command_pool, params->flags); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14605,8 +16323,12 @@ static NTSTATUS thunk64_vkResetCommandPool(void *args) static NTSTATUS thunk32_vkResetCommandPool(void *args) { struct vkResetCommandPool_params *params = args; + VkResult result; TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->commandPool), params->flags); - return wine_device_from_handle(params->device)->funcs.p_vkResetCommandPool(wine_device_from_handle(params->device)->device, wine_cmd_pool_from_handle(params->commandPool)->command_pool, params->flags); + + result = wine_device_from_handle(params->device)->funcs.p_vkResetCommandPool(wine_device_from_handle(params->device)->device, wine_cmd_pool_from_handle(params->commandPool)->command_pool, params->flags); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -14616,8 +16338,12 @@ static NTSTATUS thunk32_vkResetCommandPool(void *args) static NTSTATUS thunk64_vkResetDescriptorPool(void *args) { struct vkResetDescriptorPool_params *params = args; + VkResult result; TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->descriptorPool), params->flags); - return wine_device_from_handle(params->device)->funcs.p_vkResetDescriptorPool(wine_device_from_handle(params->device)->device, params->descriptorPool, params->flags); + + result = wine_device_from_handle(params->device)->funcs.p_vkResetDescriptorPool(wine_device_from_handle(params->device)->device, params->descriptorPool, params->flags); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14625,8 +16351,12 @@ static NTSTATUS thunk64_vkResetDescriptorPool(void *args) static NTSTATUS thunk32_vkResetDescriptorPool(void *args) { struct vkResetDescriptorPool_params *params = args; + VkResult result; TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->descriptorPool), params->flags); - return wine_device_from_handle(params->device)->funcs.p_vkResetDescriptorPool(wine_device_from_handle(params->device)->device, params->descriptorPool, params->flags); + + result = wine_device_from_handle(params->device)->funcs.p_vkResetDescriptorPool(wine_device_from_handle(params->device)->device, params->descriptorPool, params->flags); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -14636,8 +16366,12 @@ static NTSTATUS thunk32_vkResetDescriptorPool(void *args) static NTSTATUS thunk64_vkResetEvent(void *args) { struct vkResetEvent_params *params = args; + VkResult result; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->event)); - return wine_device_from_handle(params->device)->funcs.p_vkResetEvent(wine_device_from_handle(params->device)->device, params->event); + + result = wine_device_from_handle(params->device)->funcs.p_vkResetEvent(wine_device_from_handle(params->device)->device, params->event); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14645,8 +16379,12 @@ static NTSTATUS thunk64_vkResetEvent(void *args) static NTSTATUS thunk32_vkResetEvent(void *args) { struct vkResetEvent_params *params = args; + VkResult result; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->event)); - return wine_device_from_handle(params->device)->funcs.p_vkResetEvent(wine_device_from_handle(params->device)->device, params->event); + + result = wine_device_from_handle(params->device)->funcs.p_vkResetEvent(wine_device_from_handle(params->device)->device, params->event); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -14656,8 +16394,12 @@ static NTSTATUS thunk32_vkResetEvent(void *args) static NTSTATUS thunk64_vkResetFences(void *args) { struct vkResetFences_params *params = args; + VkResult result; TRACE("%p, %u, %p\n", params->device, params->fenceCount, params->pFences); - return wine_device_from_handle(params->device)->funcs.p_vkResetFences(wine_device_from_handle(params->device)->device, params->fenceCount, params->pFences); + + result = wine_device_from_handle(params->device)->funcs.p_vkResetFences(wine_device_from_handle(params->device)->device, params->fenceCount, params->pFences); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14665,8 +16407,12 @@ static NTSTATUS thunk64_vkResetFences(void *args) static NTSTATUS thunk32_vkResetFences(void *args) { struct vkResetFences_params *params = args; + VkResult result; TRACE("%p, %u, %p\n", params->device, params->fenceCount, params->pFences); - return wine_device_from_handle(params->device)->funcs.p_vkResetFences(wine_device_from_handle(params->device)->device, params->fenceCount, params->pFences); + + result = wine_device_from_handle(params->device)->funcs.p_vkResetFences(wine_device_from_handle(params->device)->device, params->fenceCount, params->pFences); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -14677,7 +16423,9 @@ static NTSTATUS thunk64_vkResetQueryPool(void *args) { struct vkResetQueryPool_params *params = args; TRACE("%p, 0x%s, %u, %u\n", params->device, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount); + wine_device_from_handle(params->device)->funcs.p_vkResetQueryPool(wine_device_from_handle(params->device)->device, params->queryPool, params->firstQuery, params->queryCount); + return STATUS_SUCCESS; } @@ -14687,7 +16435,9 @@ static NTSTATUS thunk32_vkResetQueryPool(void *args) { struct vkResetQueryPool_params *params = args; TRACE("%p, 0x%s, %u, %u\n", params->device, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount); + wine_device_from_handle(params->device)->funcs.p_vkResetQueryPool(wine_device_from_handle(params->device)->device, params->queryPool, params->firstQuery, params->queryCount); + return STATUS_SUCCESS; } @@ -14699,7 +16449,9 @@ static NTSTATUS thunk64_vkResetQueryPoolEXT(void *args) { struct vkResetQueryPoolEXT_params *params = args; TRACE("%p, 0x%s, %u, %u\n", params->device, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount); + wine_device_from_handle(params->device)->funcs.p_vkResetQueryPoolEXT(wine_device_from_handle(params->device)->device, params->queryPool, params->firstQuery, params->queryCount); + return STATUS_SUCCESS; } @@ -14709,7 +16461,9 @@ static NTSTATUS thunk32_vkResetQueryPoolEXT(void *args) { struct vkResetQueryPoolEXT_params *params = args; TRACE("%p, 0x%s, %u, %u\n", params->device, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount); + wine_device_from_handle(params->device)->funcs.p_vkResetQueryPoolEXT(wine_device_from_handle(params->device)->device, params->queryPool, params->firstQuery, params->queryCount); + return STATUS_SUCCESS; } @@ -14785,7 +16539,9 @@ static NTSTATUS thunk64_vkSetDeviceMemoryPriorityEXT(void *args) { struct vkSetDeviceMemoryPriorityEXT_params *params = args; TRACE("%p, 0x%s, %f\n", params->device, wine_dbgstr_longlong(params->memory), params->priority); + wine_device_from_handle(params->device)->funcs.p_vkSetDeviceMemoryPriorityEXT(wine_device_from_handle(params->device)->device, params->memory, params->priority); + return STATUS_SUCCESS; } @@ -14795,7 +16551,9 @@ static NTSTATUS thunk32_vkSetDeviceMemoryPriorityEXT(void *args) { struct vkSetDeviceMemoryPriorityEXT_params *params = args; TRACE("%p, 0x%s, %f\n", params->device, wine_dbgstr_longlong(params->memory), params->priority); + wine_device_from_handle(params->device)->funcs.p_vkSetDeviceMemoryPriorityEXT(wine_device_from_handle(params->device)->device, params->memory, params->priority); + return STATUS_SUCCESS; } @@ -14806,8 +16564,12 @@ static NTSTATUS thunk32_vkSetDeviceMemoryPriorityEXT(void *args) static NTSTATUS thunk64_vkSetEvent(void *args) { struct vkSetEvent_params *params = args; + VkResult result; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->event)); - return wine_device_from_handle(params->device)->funcs.p_vkSetEvent(wine_device_from_handle(params->device)->device, params->event); + + result = wine_device_from_handle(params->device)->funcs.p_vkSetEvent(wine_device_from_handle(params->device)->device, params->event); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14815,8 +16577,12 @@ static NTSTATUS thunk64_vkSetEvent(void *args) static NTSTATUS thunk32_vkSetEvent(void *args) { struct vkSetEvent_params *params = args; + VkResult result; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->event)); - return wine_device_from_handle(params->device)->funcs.p_vkSetEvent(wine_device_from_handle(params->device)->device, params->event); + + result = wine_device_from_handle(params->device)->funcs.p_vkSetEvent(wine_device_from_handle(params->device)->device, params->event); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -14826,8 +16592,12 @@ static NTSTATUS thunk32_vkSetEvent(void *args) static NTSTATUS thunk64_vkSetPrivateData(void *args) { struct vkSetPrivateData_params *params = args; + VkResult result; TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), wine_dbgstr_longlong(params->data)); - return wine_device_from_handle(params->device)->funcs.p_vkSetPrivateData(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->data); + + result = wine_device_from_handle(params->device)->funcs.p_vkSetPrivateData(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->data); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14835,8 +16605,12 @@ static NTSTATUS thunk64_vkSetPrivateData(void *args) static NTSTATUS thunk32_vkSetPrivateData(void *args) { struct vkSetPrivateData_params *params = args; + VkResult result; TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), wine_dbgstr_longlong(params->data)); - return wine_device_from_handle(params->device)->funcs.p_vkSetPrivateData(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->data); + + result = wine_device_from_handle(params->device)->funcs.p_vkSetPrivateData(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->data); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -14846,8 +16620,12 @@ static NTSTATUS thunk32_vkSetPrivateData(void *args) static NTSTATUS thunk64_vkSetPrivateDataEXT(void *args) { struct vkSetPrivateDataEXT_params *params = args; + VkResult result; TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), wine_dbgstr_longlong(params->data)); - return wine_device_from_handle(params->device)->funcs.p_vkSetPrivateDataEXT(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->data); + + result = wine_device_from_handle(params->device)->funcs.p_vkSetPrivateDataEXT(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->data); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14855,8 +16633,12 @@ static NTSTATUS thunk64_vkSetPrivateDataEXT(void *args) static NTSTATUS thunk32_vkSetPrivateDataEXT(void *args) { struct vkSetPrivateDataEXT_params *params = args; + VkResult result; TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), wine_dbgstr_longlong(params->data)); - return wine_device_from_handle(params->device)->funcs.p_vkSetPrivateDataEXT(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->data); + + result = wine_device_from_handle(params->device)->funcs.p_vkSetPrivateDataEXT(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->data); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -14866,8 +16648,12 @@ static NTSTATUS thunk32_vkSetPrivateDataEXT(void *args) static NTSTATUS thunk64_vkSignalSemaphore(void *args) { struct vkSignalSemaphore_params *params = args; + VkResult result; TRACE("%p, %p\n", params->device, params->pSignalInfo); - return wine_device_from_handle(params->device)->funcs.p_vkSignalSemaphore(wine_device_from_handle(params->device)->device, params->pSignalInfo); + + result = wine_device_from_handle(params->device)->funcs.p_vkSignalSemaphore(wine_device_from_handle(params->device)->device, params->pSignalInfo); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14892,8 +16678,12 @@ static NTSTATUS thunk32_vkSignalSemaphore(void *args) static NTSTATUS thunk64_vkSignalSemaphoreKHR(void *args) { struct vkSignalSemaphoreKHR_params *params = args; + VkResult result; TRACE("%p, %p\n", params->device, params->pSignalInfo); - return wine_device_from_handle(params->device)->funcs.p_vkSignalSemaphoreKHR(wine_device_from_handle(params->device)->device, params->pSignalInfo); + + result = wine_device_from_handle(params->device)->funcs.p_vkSignalSemaphoreKHR(wine_device_from_handle(params->device)->device, params->pSignalInfo); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -14951,7 +16741,9 @@ static NTSTATUS thunk64_vkTrimCommandPool(void *args) { struct vkTrimCommandPool_params *params = args; TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->commandPool), params->flags); + wine_device_from_handle(params->device)->funcs.p_vkTrimCommandPool(wine_device_from_handle(params->device)->device, wine_cmd_pool_from_handle(params->commandPool)->command_pool, params->flags); + return STATUS_SUCCESS; } @@ -14961,7 +16753,9 @@ static NTSTATUS thunk32_vkTrimCommandPool(void *args) { struct vkTrimCommandPool_params *params = args; TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->commandPool), params->flags); + wine_device_from_handle(params->device)->funcs.p_vkTrimCommandPool(wine_device_from_handle(params->device)->device, wine_cmd_pool_from_handle(params->commandPool)->command_pool, params->flags); + return STATUS_SUCCESS; } @@ -14973,7 +16767,9 @@ static NTSTATUS thunk64_vkTrimCommandPoolKHR(void *args) { struct vkTrimCommandPoolKHR_params *params = args; TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->commandPool), params->flags); + wine_device_from_handle(params->device)->funcs.p_vkTrimCommandPoolKHR(wine_device_from_handle(params->device)->device, wine_cmd_pool_from_handle(params->commandPool)->command_pool, params->flags); + return STATUS_SUCCESS; } @@ -14983,7 +16779,9 @@ static NTSTATUS thunk32_vkTrimCommandPoolKHR(void *args) { struct vkTrimCommandPoolKHR_params *params = args; TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->commandPool), params->flags); + wine_device_from_handle(params->device)->funcs.p_vkTrimCommandPoolKHR(wine_device_from_handle(params->device)->device, wine_cmd_pool_from_handle(params->commandPool)->command_pool, params->flags); + return STATUS_SUCCESS; } @@ -14995,7 +16793,9 @@ static NTSTATUS thunk64_vkUninitializePerformanceApiINTEL(void *args) { struct vkUninitializePerformanceApiINTEL_params *params = args; TRACE("%p\n", params->device); + wine_device_from_handle(params->device)->funcs.p_vkUninitializePerformanceApiINTEL(wine_device_from_handle(params->device)->device); + return STATUS_SUCCESS; } @@ -15005,7 +16805,9 @@ static NTSTATUS thunk32_vkUninitializePerformanceApiINTEL(void *args) { struct vkUninitializePerformanceApiINTEL_params *params = args; TRACE("%p\n", params->device); + wine_device_from_handle(params->device)->funcs.p_vkUninitializePerformanceApiINTEL(wine_device_from_handle(params->device)->device); + return STATUS_SUCCESS; } @@ -15017,7 +16819,9 @@ static NTSTATUS thunk64_vkUnmapMemory(void *args) { struct vkUnmapMemory_params *params = args; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->memory)); + wine_device_from_handle(params->device)->funcs.p_vkUnmapMemory(wine_device_from_handle(params->device)->device, params->memory); + return STATUS_SUCCESS; } @@ -15027,7 +16831,9 @@ static NTSTATUS thunk32_vkUnmapMemory(void *args) { struct vkUnmapMemory_params *params = args; TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->memory)); + wine_device_from_handle(params->device)->funcs.p_vkUnmapMemory(wine_device_from_handle(params->device)->device, params->memory); + return STATUS_SUCCESS; } @@ -15039,7 +16845,9 @@ static NTSTATUS thunk64_vkUpdateDescriptorSetWithTemplate(void *args) { struct vkUpdateDescriptorSetWithTemplate_params *params = args; TRACE("%p, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSet), wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pData); + wine_device_from_handle(params->device)->funcs.p_vkUpdateDescriptorSetWithTemplate(wine_device_from_handle(params->device)->device, params->descriptorSet, params->descriptorUpdateTemplate, params->pData); + return STATUS_SUCCESS; } @@ -15049,7 +16857,9 @@ static NTSTATUS thunk32_vkUpdateDescriptorSetWithTemplate(void *args) { struct vkUpdateDescriptorSetWithTemplate_params *params = args; TRACE("%p, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSet), wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pData); + wine_device_from_handle(params->device)->funcs.p_vkUpdateDescriptorSetWithTemplate(wine_device_from_handle(params->device)->device, params->descriptorSet, params->descriptorUpdateTemplate, params->pData); + return STATUS_SUCCESS; } @@ -15061,7 +16871,9 @@ static NTSTATUS thunk64_vkUpdateDescriptorSetWithTemplateKHR(void *args) { struct vkUpdateDescriptorSetWithTemplateKHR_params *params = args; TRACE("%p, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSet), wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pData); + wine_device_from_handle(params->device)->funcs.p_vkUpdateDescriptorSetWithTemplateKHR(wine_device_from_handle(params->device)->device, params->descriptorSet, params->descriptorUpdateTemplate, params->pData); + return STATUS_SUCCESS; } @@ -15071,7 +16883,9 @@ static NTSTATUS thunk32_vkUpdateDescriptorSetWithTemplateKHR(void *args) { struct vkUpdateDescriptorSetWithTemplateKHR_params *params = args; TRACE("%p, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSet), wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pData); + wine_device_from_handle(params->device)->funcs.p_vkUpdateDescriptorSetWithTemplateKHR(wine_device_from_handle(params->device)->device, params->descriptorSet, params->descriptorUpdateTemplate, params->pData); + return STATUS_SUCCESS; } @@ -15083,7 +16897,9 @@ static NTSTATUS thunk64_vkUpdateDescriptorSets(void *args) { struct vkUpdateDescriptorSets_params *params = args; TRACE("%p, %u, %p, %u, %p\n", params->device, params->descriptorWriteCount, params->pDescriptorWrites, params->descriptorCopyCount, params->pDescriptorCopies); + wine_device_from_handle(params->device)->funcs.p_vkUpdateDescriptorSets(wine_device_from_handle(params->device)->device, params->descriptorWriteCount, params->pDescriptorWrites, params->descriptorCopyCount, params->pDescriptorCopies); + return STATUS_SUCCESS; } @@ -15112,8 +16928,12 @@ static NTSTATUS thunk32_vkUpdateDescriptorSets(void *args) static NTSTATUS thunk64_vkWaitForFences(void *args) { struct vkWaitForFences_params *params = args; + VkResult result; TRACE("%p, %u, %p, %u, 0x%s\n", params->device, params->fenceCount, params->pFences, params->waitAll, wine_dbgstr_longlong(params->timeout)); - return wine_device_from_handle(params->device)->funcs.p_vkWaitForFences(wine_device_from_handle(params->device)->device, params->fenceCount, params->pFences, params->waitAll, params->timeout); + + result = wine_device_from_handle(params->device)->funcs.p_vkWaitForFences(wine_device_from_handle(params->device)->device, params->fenceCount, params->pFences, params->waitAll, params->timeout); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -15121,8 +16941,12 @@ static NTSTATUS thunk64_vkWaitForFences(void *args) static NTSTATUS thunk32_vkWaitForFences(void *args) { struct vkWaitForFences_params *params = args; + VkResult result; TRACE("%p, %u, %p, %u, 0x%s\n", params->device, params->fenceCount, params->pFences, params->waitAll, wine_dbgstr_longlong(params->timeout)); - return wine_device_from_handle(params->device)->funcs.p_vkWaitForFences(wine_device_from_handle(params->device)->device, params->fenceCount, params->pFences, params->waitAll, params->timeout); + + result = wine_device_from_handle(params->device)->funcs.p_vkWaitForFences(wine_device_from_handle(params->device)->device, params->fenceCount, params->pFences, params->waitAll, params->timeout); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -15132,8 +16956,12 @@ static NTSTATUS thunk32_vkWaitForFences(void *args) static NTSTATUS thunk64_vkWaitForPresentKHR(void *args) { struct vkWaitForPresentKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, 0x%s, 0x%s\n", params->device, wine_dbgstr_longlong(params->swapchain), wine_dbgstr_longlong(params->presentId), wine_dbgstr_longlong(params->timeout)); - return wine_device_from_handle(params->device)->funcs.p_vkWaitForPresentKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->presentId, params->timeout); + + result = wine_device_from_handle(params->device)->funcs.p_vkWaitForPresentKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->presentId, params->timeout); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -15141,8 +16969,12 @@ static NTSTATUS thunk64_vkWaitForPresentKHR(void *args) static NTSTATUS thunk32_vkWaitForPresentKHR(void *args) { struct vkWaitForPresentKHR_params *params = args; + VkResult result; TRACE("%p, 0x%s, 0x%s, 0x%s\n", params->device, wine_dbgstr_longlong(params->swapchain), wine_dbgstr_longlong(params->presentId), wine_dbgstr_longlong(params->timeout)); - return wine_device_from_handle(params->device)->funcs.p_vkWaitForPresentKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->presentId, params->timeout); + + result = wine_device_from_handle(params->device)->funcs.p_vkWaitForPresentKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->presentId, params->timeout); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -15152,8 +16984,12 @@ static NTSTATUS thunk32_vkWaitForPresentKHR(void *args) static NTSTATUS thunk64_vkWaitSemaphores(void *args) { struct vkWaitSemaphores_params *params = args; + VkResult result; TRACE("%p, %p, 0x%s\n", params->device, params->pWaitInfo, wine_dbgstr_longlong(params->timeout)); - return wine_device_from_handle(params->device)->funcs.p_vkWaitSemaphores(wine_device_from_handle(params->device)->device, params->pWaitInfo, params->timeout); + + result = wine_device_from_handle(params->device)->funcs.p_vkWaitSemaphores(wine_device_from_handle(params->device)->device, params->pWaitInfo, params->timeout); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -15161,8 +16997,12 @@ static NTSTATUS thunk64_vkWaitSemaphores(void *args) static NTSTATUS thunk32_vkWaitSemaphores(void *args) { struct vkWaitSemaphores_params *params = args; + VkResult result; TRACE("%p, %p, 0x%s\n", params->device, params->pWaitInfo, wine_dbgstr_longlong(params->timeout)); - return wine_device_from_handle(params->device)->funcs.p_vkWaitSemaphores(wine_device_from_handle(params->device)->device, params->pWaitInfo, params->timeout); + + result = wine_device_from_handle(params->device)->funcs.p_vkWaitSemaphores(wine_device_from_handle(params->device)->device, params->pWaitInfo, params->timeout); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -15172,8 +17012,12 @@ static NTSTATUS thunk32_vkWaitSemaphores(void *args) static NTSTATUS thunk64_vkWaitSemaphoresKHR(void *args) { struct vkWaitSemaphoresKHR_params *params = args; + VkResult result; TRACE("%p, %p, 0x%s\n", params->device, params->pWaitInfo, wine_dbgstr_longlong(params->timeout)); - return wine_device_from_handle(params->device)->funcs.p_vkWaitSemaphoresKHR(wine_device_from_handle(params->device)->device, params->pWaitInfo, params->timeout); + + result = wine_device_from_handle(params->device)->funcs.p_vkWaitSemaphoresKHR(wine_device_from_handle(params->device)->device, params->pWaitInfo, params->timeout); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -15181,8 +17025,12 @@ static NTSTATUS thunk64_vkWaitSemaphoresKHR(void *args) static NTSTATUS thunk32_vkWaitSemaphoresKHR(void *args) { struct vkWaitSemaphoresKHR_params *params = args; + VkResult result; TRACE("%p, %p, 0x%s\n", params->device, params->pWaitInfo, wine_dbgstr_longlong(params->timeout)); - return wine_device_from_handle(params->device)->funcs.p_vkWaitSemaphoresKHR(wine_device_from_handle(params->device)->device, params->pWaitInfo, params->timeout); + + result = wine_device_from_handle(params->device)->funcs.p_vkWaitSemaphoresKHR(wine_device_from_handle(params->device)->device, params->pWaitInfo, params->timeout); + + return result; } #endif /* USE_STRUCT_CONVERSION */ @@ -15192,8 +17040,12 @@ static NTSTATUS thunk32_vkWaitSemaphoresKHR(void *args) static NTSTATUS thunk64_vkWriteAccelerationStructuresPropertiesKHR(void *args) { struct vkWriteAccelerationStructuresPropertiesKHR_params *params = args; + VkResult result; TRACE("%p, %u, %p, %#x, 0x%s, %p, 0x%s\n", params->device, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, wine_dbgstr_longlong(params->dataSize), params->pData, wine_dbgstr_longlong(params->stride)); - return wine_device_from_handle(params->device)->funcs.p_vkWriteAccelerationStructuresPropertiesKHR(wine_device_from_handle(params->device)->device, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, params->dataSize, params->pData, params->stride); + + result = wine_device_from_handle(params->device)->funcs.p_vkWriteAccelerationStructuresPropertiesKHR(wine_device_from_handle(params->device)->device, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, params->dataSize, params->pData, params->stride); + + return result; } #else /* USE_STRUCT_CONVERSION */ @@ -15201,8 +17053,12 @@ static NTSTATUS thunk64_vkWriteAccelerationStructuresPropertiesKHR(void *args) static NTSTATUS thunk32_vkWriteAccelerationStructuresPropertiesKHR(void *args) { struct vkWriteAccelerationStructuresPropertiesKHR_params *params = args; + VkResult result; TRACE("%p, %u, %p, %#x, 0x%s, %p, 0x%s\n", params->device, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, wine_dbgstr_longlong(params->dataSize), params->pData, wine_dbgstr_longlong(params->stride)); - return wine_device_from_handle(params->device)->funcs.p_vkWriteAccelerationStructuresPropertiesKHR(wine_device_from_handle(params->device)->device, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, params->dataSize, params->pData, params->stride); + + result = wine_device_from_handle(params->device)->funcs.p_vkWriteAccelerationStructuresPropertiesKHR(wine_device_from_handle(params->device)->device, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, params->dataSize, params->pData, params->stride); + + return result; } #endif /* USE_STRUCT_CONVERSION */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/923
From: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 59 +- dlls/winevulkan/vulkan.c | 396 +++---- dlls/winevulkan/vulkan_thunks.c | 1810 +++++++++++++++---------------- dlls/winevulkan/vulkan_thunks.h | 84 +- 4 files changed, 1091 insertions(+), 1258 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 52bd57b951d..a67cfbc88bb 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -725,7 +725,7 @@ class VkFunction(object): pfn += ")" return pfn - def prototype(self, call_conv=None, prefix=None, postfix=None): + def prototype(self, call_conv=None, prefix=None, postfix=None, is_thunk=False): """ Generate prototype for given function. Args: @@ -747,6 +747,9 @@ class VkFunction(object): # Add all the parameters. proto += ", ".join([p.definition() for p in self.params]) + if is_thunk and self.extra_param: + proto += ", void *" + self.extra_param + if postfix is not None: proto += ") {0}".format(postfix) else: @@ -794,7 +797,7 @@ class VkFunction(object): else: body += " {0} {1}_host;\n".format(p.type, p.name) - if not self.needs_private_thunk(): + if self.thunk_type == ThunkType.PUBLIC: body += " {0}\n".format(self.trace(params_prefix=params_prefix)) # Call any win_to_host conversion calls. @@ -804,21 +807,23 @@ class VkFunction(object): # Build list of parameters containing converted and non-converted parameters. # The param itself knows if conversion is needed and applies it when we set conv=True. - params = ", ".join([p.variable(conv=conv, params_prefix=params_prefix) for p in self.params]) + params = ", ".join([p.variable(conv=conv, unwrap=unwrap, params_prefix=params_prefix) for p in self.params]) + if self.extra_param: + params += ", {0}{1}".format(params_prefix, self.extra_param) + + if unwrap or self.thunk_type == ThunkType.PUBLIC: + func_prefix = "{0}.p_".format(self.params[0].dispatch_table(params_prefix)) + else: + func_prefix = "wine_" # Call the native Vulkan function. if self.type == "void": - body += " {0}.p_{1}({2});\n".format(self.params[0].dispatch_table(params_prefix), - self.name, params) + body += " {0}{1}({2});\n".format(func_prefix, self.name, params) else: - body += " {0}result = {1}.p_{2}({3});\n".format(result_prefix, - self.params[0].dispatch_table(params_prefix), - self.name, params) - - body += "\n" + body += " {0}result = {1}{2}({3});\n".format(result_prefix, func_prefix, self.name, params) # Call any host_to_win conversion calls. - if conv: + if conv and unwrap: for p in self.params: if not p.output_conv: continue @@ -885,7 +890,7 @@ class VkFunction(object): thunk = "NTSTATUS {0}{1}(void *args)\n".format(prefix, self.name) thunk += "{\n" thunk += " struct {0}_params *params = args;\n".format(self.name) - thunk += self.body(conv=conv, unwrap=not self.needs_private_thunk(), params_prefix="params->") + thunk += self.body(conv=conv, unwrap=self.thunk_type == ThunkType.PUBLIC, params_prefix="params->") thunk += "}\n\n" return thunk @@ -1810,7 +1815,7 @@ class VkParam(VkVariable): LOGGER.error("Unhandled spec conversion for type: {0}".format(self.type)) - def variable(self, conv=False, params_prefix=""): + def variable(self, conv, unwrap, params_prefix=""): """ Returns 'glue' code during generation of a function call on how to access the variable. This function handles various scenarios such as 'unwrapping' if dispatchable objects and renaming of parameters in case of win32 -> host conversion. @@ -1821,16 +1826,16 @@ class VkParam(VkVariable): # Hack until we enable allocation callbacks from ICD to application. These are a joy # to enable one day, because of calling convention conversion. - if "VkAllocationCallbacks" in self.type: + if unwrap and "VkAllocationCallbacks" in self.type: LOGGER.debug("TODO: setting NULL VkAllocationCallbacks for {0}".format(self.name)) return "NULL" - if self.needs_unwrapping() or (conv and self.needs_conversion()): + if (unwrap and self.needs_unwrapping()) or (conv and self.needs_conversion()): if self.is_dynamic_array(): return "{0}_host".format(self.name) else: return "&{0}_host".format(self.name) - else: + elif unwrap: if self.object_type != None and self.type == "uint64_t": return "wine_vk_unwrap_handle({0}{1}, {0}{2})".format(params_prefix, self.object_type, self.name) @@ -1839,6 +1844,8 @@ class VkParam(VkVariable): p = "{0}{1}".format(params_prefix, self.name) driver_handle = self.handle.driver_handle(p) if self.is_handle() else None return driver_handle if driver_handle else p + else: + return "{0}{1}".format(params_prefix, self.name) class VkStruct(Sequence): @@ -2710,21 +2717,19 @@ class VkGenerator(object): for vk_func in self.registry.funcs.values(): if not vk_func.needs_exposing(): continue - if vk_func.loader_thunk_type == ThunkType.NONE or vk_func.thunk_type == ThunkType.NONE: + if vk_func.loader_thunk_type == ThunkType.NONE: continue f.write("#if !defined(USE_STRUCT_CONVERSION)\n\n") if vk_func.needs_private_thunk(): f.write(vk_func.thunk(prefix="thunk_")) - else: - f.write("static ") - f.write(vk_func.thunk(prefix="thunk64_")) + f.write("static ") + f.write(vk_func.thunk(prefix="thunk64_")) f.write("#else /* USE_STRUCT_CONVERSION */\n\n") if vk_func.needs_private_thunk(): f.write(vk_func.thunk(prefix="thunk_", conv=True)) - else: - f.write("static ") - f.write(vk_func.thunk(prefix="thunk32_", conv=True)) + f.write("static ") + f.write(vk_func.thunk(prefix="thunk32_", conv=vk_func.thunk_type == ThunkType.PUBLIC)) f.write("#endif /* USE_STRUCT_CONVERSION */\n\n") # Create array of device extensions. @@ -2814,8 +2819,7 @@ class VkGenerator(object): if vk_func.loader_thunk_type == ThunkType.NONE: continue - prefix = "thunk64_" if vk_func.thunk_type == ThunkType.PUBLIC else "wine_" - f.write(" {1}{0},\n".format(vk_func.name, prefix)) + f.write(" {1}{0},\n".format(vk_func.name, "thunk64_")) f.write("};\n") f.write("C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == unix_count);\n\n") @@ -2832,8 +2836,7 @@ class VkGenerator(object): if vk_func.loader_thunk_type == ThunkType.NONE: continue - prefix = "thunk32_" if vk_func.thunk_type == ThunkType.PUBLIC else "wine_" - f.write(" {1}{0},\n".format(vk_func.name, prefix)) + f.write(" {1}{0},\n".format(vk_func.name, "thunk32_")) f.write("};\n") f.write("C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == unix_count);\n\n") @@ -2860,7 +2863,7 @@ class VkGenerator(object): if vk_func.needs_thunk() and not vk_func.needs_private_thunk(): continue - f.write("NTSTATUS {0}{1}(void *args) DECLSPEC_HIDDEN;\n".format(prefix, vk_func.name)) + f.write("{0};\n".format(vk_func.prototype(prefix=prefix, postfix="DECLSPEC_HIDDEN", is_thunk=True))) f.write("\n") f.write("/* Private thunks */\n") diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 7bc8712d7ca..c12bce4614d 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -645,12 +645,10 @@ static void wine_vk_instance_free(struct wine_instance *instance) free(instance); } -NTSTATUS wine_vkAllocateCommandBuffers(void *args) +VkResult wine_vkAllocateCommandBuffers(VkDevice handle, const VkCommandBufferAllocateInfo *allocate_info, + VkCommandBuffer *buffers ) { - struct vkAllocateCommandBuffers_params *params = args; - struct wine_device *device = wine_device_from_handle(params->device); - const VkCommandBufferAllocateInfo *allocate_info = params->pAllocateInfo; - VkCommandBuffer *buffers = params->pCommandBuffers; + struct wine_device *device = wine_device_from_handle(handle); struct wine_cmd_buffer *buffer; struct wine_cmd_pool *pool; VkResult res = VK_SUCCESS; @@ -701,14 +699,12 @@ NTSTATUS wine_vkAllocateCommandBuffers(void *args) return res; } -NTSTATUS wine_vkCreateDevice(void *args) +VkResult wine_vkCreateDevice(VkPhysicalDevice phys_dev_handle, const VkDeviceCreateInfo *create_info, + const VkAllocationCallbacks *allocator, VkDevice *ret_device, + void *client_ptr) { - struct vkCreateDevice_params *params = args; - struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(params->physicalDevice); - const VkDeviceCreateInfo *create_info = params->pCreateInfo; - const VkAllocationCallbacks *allocator = params->pAllocator; - VkDevice *ret_device = params->pDevice; - VkDevice device_handle = params->client_ptr; + struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(phys_dev_handle); + VkDevice device_handle = client_ptr; VkDeviceCreateInfo create_info_host; struct VkQueue_T *queue_handles; struct wine_queue *next_queue; @@ -716,7 +712,7 @@ NTSTATUS wine_vkCreateDevice(void *args) unsigned int i; VkResult res; - TRACE("%p, %p, %p, %p\n", phys_dev, create_info, allocator, ret_device); + TRACE("%p, %p, %p, %p\n", phys_dev_handle, create_info, allocator, ret_device); if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); @@ -801,13 +797,11 @@ fail: return res; } -NTSTATUS wine_vkCreateInstance(void *args) +VkResult wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, + const VkAllocationCallbacks *allocator, VkInstance *instance, + void *client_ptr) { - struct vkCreateInstance_params *params = args; - const VkInstanceCreateInfo *create_info = params->pCreateInfo; - const VkAllocationCallbacks *allocator = params->pAllocator; - VkInstance *instance = params->pInstance; - VkInstance client_instance = params->client_ptr; + VkInstance client_instance = client_ptr; VkInstanceCreateInfo create_info_host; const VkApplicationInfo *app_info; struct wine_instance *object; @@ -885,11 +879,9 @@ NTSTATUS wine_vkCreateInstance(void *args) return VK_SUCCESS; } -NTSTATUS wine_vkDestroyDevice(void *args) +void wine_vkDestroyDevice(VkDevice handle, const VkAllocationCallbacks *allocator) { - struct vkDestroyDevice_params *params = args; - struct wine_device *device = wine_device_from_handle(params->device); - const VkAllocationCallbacks *allocator = params->pAllocator; + struct wine_device *device = wine_device_from_handle(handle); TRACE("%p %p\n", device, allocator); @@ -897,14 +889,11 @@ NTSTATUS wine_vkDestroyDevice(void *args) FIXME("Support for allocation callbacks not implemented yet\n"); wine_vk_device_free(device); - return STATUS_SUCCESS; } -NTSTATUS wine_vkDestroyInstance(void *args) +void wine_vkDestroyInstance(VkInstance handle, const VkAllocationCallbacks *allocator) { - struct vkDestroyInstance_params *params = args; - struct wine_instance *instance = wine_instance_from_handle(params->instance); - const VkAllocationCallbacks *allocator = params->pAllocator; + struct wine_instance *instance = wine_instance_from_handle(handle); TRACE("%p, %p\n", instance, allocator); @@ -912,16 +901,12 @@ NTSTATUS wine_vkDestroyInstance(void *args) FIXME("Support allocation allocators\n"); wine_vk_instance_free(instance); - return STATUS_SUCCESS; } -NTSTATUS wine_vkEnumerateDeviceExtensionProperties(void *args) +VkResult wine_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice phys_dev_handle, const char *layer_name, + uint32_t *count, VkExtensionProperties *properties) { - struct vkEnumerateDeviceExtensionProperties_params *params = args; - struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(params->physicalDevice); - const char *layer_name = params->pLayerName; - uint32_t *count = params->pPropertyCount; - VkExtensionProperties *properties = params->pProperties; + struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(phys_dev_handle); TRACE("%p, %p, %p, %p\n", phys_dev, layer_name, count, properties); @@ -945,11 +930,9 @@ NTSTATUS wine_vkEnumerateDeviceExtensionProperties(void *args) return *count < phys_dev->extension_count ? VK_INCOMPLETE : VK_SUCCESS; } -NTSTATUS wine_vkEnumerateInstanceExtensionProperties(void *args) +VkResult wine_vkEnumerateInstanceExtensionProperties(const char *name, uint32_t *count, + VkExtensionProperties *properties) { - struct vkEnumerateInstanceExtensionProperties_params *params = args; - uint32_t *count = params->pPropertyCount; - VkExtensionProperties *properties = params->pProperties; uint32_t num_properties = 0, num_host_properties; VkExtensionProperties *host_properties; unsigned int i, j; @@ -1004,21 +987,17 @@ NTSTATUS wine_vkEnumerateInstanceExtensionProperties(void *args) return *count < num_properties ? VK_INCOMPLETE : VK_SUCCESS; } -NTSTATUS wine_vkEnumerateDeviceLayerProperties(void *args) +VkResult wine_vkEnumerateDeviceLayerProperties(VkPhysicalDevice phys_dev, uint32_t *count, + VkLayerProperties *properties) { - struct vkEnumerateDeviceLayerProperties_params *params = args; - uint32_t *count = params->pPropertyCount; - - TRACE("%p, %p, %p\n", params->physicalDevice, count, params->pProperties); + TRACE("%p, %p, %p\n", phys_dev, count, properties); *count = 0; return VK_SUCCESS; } -NTSTATUS wine_vkEnumerateInstanceVersion(void *args) +VkResult wine_vkEnumerateInstanceVersion(uint32_t *version) { - struct vkEnumerateInstanceVersion_params *params = args; - uint32_t *version = params->pApiVersion; VkResult res; static VkResult (*p_vkEnumerateInstanceVersion)(uint32_t *version); @@ -1041,12 +1020,9 @@ NTSTATUS wine_vkEnumerateInstanceVersion(void *args) return res; } -NTSTATUS wine_vkEnumeratePhysicalDevices(void *args) +VkResult wine_vkEnumeratePhysicalDevices(VkInstance handle, uint32_t *count, VkPhysicalDevice *devices) { - struct vkEnumeratePhysicalDevices_params *params = args; - struct wine_instance *instance = wine_instance_from_handle(params->instance); - uint32_t *count = params->pPhysicalDeviceCount; - VkPhysicalDevice *devices = params->pPhysicalDevices; + struct wine_instance *instance = wine_instance_from_handle(handle); unsigned int i; TRACE("%p %p %p\n", instance, count, devices); @@ -1067,18 +1043,15 @@ NTSTATUS wine_vkEnumeratePhysicalDevices(void *args) return *count < instance->phys_dev_count ? VK_INCOMPLETE : VK_SUCCESS; } -NTSTATUS wine_vkFreeCommandBuffers(void *args) +void wine_vkFreeCommandBuffers(VkDevice handle, VkCommandPool command_pool, uint32_t count, + const VkCommandBuffer *buffers) { - struct vkFreeCommandBuffers_params *params = args; - struct wine_device *device = wine_device_from_handle(params->device); - struct wine_cmd_pool *pool = wine_cmd_pool_from_handle(params->commandPool); - uint32_t count = params->commandBufferCount; - const VkCommandBuffer *buffers = params->pCommandBuffers; + struct wine_device *device = wine_device_from_handle(handle); + struct wine_cmd_pool *pool = wine_cmd_pool_from_handle(command_pool); - TRACE("%p, 0x%s, %u, %p\n", device, wine_dbgstr_longlong(params->commandPool), count, buffers); + TRACE("%p, 0x%s, %u, %p\n", device, wine_dbgstr_longlong(command_pool), count, buffers); wine_vk_free_command_buffers(device, pool, count, buffers); - return STATUS_SUCCESS; } static VkQueue wine_vk_device_find_queue(VkDevice handle, const VkDeviceQueueInfo2 *info) @@ -1101,13 +1074,8 @@ static VkQueue wine_vk_device_find_queue(VkDevice handle, const VkDeviceQueueInf return VK_NULL_HANDLE; } -NTSTATUS wine_vkGetDeviceQueue(void *args) +void wine_vkGetDeviceQueue(VkDevice device, uint32_t family_index, uint32_t queue_index, VkQueue *queue) { - struct vkGetDeviceQueue_params *params = args; - VkDevice device = params->device; - uint32_t family_index = params->queueFamilyIndex; - uint32_t queue_index = params->queueIndex; - VkQueue *queue = params->pQueue; VkDeviceQueueInfo2 queue_info; TRACE("%p, %u, %u, %p\n", device, family_index, queue_index, queue); @@ -1119,15 +1087,10 @@ NTSTATUS wine_vkGetDeviceQueue(void *args) queue_info.queueIndex = queue_index; *queue = wine_vk_device_find_queue(device, &queue_info); - return STATUS_SUCCESS; } -NTSTATUS wine_vkGetDeviceQueue2(void *args) +void wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *info, VkQueue *queue) { - struct vkGetDeviceQueue2_params *params = args; - VkDevice device = params->device; - const VkDeviceQueueInfo2 *info = params->pQueueInfo; - VkQueue *queue = params->pQueue; const VkBaseInStructure *chain; TRACE("%p, %p, %p\n", device, info, queue); @@ -1136,17 +1099,14 @@ NTSTATUS wine_vkGetDeviceQueue2(void *args) FIXME("Ignoring a linked structure of type %u.\n", chain->sType); *queue = wine_vk_device_find_queue(device, info); - return STATUS_SUCCESS; } -NTSTATUS wine_vkCreateCommandPool(void *args) +VkResult wine_vkCreateCommandPool(VkDevice device_handle, const VkCommandPoolCreateInfo *info, + const VkAllocationCallbacks *allocator, VkCommandPool *command_pool, + void *client_ptr) { - struct vkCreateCommandPool_params *params = args; - struct wine_device *device = wine_device_from_handle(params->device); - const VkCommandPoolCreateInfo *info = params->pCreateInfo; - const VkAllocationCallbacks *allocator = params->pAllocator; - VkCommandPool *command_pool = params->pCommandPool; - struct vk_command_pool *handle = params->client_ptr; + struct wine_device *device = wine_device_from_handle(device_handle); + struct vk_command_pool *handle = client_ptr; struct wine_cmd_pool *object; VkResult res; @@ -1176,12 +1136,10 @@ NTSTATUS wine_vkCreateCommandPool(void *args) return res; } -NTSTATUS wine_vkDestroyCommandPool(void *args) +void wine_vkDestroyCommandPool(VkDevice device_handle, VkCommandPool handle, + const VkAllocationCallbacks *allocator) { - struct vkDestroyCommandPool_params *params = args; - struct wine_device *device = wine_device_from_handle(params->device); - VkCommandPool handle = params->commandPool; - const VkAllocationCallbacks *allocator = params->pAllocator; + struct wine_device *device = wine_device_from_handle(device_handle); struct wine_cmd_pool *pool = wine_cmd_pool_from_handle(handle); TRACE("%p, 0x%s, %p\n", device, wine_dbgstr_longlong(handle), allocator); @@ -1193,7 +1151,6 @@ NTSTATUS wine_vkDestroyCommandPool(void *args) device->funcs.p_vkDestroyCommandPool(device->device, pool->command_pool, NULL); free(pool); - return STATUS_SUCCESS; } static VkResult wine_vk_enumerate_physical_device_groups(struct wine_instance *instance, @@ -1223,88 +1180,66 @@ static VkResult wine_vk_enumerate_physical_device_groups(struct wine_instance *i return res; } -NTSTATUS wine_vkEnumeratePhysicalDeviceGroups(void *args) +VkResult wine_vkEnumeratePhysicalDeviceGroups(VkInstance handle, uint32_t *count, + VkPhysicalDeviceGroupProperties *properties) { - struct vkEnumeratePhysicalDeviceGroups_params *params = args; - struct wine_instance *instance = wine_instance_from_handle(params->instance); - uint32_t *count = params->pPhysicalDeviceGroupCount; - VkPhysicalDeviceGroupProperties *properties = params->pPhysicalDeviceGroupProperties; + struct wine_instance *instance = wine_instance_from_handle(handle); TRACE("%p, %p, %p\n", instance, count, properties); return wine_vk_enumerate_physical_device_groups(instance, instance->funcs.p_vkEnumeratePhysicalDeviceGroups, count, properties); } -NTSTATUS wine_vkEnumeratePhysicalDeviceGroupsKHR(void *args) +VkResult wine_vkEnumeratePhysicalDeviceGroupsKHR(VkInstance handle, uint32_t *count, + VkPhysicalDeviceGroupProperties *properties) { - struct vkEnumeratePhysicalDeviceGroupsKHR_params *params = args; - struct wine_instance *instance = wine_instance_from_handle(params->instance); - uint32_t *count = params->pPhysicalDeviceGroupCount; - VkPhysicalDeviceGroupProperties *properties = params->pPhysicalDeviceGroupProperties; + struct wine_instance *instance = wine_instance_from_handle(handle); TRACE("%p, %p, %p\n", instance, count, properties); return wine_vk_enumerate_physical_device_groups(instance, instance->funcs.p_vkEnumeratePhysicalDeviceGroupsKHR, count, properties); } -NTSTATUS wine_vkGetPhysicalDeviceExternalFenceProperties(void *args) +void wine_vkGetPhysicalDeviceExternalFenceProperties(VkPhysicalDevice phys_dev, + const VkPhysicalDeviceExternalFenceInfo *fence_info, + VkExternalFenceProperties *properties) { - struct vkGetPhysicalDeviceExternalFenceProperties_params *params = args; - VkPhysicalDevice phys_dev = params->physicalDevice; - const VkPhysicalDeviceExternalFenceInfo *fence_info = params->pExternalFenceInfo; - VkExternalFenceProperties *properties = params->pExternalFenceProperties; - TRACE("%p, %p, %p\n", phys_dev, fence_info, properties); properties->exportFromImportedHandleTypes = 0; properties->compatibleHandleTypes = 0; properties->externalFenceFeatures = 0; - return STATUS_SUCCESS; } -NTSTATUS wine_vkGetPhysicalDeviceExternalFencePropertiesKHR(void *args) +void wine_vkGetPhysicalDeviceExternalFencePropertiesKHR(VkPhysicalDevice phys_dev, + const VkPhysicalDeviceExternalFenceInfo *fence_info, + VkExternalFenceProperties *properties) { - struct vkGetPhysicalDeviceExternalFencePropertiesKHR_params *params = args; - VkPhysicalDevice phys_dev = params->physicalDevice; - const VkPhysicalDeviceExternalFenceInfo *fence_info = params->pExternalFenceInfo; - VkExternalFenceProperties *properties = params->pExternalFenceProperties; - TRACE("%p, %p, %p\n", phys_dev, fence_info, properties); properties->exportFromImportedHandleTypes = 0; properties->compatibleHandleTypes = 0; properties->externalFenceFeatures = 0; - return STATUS_SUCCESS; } -NTSTATUS wine_vkGetPhysicalDeviceExternalBufferProperties(void *args) +void wine_vkGetPhysicalDeviceExternalBufferProperties(VkPhysicalDevice phys_dev, + const VkPhysicalDeviceExternalBufferInfo *buffer_info, + VkExternalBufferProperties *properties) { - struct vkGetPhysicalDeviceExternalBufferProperties_params *params = args; - VkPhysicalDevice phys_dev = params->physicalDevice; - const VkPhysicalDeviceExternalBufferInfo *buffer_info = params->pExternalBufferInfo; - VkExternalBufferProperties *properties = params->pExternalBufferProperties; - TRACE("%p, %p, %p\n", phys_dev, buffer_info, properties); memset(&properties->externalMemoryProperties, 0, sizeof(properties->externalMemoryProperties)); - return STATUS_SUCCESS; } -NTSTATUS wine_vkGetPhysicalDeviceExternalBufferPropertiesKHR(void *args) +void wine_vkGetPhysicalDeviceExternalBufferPropertiesKHR(VkPhysicalDevice phys_dev, + const VkPhysicalDeviceExternalBufferInfo *buffer_info, + VkExternalBufferProperties *properties) { - struct vkGetPhysicalDeviceExternalBufferPropertiesKHR_params *params = args; - VkPhysicalDevice phys_dev = params->physicalDevice; - const VkPhysicalDeviceExternalBufferInfo *buffer_info = params->pExternalBufferInfo; - VkExternalBufferProperties *properties = params->pExternalBufferProperties; - TRACE("%p, %p, %p\n", phys_dev, buffer_info, properties); memset(&properties->externalMemoryProperties, 0, sizeof(properties->externalMemoryProperties)); - return STATUS_SUCCESS; } -NTSTATUS wine_vkGetPhysicalDeviceImageFormatProperties2(void *args) +VkResult wine_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice phys_dev, + const VkPhysicalDeviceImageFormatInfo2 *format_info, + VkImageFormatProperties2 *properties) { - struct vkGetPhysicalDeviceImageFormatProperties2_params *params = args; - VkPhysicalDevice phys_dev = params->physicalDevice; - const VkPhysicalDeviceImageFormatInfo2 *format_info = params->pImageFormatInfo; - VkImageFormatProperties2 *properties = params->pImageFormatProperties; VkExternalImageFormatProperties *external_image_properties; VkResult res; @@ -1323,12 +1258,10 @@ NTSTATUS wine_vkGetPhysicalDeviceImageFormatProperties2(void *args) return res; } -NTSTATUS wine_vkGetPhysicalDeviceImageFormatProperties2KHR(void *args) +VkResult wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice phys_dev, + const VkPhysicalDeviceImageFormatInfo2 *format_info, + VkImageFormatProperties2 *properties) { - struct vkGetPhysicalDeviceImageFormatProperties2KHR_params *params = args; - VkPhysicalDevice phys_dev = params->physicalDevice; - const VkPhysicalDeviceImageFormatInfo2 *format_info = params->pImageFormatInfo; - VkImageFormatProperties2 *properties = params->pImageFormatProperties; VkExternalImageFormatProperties *external_image_properties; VkResult res; @@ -1393,14 +1326,11 @@ static inline uint64_t convert_timestamp(VkTimeDomainEXT host_domain, VkTimeDoma return value; } -NTSTATUS wine_vkGetCalibratedTimestampsEXT(void *args) +VkResult wine_vkGetCalibratedTimestampsEXT(VkDevice handle, uint32_t timestamp_count, + const VkCalibratedTimestampInfoEXT *timestamp_infos, + uint64_t *timestamps, uint64_t *max_deviation) { - struct vkGetCalibratedTimestampsEXT_params *params = args; - struct wine_device *device = wine_device_from_handle(params->device); - uint32_t timestamp_count = params->timestampCount; - const VkCalibratedTimestampInfoEXT *timestamp_infos = params->pTimestampInfos; - uint64_t *timestamps = params->pTimestamps; - uint64_t *max_deviation = params->pMaxDeviation; + struct wine_device *device = wine_device_from_handle(handle); VkCalibratedTimestampInfoEXT* host_timestamp_infos; unsigned int i; VkResult res; @@ -1428,12 +1358,11 @@ NTSTATUS wine_vkGetCalibratedTimestampsEXT(void *args) return res; } -NTSTATUS wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(void *args) +VkResult wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDevice handle, + uint32_t *time_domain_count, + VkTimeDomainEXT *time_domains) { - struct vkGetPhysicalDeviceCalibrateableTimeDomainsEXT_params *params = args; - struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(params->physicalDevice); - uint32_t *time_domain_count = params->pTimeDomainCount; - VkTimeDomainEXT *time_domains = params->pTimeDomains; + struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(handle); BOOL supports_device = FALSE, supports_monotonic = FALSE, supports_monotonic_raw = FALSE; const VkTimeDomainEXT performance_counter_domain = get_performance_counter_time_domain(); VkTimeDomainEXT *host_time_domains; @@ -1503,41 +1432,30 @@ NTSTATUS wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(void *args) return res; } -NTSTATUS wine_vkGetPhysicalDeviceExternalSemaphoreProperties(void *args) +void wine_vkGetPhysicalDeviceExternalSemaphoreProperties(VkPhysicalDevice phys_dev, + const VkPhysicalDeviceExternalSemaphoreInfo *info, + VkExternalSemaphoreProperties *properties) { - struct vkGetPhysicalDeviceExternalSemaphoreProperties_params *params = args; - VkPhysicalDevice phys_dev = params->physicalDevice; - const VkPhysicalDeviceExternalSemaphoreInfo *semaphore_info = params->pExternalSemaphoreInfo; - VkExternalSemaphoreProperties *properties = params->pExternalSemaphoreProperties; - - TRACE("%p, %p, %p\n", phys_dev, semaphore_info, properties); + TRACE("%p, %p, %p\n", phys_dev, info, properties); properties->exportFromImportedHandleTypes = 0; properties->compatibleHandleTypes = 0; properties->externalSemaphoreFeatures = 0; - return STATUS_SUCCESS; } -NTSTATUS wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(void *args) +void wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(VkPhysicalDevice phys_dev, + const VkPhysicalDeviceExternalSemaphoreInfo *info, + VkExternalSemaphoreProperties *properties) { - struct vkGetPhysicalDeviceExternalSemaphorePropertiesKHR_params *params = args; - VkPhysicalDevice phys_dev = params->physicalDevice; - const VkPhysicalDeviceExternalSemaphoreInfo *semaphore_info = params->pExternalSemaphoreInfo; - VkExternalSemaphoreProperties *properties = params->pExternalSemaphoreProperties; - - TRACE("%p, %p, %p\n", phys_dev, semaphore_info, properties); + TRACE("%p, %p, %p\n", phys_dev, info, properties); properties->exportFromImportedHandleTypes = 0; properties->compatibleHandleTypes = 0; properties->externalSemaphoreFeatures = 0; - return STATUS_SUCCESS; } -NTSTATUS wine_vkCreateWin32SurfaceKHR(void *args) +VkResult wine_vkCreateWin32SurfaceKHR(VkInstance handle, const VkWin32SurfaceCreateInfoKHR *createInfo, + const VkAllocationCallbacks *allocator, VkSurfaceKHR *surface) { - struct vkCreateWin32SurfaceKHR_params *params = args; - struct wine_instance *instance = wine_instance_from_handle(params->instance); - const VkWin32SurfaceCreateInfoKHR *createInfo = params->pCreateInfo; - const VkAllocationCallbacks *allocator = params->pAllocator; - VkSurfaceKHR *surface = params->pSurface; + struct wine_instance *instance = wine_instance_from_handle(handle); struct wine_surface *object; VkResult res; @@ -1568,24 +1486,21 @@ NTSTATUS wine_vkCreateWin32SurfaceKHR(void *args) return VK_SUCCESS; } -NTSTATUS wine_vkDestroySurfaceKHR(void *args) +void wine_vkDestroySurfaceKHR(VkInstance handle, VkSurfaceKHR surface, + const VkAllocationCallbacks *allocator) { - struct vkDestroySurfaceKHR_params *params = args; - struct wine_instance *instance = wine_instance_from_handle(params->instance); - VkSurfaceKHR surface = params->surface; - const VkAllocationCallbacks *allocator = params->pAllocator; + struct wine_instance *instance = wine_instance_from_handle(handle); struct wine_surface *object = wine_surface_from_handle(surface); TRACE("%p, 0x%s, %p\n", instance, wine_dbgstr_longlong(surface), allocator); if (!object) - return STATUS_SUCCESS; + return; instance->funcs.p_vkDestroySurfaceKHR(instance->instance, object->driver_surface, NULL); WINE_VK_REMOVE_HANDLE_MAPPING(instance, object); free(object); - return STATUS_SUCCESS; } static inline void adjust_max_image_count(struct wine_phys_dev *phys_dev, VkSurfaceCapabilitiesKHR* capabilities) @@ -1603,12 +1518,10 @@ static inline void adjust_max_image_count(struct wine_phys_dev *phys_dev, VkSurf } } -NTSTATUS wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(void *args) +VkResult wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice handle, VkSurfaceKHR surface, + VkSurfaceCapabilitiesKHR *capabilities) { - struct vkGetPhysicalDeviceSurfaceCapabilitiesKHR_params *params = args; - struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(params->physicalDevice); - VkSurfaceKHR surface = params->surface; - VkSurfaceCapabilitiesKHR *capabilities = params->pSurfaceCapabilities; + struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(handle); VkResult res; TRACE("%p, 0x%s, %p\n", phys_dev, wine_dbgstr_longlong(surface), capabilities); @@ -1621,12 +1534,11 @@ NTSTATUS wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(void *args) return res; } -NTSTATUS wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(void *args) +VkResult wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice handle, + const VkPhysicalDeviceSurfaceInfo2KHR *surface_info, + VkSurfaceCapabilities2KHR *capabilities) { - struct vkGetPhysicalDeviceSurfaceCapabilities2KHR_params *params = args; - struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(params->physicalDevice); - const VkPhysicalDeviceSurfaceInfo2KHR *surface_info = params->pSurfaceInfo; - VkSurfaceCapabilities2KHR *capabilities = params->pSurfaceCapabilities; + struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(handle); VkResult res; TRACE("%p, %p, %p\n", phys_dev, surface_info, capabilities); @@ -1639,13 +1551,12 @@ NTSTATUS wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(void *args) return res; } -NTSTATUS wine_vkCreateDebugUtilsMessengerEXT(void *args) +VkResult wine_vkCreateDebugUtilsMessengerEXT(VkInstance handle, + const VkDebugUtilsMessengerCreateInfoEXT *create_info, + const VkAllocationCallbacks *allocator, + VkDebugUtilsMessengerEXT *messenger) { - struct vkCreateDebugUtilsMessengerEXT_params *params = args; - struct wine_instance *instance = wine_instance_from_handle(params->instance); - const VkDebugUtilsMessengerCreateInfoEXT *create_info = params->pCreateInfo; - const VkAllocationCallbacks *allocator = params->pAllocator; - VkDebugUtilsMessengerEXT *messenger = params->pMessenger; + struct wine_instance *instance = wine_instance_from_handle(handle); VkDebugUtilsMessengerCreateInfoEXT wine_create_info; struct wine_debug_utils_messenger *object; VkResult res; @@ -1681,12 +1592,10 @@ NTSTATUS wine_vkCreateDebugUtilsMessengerEXT(void *args) return VK_SUCCESS; } -NTSTATUS wine_vkDestroyDebugUtilsMessengerEXT(void *args) +void wine_vkDestroyDebugUtilsMessengerEXT(VkInstance handle, VkDebugUtilsMessengerEXT messenger, + const VkAllocationCallbacks *allocator) { - struct vkDestroyDebugUtilsMessengerEXT_params *params = args; - struct wine_instance *instance = wine_instance_from_handle(params->instance); - VkDebugUtilsMessengerEXT messenger = params->messenger; - const VkAllocationCallbacks *allocator = params->pAllocator; + struct wine_instance *instance = wine_instance_from_handle(handle); struct wine_debug_utils_messenger *object; TRACE("%p, 0x%s, %p\n", instance, wine_dbgstr_longlong(messenger), allocator); @@ -1694,22 +1603,20 @@ NTSTATUS wine_vkDestroyDebugUtilsMessengerEXT(void *args) object = wine_debug_utils_messenger_from_handle(messenger); if (!object) - return STATUS_SUCCESS; + return; instance->funcs.p_vkDestroyDebugUtilsMessengerEXT(instance->instance, object->debug_messenger, NULL); WINE_VK_REMOVE_HANDLE_MAPPING(instance, object); free(object); - return STATUS_SUCCESS; } -NTSTATUS wine_vkCreateDebugReportCallbackEXT(void *args) +VkResult wine_vkCreateDebugReportCallbackEXT(VkInstance handle, + const VkDebugReportCallbackCreateInfoEXT *create_info, + const VkAllocationCallbacks *allocator, + VkDebugReportCallbackEXT *callback) { - struct vkCreateDebugReportCallbackEXT_params *params = args; - struct wine_instance *instance = wine_instance_from_handle(params->instance); - const VkDebugReportCallbackCreateInfoEXT *create_info = params->pCreateInfo; - const VkAllocationCallbacks *allocator = params->pAllocator; - VkDebugReportCallbackEXT *callback = params->pCallback; + struct wine_instance *instance = wine_instance_from_handle(handle); VkDebugReportCallbackCreateInfoEXT wine_create_info; struct wine_debug_report_callback *object; VkResult res; @@ -1745,12 +1652,10 @@ NTSTATUS wine_vkCreateDebugReportCallbackEXT(void *args) return VK_SUCCESS; } -NTSTATUS wine_vkDestroyDebugReportCallbackEXT(void *args) +void wine_vkDestroyDebugReportCallbackEXT(VkInstance handle, VkDebugReportCallbackEXT callback, + const VkAllocationCallbacks *allocator) { - struct vkDestroyDebugReportCallbackEXT_params *params = args; - struct wine_instance *instance = wine_instance_from_handle(params->instance); - VkDebugReportCallbackEXT callback = params->callback; - const VkAllocationCallbacks *allocator = params->pAllocator; + struct wine_instance *instance = wine_instance_from_handle(handle); struct wine_debug_report_callback *object; TRACE("%p, 0x%s, %p\n", instance, wine_dbgstr_longlong(callback), allocator); @@ -1758,14 +1663,13 @@ NTSTATUS wine_vkDestroyDebugReportCallbackEXT(void *args) object = wine_debug_report_callback_from_handle(callback); if (!object) - return STATUS_SUCCESS; + return; instance->funcs.p_vkDestroyDebugReportCallbackEXT(instance->instance, object->debug_callback, NULL); WINE_VK_REMOVE_HANDLE_MAPPING(instance, object); free(object); - return STATUS_SUCCESS; } static void fixup_pipeline_feedback(VkPipelineCreationFeedback *feedback, uint32_t count) @@ -1802,75 +1706,79 @@ static void fixup_pipeline_feedback_info(const void *pipeline_info) feedback->pipelineStageCreationFeedbackCount); } -NTSTATUS wine_vkCreateComputePipelines(void *args) +VkResult wine_vkCreateComputePipelines(VkDevice device, VkPipelineCache pipeline_cache, + uint32_t count, const VkComputePipelineCreateInfo *create_infos, + const VkAllocationCallbacks *allocator, VkPipeline *pipelines) { - struct vkCreateComputePipelines_params *params = args; VkResult res; uint32_t i; - TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), - params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + TRACE("%p, 0x%s, %u, %p, %p, %p\n", device, wine_dbgstr_longlong(pipeline_cache), + count, create_infos, allocator, pipelines); - res = thunk_vkCreateComputePipelines(params->device, params->pipelineCache, - params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + res = thunk_vkCreateComputePipelines(device, pipeline_cache, count, create_infos, + allocator, pipelines); - for (i = 0; i < params->createInfoCount; i++) - fixup_pipeline_feedback_info(¶ms->pCreateInfos[i]); + for (i = 0; i < count; i++) + fixup_pipeline_feedback_info(&create_infos[i]); return res; } -NTSTATUS wine_vkCreateGraphicsPipelines(void *args) +VkResult wine_vkCreateGraphicsPipelines(VkDevice device, VkPipelineCache pipeline_cache, + uint32_t count, const VkGraphicsPipelineCreateInfo *create_infos, + const VkAllocationCallbacks *allocator, VkPipeline *pipelines) { - struct vkCreateGraphicsPipelines_params *params = args; VkResult res; uint32_t i; - TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), - params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + TRACE("%p, 0x%s, %u, %p, %p, %p\n", device, wine_dbgstr_longlong(pipeline_cache), + count, create_infos, allocator, pipelines); - res = thunk_vkCreateGraphicsPipelines(params->device, params->pipelineCache, - params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + res = thunk_vkCreateGraphicsPipelines(device, pipeline_cache, count, create_infos, + allocator, pipelines); - for (i = 0; i < params->createInfoCount; i++) - fixup_pipeline_feedback_info(¶ms->pCreateInfos[i]); + for (i = 0; i < count; i++) + fixup_pipeline_feedback_info(&create_infos[i]); return res; } -NTSTATUS wine_vkCreateRayTracingPipelinesKHR(void *args) +VkResult wine_vkCreateRayTracingPipelinesKHR(VkDevice device, VkDeferredOperationKHR deferred_operation, + VkPipelineCache pipeline_cache, uint32_t count, + const VkRayTracingPipelineCreateInfoKHR *create_infos, + const VkAllocationCallbacks *allocator, VkPipeline *pipelines) { - struct vkCreateRayTracingPipelinesKHR_params *params = args; VkResult res; uint32_t i; - TRACE("%p, 0x%s, 0x%s, %u, %p, %p, %p\n", params->device, - wine_dbgstr_longlong(params->deferredOperation), wine_dbgstr_longlong(params->pipelineCache), - params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + TRACE("%p, 0x%s, 0x%s, %u, %p, %p, %p\n", device, wine_dbgstr_longlong(deferred_operation), + wine_dbgstr_longlong(pipeline_cache), count, create_infos, allocator, pipelines); - res = thunk_vkCreateRayTracingPipelinesKHR(params->device, params->deferredOperation, params->pipelineCache, - params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + res = thunk_vkCreateRayTracingPipelinesKHR(device, deferred_operation, pipeline_cache, + count, create_infos, allocator, pipelines); - for (i = 0; i < params->createInfoCount; i++) - fixup_pipeline_feedback_info(¶ms->pCreateInfos[i]); + for (i = 0; i < count; i++) + fixup_pipeline_feedback_info(&create_infos[i]); return res; } -NTSTATUS wine_vkCreateRayTracingPipelinesNV(void *args) +VkResult wine_vkCreateRayTracingPipelinesNV(VkDevice device, VkPipelineCache pipeline_cache, uint32_t count, + const VkRayTracingPipelineCreateInfoNV *create_infos, + const VkAllocationCallbacks *allocator, VkPipeline *pipelines) { - struct vkCreateRayTracingPipelinesNV_params *params = args; VkResult res; uint32_t i; - TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), - params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + TRACE("%p, 0x%s, %u, %p, %p, %p\n", device, wine_dbgstr_longlong(pipeline_cache), + count, create_infos, allocator, pipelines); - res = thunk_vkCreateRayTracingPipelinesNV(params->device, params->pipelineCache, - params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + res = thunk_vkCreateRayTracingPipelinesNV(device, pipeline_cache, count, create_infos, + allocator, pipelines); - for (i = 0; i < params->createInfoCount; i++) - fixup_pipeline_feedback_info(¶ms->pCreateInfos[i]); + for (i = 0; i < count; i++) + fixup_pipeline_feedback_info(&create_infos[i]); return res; } diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index f186ed54b31..54bdb35b65e 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -5287,7 +5287,6 @@ static NTSTATUS thunk64_vkAcquireNextImage2KHR(void *args) TRACE("%p, %p, %p\n", params->device, params->pAcquireInfo, params->pImageIndex); result = wine_device_from_handle(params->device)->funcs.p_vkAcquireNextImage2KHR(wine_device_from_handle(params->device)->device, params->pAcquireInfo, params->pImageIndex); - return result; } @@ -5302,7 +5301,6 @@ static NTSTATUS thunk32_vkAcquireNextImage2KHR(void *args) convert_VkAcquireNextImageInfoKHR_win_to_host(params->pAcquireInfo, &pAcquireInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkAcquireNextImage2KHR(wine_device_from_handle(params->device)->device, &pAcquireInfo_host, params->pImageIndex); - return result; } @@ -5317,7 +5315,6 @@ static NTSTATUS thunk64_vkAcquireNextImageKHR(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->swapchain), wine_dbgstr_longlong(params->timeout), wine_dbgstr_longlong(params->semaphore), wine_dbgstr_longlong(params->fence), params->pImageIndex); result = wine_device_from_handle(params->device)->funcs.p_vkAcquireNextImageKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->timeout, params->semaphore, params->fence, params->pImageIndex); - return result; } @@ -5330,7 +5327,6 @@ static NTSTATUS thunk32_vkAcquireNextImageKHR(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->swapchain), wine_dbgstr_longlong(params->timeout), wine_dbgstr_longlong(params->semaphore), wine_dbgstr_longlong(params->fence), params->pImageIndex); result = wine_device_from_handle(params->device)->funcs.p_vkAcquireNextImageKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->timeout, params->semaphore, params->fence, params->pImageIndex); - return result; } @@ -5345,7 +5341,6 @@ static NTSTATUS thunk64_vkAcquirePerformanceConfigurationINTEL(void *args) TRACE("%p, %p, %p\n", params->device, params->pAcquireInfo, params->pConfiguration); result = wine_device_from_handle(params->device)->funcs.p_vkAcquirePerformanceConfigurationINTEL(wine_device_from_handle(params->device)->device, params->pAcquireInfo, params->pConfiguration); - return result; } @@ -5358,7 +5353,6 @@ static NTSTATUS thunk32_vkAcquirePerformanceConfigurationINTEL(void *args) TRACE("%p, %p, %p\n", params->device, params->pAcquireInfo, params->pConfiguration); result = wine_device_from_handle(params->device)->funcs.p_vkAcquirePerformanceConfigurationINTEL(wine_device_from_handle(params->device)->device, params->pAcquireInfo, params->pConfiguration); - return result; } @@ -5373,7 +5367,6 @@ static NTSTATUS thunk64_vkAcquireProfilingLockKHR(void *args) TRACE("%p, %p\n", params->device, params->pInfo); result = wine_device_from_handle(params->device)->funcs.p_vkAcquireProfilingLockKHR(wine_device_from_handle(params->device)->device, params->pInfo); - return result; } @@ -5388,7 +5381,28 @@ static NTSTATUS thunk32_vkAcquireProfilingLockKHR(void *args) convert_VkAcquireProfilingLockInfoKHR_win_to_host(params->pInfo, &pInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkAcquireProfilingLockKHR(wine_device_from_handle(params->device)->device, &pInfo_host); + return result; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkAllocateCommandBuffers(void *args) +{ + struct vkAllocateCommandBuffers_params *params = args; + VkResult result; + result = wine_vkAllocateCommandBuffers(params->device, params->pAllocateInfo, params->pCommandBuffers); + return result; +} + +#else /* USE_STRUCT_CONVERSION */ +static NTSTATUS thunk32_vkAllocateCommandBuffers(void *args) +{ + struct vkAllocateCommandBuffers_params *params = args; + VkResult result; + result = wine_vkAllocateCommandBuffers(params->device, params->pAllocateInfo, params->pCommandBuffers); return result; } @@ -5403,7 +5417,6 @@ static NTSTATUS thunk64_vkAllocateDescriptorSets(void *args) TRACE("%p, %p, %p\n", params->device, params->pAllocateInfo, params->pDescriptorSets); result = wine_device_from_handle(params->device)->funcs.p_vkAllocateDescriptorSets(wine_device_from_handle(params->device)->device, params->pAllocateInfo, params->pDescriptorSets); - return result; } @@ -5418,7 +5431,6 @@ static NTSTATUS thunk32_vkAllocateDescriptorSets(void *args) convert_VkDescriptorSetAllocateInfo_win_to_host(params->pAllocateInfo, &pAllocateInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkAllocateDescriptorSets(wine_device_from_handle(params->device)->device, &pAllocateInfo_host, params->pDescriptorSets); - return result; } @@ -5433,7 +5445,6 @@ static NTSTATUS thunk64_vkAllocateMemory(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pAllocateInfo, params->pAllocator, params->pMemory); result = wine_device_from_handle(params->device)->funcs.p_vkAllocateMemory(wine_device_from_handle(params->device)->device, params->pAllocateInfo, NULL, params->pMemory); - return result; } @@ -5448,7 +5459,6 @@ static NTSTATUS thunk32_vkAllocateMemory(void *args) convert_VkMemoryAllocateInfo_win_to_host(params->pAllocateInfo, &pAllocateInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkAllocateMemory(wine_device_from_handle(params->device)->device, &pAllocateInfo_host, NULL, params->pMemory); - return result; } @@ -5463,7 +5473,6 @@ static NTSTATUS thunk64_vkBeginCommandBuffer(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pBeginInfo); result = wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkBeginCommandBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pBeginInfo); - return result; } @@ -5478,7 +5487,6 @@ static NTSTATUS thunk32_vkBeginCommandBuffer(void *args) convert_VkCommandBufferBeginInfo_win_to_host(params->pBeginInfo, &pBeginInfo_host); result = wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkBeginCommandBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pBeginInfo_host); - free_VkCommandBufferBeginInfo(&pBeginInfo_host); return result; } @@ -5494,7 +5502,6 @@ static NTSTATUS thunk64_vkBindAccelerationStructureMemoryNV(void *args) TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos); result = wine_device_from_handle(params->device)->funcs.p_vkBindAccelerationStructureMemoryNV(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); - return result; } @@ -5509,7 +5516,6 @@ static NTSTATUS thunk32_vkBindAccelerationStructureMemoryNV(void *args) pBindInfos_host = convert_VkBindAccelerationStructureMemoryInfoNV_array_win_to_host(params->pBindInfos, params->bindInfoCount); result = wine_device_from_handle(params->device)->funcs.p_vkBindAccelerationStructureMemoryNV(wine_device_from_handle(params->device)->device, params->bindInfoCount, pBindInfos_host); - free_VkBindAccelerationStructureMemoryInfoNV_array(pBindInfos_host, params->bindInfoCount); return result; } @@ -5525,7 +5531,6 @@ static NTSTATUS thunk64_vkBindBufferMemory(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s\n", params->device, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->memoryOffset)); result = wine_device_from_handle(params->device)->funcs.p_vkBindBufferMemory(wine_device_from_handle(params->device)->device, params->buffer, params->memory, params->memoryOffset); - return result; } @@ -5538,7 +5543,6 @@ static NTSTATUS thunk32_vkBindBufferMemory(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s\n", params->device, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->memoryOffset)); result = wine_device_from_handle(params->device)->funcs.p_vkBindBufferMemory(wine_device_from_handle(params->device)->device, params->buffer, params->memory, params->memoryOffset); - return result; } @@ -5553,7 +5557,6 @@ static NTSTATUS thunk64_vkBindBufferMemory2(void *args) TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos); result = wine_device_from_handle(params->device)->funcs.p_vkBindBufferMemory2(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); - return result; } @@ -5568,7 +5571,6 @@ static NTSTATUS thunk32_vkBindBufferMemory2(void *args) pBindInfos_host = convert_VkBindBufferMemoryInfo_array_win_to_host(params->pBindInfos, params->bindInfoCount); result = wine_device_from_handle(params->device)->funcs.p_vkBindBufferMemory2(wine_device_from_handle(params->device)->device, params->bindInfoCount, pBindInfos_host); - free_VkBindBufferMemoryInfo_array(pBindInfos_host, params->bindInfoCount); return result; } @@ -5584,7 +5586,6 @@ static NTSTATUS thunk64_vkBindBufferMemory2KHR(void *args) TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos); result = wine_device_from_handle(params->device)->funcs.p_vkBindBufferMemory2KHR(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); - return result; } @@ -5599,7 +5600,6 @@ static NTSTATUS thunk32_vkBindBufferMemory2KHR(void *args) pBindInfos_host = convert_VkBindBufferMemoryInfo_array_win_to_host(params->pBindInfos, params->bindInfoCount); result = wine_device_from_handle(params->device)->funcs.p_vkBindBufferMemory2KHR(wine_device_from_handle(params->device)->device, params->bindInfoCount, pBindInfos_host); - free_VkBindBufferMemoryInfo_array(pBindInfos_host, params->bindInfoCount); return result; } @@ -5615,7 +5615,6 @@ static NTSTATUS thunk64_vkBindImageMemory(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s\n", params->device, wine_dbgstr_longlong(params->image), wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->memoryOffset)); result = wine_device_from_handle(params->device)->funcs.p_vkBindImageMemory(wine_device_from_handle(params->device)->device, params->image, params->memory, params->memoryOffset); - return result; } @@ -5628,7 +5627,6 @@ static NTSTATUS thunk32_vkBindImageMemory(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s\n", params->device, wine_dbgstr_longlong(params->image), wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->memoryOffset)); result = wine_device_from_handle(params->device)->funcs.p_vkBindImageMemory(wine_device_from_handle(params->device)->device, params->image, params->memory, params->memoryOffset); - return result; } @@ -5643,7 +5641,6 @@ static NTSTATUS thunk64_vkBindImageMemory2(void *args) TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos); result = wine_device_from_handle(params->device)->funcs.p_vkBindImageMemory2(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); - return result; } @@ -5658,7 +5655,6 @@ static NTSTATUS thunk32_vkBindImageMemory2(void *args) pBindInfos_host = convert_VkBindImageMemoryInfo_array_win_to_host(params->pBindInfos, params->bindInfoCount); result = wine_device_from_handle(params->device)->funcs.p_vkBindImageMemory2(wine_device_from_handle(params->device)->device, params->bindInfoCount, pBindInfos_host); - free_VkBindImageMemoryInfo_array(pBindInfos_host, params->bindInfoCount); return result; } @@ -5674,7 +5670,6 @@ static NTSTATUS thunk64_vkBindImageMemory2KHR(void *args) TRACE("%p, %u, %p\n", params->device, params->bindInfoCount, params->pBindInfos); result = wine_device_from_handle(params->device)->funcs.p_vkBindImageMemory2KHR(wine_device_from_handle(params->device)->device, params->bindInfoCount, params->pBindInfos); - return result; } @@ -5689,7 +5684,6 @@ static NTSTATUS thunk32_vkBindImageMemory2KHR(void *args) pBindInfos_host = convert_VkBindImageMemoryInfo_array_win_to_host(params->pBindInfos, params->bindInfoCount); result = wine_device_from_handle(params->device)->funcs.p_vkBindImageMemory2KHR(wine_device_from_handle(params->device)->device, params->bindInfoCount, pBindInfos_host); - free_VkBindImageMemoryInfo_array(pBindInfos_host, params->bindInfoCount); return result; } @@ -5705,7 +5699,6 @@ static NTSTATUS thunk64_vkBuildAccelerationStructuresKHR(void *args) TRACE("%p, 0x%s, %u, %p, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->infoCount, params->pInfos, params->ppBuildRangeInfos); result = wine_device_from_handle(params->device)->funcs.p_vkBuildAccelerationStructuresKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, params->infoCount, params->pInfos, params->ppBuildRangeInfos); - return result; } @@ -5720,7 +5713,6 @@ static NTSTATUS thunk32_vkBuildAccelerationStructuresKHR(void *args) pInfos_host = convert_VkAccelerationStructureBuildGeometryInfoKHR_array_win_to_host(params->pInfos, params->infoCount); result = wine_device_from_handle(params->device)->funcs.p_vkBuildAccelerationStructuresKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, params->infoCount, pInfos_host, params->ppBuildRangeInfos); - free_VkAccelerationStructureBuildGeometryInfoKHR_array(pInfos_host, params->infoCount); return result; } @@ -5735,7 +5727,6 @@ static NTSTATUS thunk64_vkCmdBeginConditionalRenderingEXT(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pConditionalRenderingBegin); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginConditionalRenderingEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pConditionalRenderingBegin); - return STATUS_SUCCESS; } @@ -5749,7 +5740,6 @@ static NTSTATUS thunk32_vkCmdBeginConditionalRenderingEXT(void *args) convert_VkConditionalRenderingBeginInfoEXT_win_to_host(params->pConditionalRenderingBegin, &pConditionalRenderingBegin_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginConditionalRenderingEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pConditionalRenderingBegin_host); - return STATUS_SUCCESS; } @@ -5763,7 +5753,6 @@ static NTSTATUS thunk64_vkCmdBeginDebugUtilsLabelEXT(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pLabelInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginDebugUtilsLabelEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pLabelInfo); - return STATUS_SUCCESS; } @@ -5775,7 +5764,6 @@ static NTSTATUS thunk32_vkCmdBeginDebugUtilsLabelEXT(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pLabelInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginDebugUtilsLabelEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pLabelInfo); - return STATUS_SUCCESS; } @@ -5789,7 +5777,6 @@ static NTSTATUS thunk64_vkCmdBeginQuery(void *args) TRACE("%p, 0x%s, %u, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query, params->flags); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginQuery(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->query, params->flags); - return STATUS_SUCCESS; } @@ -5801,7 +5788,6 @@ static NTSTATUS thunk32_vkCmdBeginQuery(void *args) TRACE("%p, 0x%s, %u, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query, params->flags); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginQuery(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->query, params->flags); - return STATUS_SUCCESS; } @@ -5815,7 +5801,6 @@ static NTSTATUS thunk64_vkCmdBeginQueryIndexedEXT(void *args) TRACE("%p, 0x%s, %u, %#x, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query, params->flags, params->index); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginQueryIndexedEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->query, params->flags, params->index); - return STATUS_SUCCESS; } @@ -5827,7 +5812,6 @@ static NTSTATUS thunk32_vkCmdBeginQueryIndexedEXT(void *args) TRACE("%p, 0x%s, %u, %#x, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query, params->flags, params->index); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginQueryIndexedEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->query, params->flags, params->index); - return STATUS_SUCCESS; } @@ -5841,7 +5825,6 @@ static NTSTATUS thunk64_vkCmdBeginRenderPass(void *args) TRACE("%p, %p, %#x\n", params->commandBuffer, params->pRenderPassBegin, params->contents); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderPass(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRenderPassBegin, params->contents); - return STATUS_SUCCESS; } @@ -5855,7 +5838,6 @@ static NTSTATUS thunk32_vkCmdBeginRenderPass(void *args) convert_VkRenderPassBeginInfo_win_to_host(params->pRenderPassBegin, &pRenderPassBegin_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderPass(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pRenderPassBegin_host, params->contents); - return STATUS_SUCCESS; } @@ -5869,7 +5851,6 @@ static NTSTATUS thunk64_vkCmdBeginRenderPass2(void *args) TRACE("%p, %p, %p\n", params->commandBuffer, params->pRenderPassBegin, params->pSubpassBeginInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderPass2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRenderPassBegin, params->pSubpassBeginInfo); - return STATUS_SUCCESS; } @@ -5883,7 +5864,6 @@ static NTSTATUS thunk32_vkCmdBeginRenderPass2(void *args) convert_VkRenderPassBeginInfo_win_to_host(params->pRenderPassBegin, &pRenderPassBegin_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderPass2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pRenderPassBegin_host, params->pSubpassBeginInfo); - return STATUS_SUCCESS; } @@ -5897,7 +5877,6 @@ static NTSTATUS thunk64_vkCmdBeginRenderPass2KHR(void *args) TRACE("%p, %p, %p\n", params->commandBuffer, params->pRenderPassBegin, params->pSubpassBeginInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderPass2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRenderPassBegin, params->pSubpassBeginInfo); - return STATUS_SUCCESS; } @@ -5911,7 +5890,6 @@ static NTSTATUS thunk32_vkCmdBeginRenderPass2KHR(void *args) convert_VkRenderPassBeginInfo_win_to_host(params->pRenderPassBegin, &pRenderPassBegin_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderPass2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pRenderPassBegin_host, params->pSubpassBeginInfo); - return STATUS_SUCCESS; } @@ -5925,7 +5903,6 @@ static NTSTATUS thunk64_vkCmdBeginRendering(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pRenderingInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRendering(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRenderingInfo); - return STATUS_SUCCESS; } @@ -5939,7 +5916,6 @@ static NTSTATUS thunk32_vkCmdBeginRendering(void *args) convert_VkRenderingInfo_win_to_host(params->pRenderingInfo, &pRenderingInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRendering(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pRenderingInfo_host); - free_VkRenderingInfo(&pRenderingInfo_host); return STATUS_SUCCESS; } @@ -5954,7 +5930,6 @@ static NTSTATUS thunk64_vkCmdBeginRenderingKHR(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pRenderingInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderingKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRenderingInfo); - return STATUS_SUCCESS; } @@ -5968,7 +5943,6 @@ static NTSTATUS thunk32_vkCmdBeginRenderingKHR(void *args) convert_VkRenderingInfo_win_to_host(params->pRenderingInfo, &pRenderingInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginRenderingKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pRenderingInfo_host); - free_VkRenderingInfo(&pRenderingInfo_host); return STATUS_SUCCESS; } @@ -5983,7 +5957,6 @@ static NTSTATUS thunk64_vkCmdBeginTransformFeedbackEXT(void *args) TRACE("%p, %u, %u, %p, %p\n", params->commandBuffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginTransformFeedbackEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets); - return STATUS_SUCCESS; } @@ -5995,7 +5968,6 @@ static NTSTATUS thunk32_vkCmdBeginTransformFeedbackEXT(void *args) TRACE("%p, %u, %u, %p, %p\n", params->commandBuffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBeginTransformFeedbackEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets); - return STATUS_SUCCESS; } @@ -6009,7 +5981,6 @@ static NTSTATUS thunk64_vkCmdBindDescriptorSets(void *args) TRACE("%p, %#x, 0x%s, %u, %u, %p, %u, %p\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->layout), params->firstSet, params->descriptorSetCount, params->pDescriptorSets, params->dynamicOffsetCount, params->pDynamicOffsets); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindDescriptorSets(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineBindPoint, params->layout, params->firstSet, params->descriptorSetCount, params->pDescriptorSets, params->dynamicOffsetCount, params->pDynamicOffsets); - return STATUS_SUCCESS; } @@ -6021,7 +5992,6 @@ static NTSTATUS thunk32_vkCmdBindDescriptorSets(void *args) TRACE("%p, %#x, 0x%s, %u, %u, %p, %u, %p\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->layout), params->firstSet, params->descriptorSetCount, params->pDescriptorSets, params->dynamicOffsetCount, params->pDynamicOffsets); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindDescriptorSets(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineBindPoint, params->layout, params->firstSet, params->descriptorSetCount, params->pDescriptorSets, params->dynamicOffsetCount, params->pDynamicOffsets); - return STATUS_SUCCESS; } @@ -6035,7 +6005,6 @@ static NTSTATUS thunk64_vkCmdBindIndexBuffer(void *args) TRACE("%p, 0x%s, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->indexType); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindIndexBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->indexType); - return STATUS_SUCCESS; } @@ -6047,7 +6016,6 @@ static NTSTATUS thunk32_vkCmdBindIndexBuffer(void *args) TRACE("%p, 0x%s, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->indexType); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindIndexBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->indexType); - return STATUS_SUCCESS; } @@ -6061,7 +6029,6 @@ static NTSTATUS thunk64_vkCmdBindInvocationMaskHUAWEI(void *args) TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->imageView), params->imageLayout); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindInvocationMaskHUAWEI(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->imageView, params->imageLayout); - return STATUS_SUCCESS; } @@ -6073,7 +6040,6 @@ static NTSTATUS thunk32_vkCmdBindInvocationMaskHUAWEI(void *args) TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->imageView), params->imageLayout); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindInvocationMaskHUAWEI(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->imageView, params->imageLayout); - return STATUS_SUCCESS; } @@ -6087,7 +6053,6 @@ static NTSTATUS thunk64_vkCmdBindPipeline(void *args) TRACE("%p, %#x, 0x%s\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->pipeline)); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindPipeline(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineBindPoint, params->pipeline); - return STATUS_SUCCESS; } @@ -6099,7 +6064,6 @@ static NTSTATUS thunk32_vkCmdBindPipeline(void *args) TRACE("%p, %#x, 0x%s\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->pipeline)); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindPipeline(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineBindPoint, params->pipeline); - return STATUS_SUCCESS; } @@ -6113,7 +6077,6 @@ static NTSTATUS thunk64_vkCmdBindPipelineShaderGroupNV(void *args) TRACE("%p, %#x, 0x%s, %u\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->pipeline), params->groupIndex); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindPipelineShaderGroupNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineBindPoint, params->pipeline, params->groupIndex); - return STATUS_SUCCESS; } @@ -6125,7 +6088,6 @@ static NTSTATUS thunk32_vkCmdBindPipelineShaderGroupNV(void *args) TRACE("%p, %#x, 0x%s, %u\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->pipeline), params->groupIndex); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindPipelineShaderGroupNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineBindPoint, params->pipeline, params->groupIndex); - return STATUS_SUCCESS; } @@ -6139,7 +6101,6 @@ static NTSTATUS thunk64_vkCmdBindShadingRateImageNV(void *args) TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->imageView), params->imageLayout); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindShadingRateImageNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->imageView, params->imageLayout); - return STATUS_SUCCESS; } @@ -6151,7 +6112,6 @@ static NTSTATUS thunk32_vkCmdBindShadingRateImageNV(void *args) TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->imageView), params->imageLayout); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindShadingRateImageNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->imageView, params->imageLayout); - return STATUS_SUCCESS; } @@ -6165,7 +6125,6 @@ static NTSTATUS thunk64_vkCmdBindTransformFeedbackBuffersEXT(void *args) TRACE("%p, %u, %u, %p, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindTransformFeedbackBuffersEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes); - return STATUS_SUCCESS; } @@ -6177,7 +6136,6 @@ static NTSTATUS thunk32_vkCmdBindTransformFeedbackBuffersEXT(void *args) TRACE("%p, %u, %u, %p, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindTransformFeedbackBuffersEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes); - return STATUS_SUCCESS; } @@ -6191,7 +6149,6 @@ static NTSTATUS thunk64_vkCmdBindVertexBuffers(void *args) TRACE("%p, %u, %u, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindVertexBuffers(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets); - return STATUS_SUCCESS; } @@ -6203,7 +6160,6 @@ static NTSTATUS thunk32_vkCmdBindVertexBuffers(void *args) TRACE("%p, %u, %u, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindVertexBuffers(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets); - return STATUS_SUCCESS; } @@ -6217,7 +6173,6 @@ static NTSTATUS thunk64_vkCmdBindVertexBuffers2(void *args) TRACE("%p, %u, %u, %p, %p, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindVertexBuffers2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides); - return STATUS_SUCCESS; } @@ -6229,7 +6184,6 @@ static NTSTATUS thunk32_vkCmdBindVertexBuffers2(void *args) TRACE("%p, %u, %u, %p, %p, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindVertexBuffers2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides); - return STATUS_SUCCESS; } @@ -6243,7 +6197,6 @@ static NTSTATUS thunk64_vkCmdBindVertexBuffers2EXT(void *args) TRACE("%p, %u, %u, %p, %p, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindVertexBuffers2EXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides); - return STATUS_SUCCESS; } @@ -6255,7 +6208,6 @@ static NTSTATUS thunk32_vkCmdBindVertexBuffers2EXT(void *args) TRACE("%p, %u, %u, %p, %p, %p, %p\n", params->commandBuffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBindVertexBuffers2EXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstBinding, params->bindingCount, params->pBuffers, params->pOffsets, params->pSizes, params->pStrides); - return STATUS_SUCCESS; } @@ -6269,7 +6221,6 @@ static NTSTATUS thunk64_vkCmdBlitImage(void *args) TRACE("%p, 0x%s, %#x, 0x%s, %#x, %u, %p, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions, params->filter); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBlitImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcImage, params->srcImageLayout, params->dstImage, params->dstImageLayout, params->regionCount, params->pRegions, params->filter); - return STATUS_SUCCESS; } @@ -6281,7 +6232,6 @@ static NTSTATUS thunk32_vkCmdBlitImage(void *args) TRACE("%p, 0x%s, %#x, 0x%s, %#x, %u, %p, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions, params->filter); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBlitImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcImage, params->srcImageLayout, params->dstImage, params->dstImageLayout, params->regionCount, params->pRegions, params->filter); - return STATUS_SUCCESS; } @@ -6295,7 +6245,6 @@ static NTSTATUS thunk64_vkCmdBlitImage2(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pBlitImageInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBlitImage2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pBlitImageInfo); - return STATUS_SUCCESS; } @@ -6309,7 +6258,6 @@ static NTSTATUS thunk32_vkCmdBlitImage2(void *args) convert_VkBlitImageInfo2_win_to_host(params->pBlitImageInfo, &pBlitImageInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBlitImage2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pBlitImageInfo_host); - return STATUS_SUCCESS; } @@ -6323,7 +6271,6 @@ static NTSTATUS thunk64_vkCmdBlitImage2KHR(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pBlitImageInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBlitImage2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pBlitImageInfo); - return STATUS_SUCCESS; } @@ -6337,7 +6284,6 @@ static NTSTATUS thunk32_vkCmdBlitImage2KHR(void *args) convert_VkBlitImageInfo2_win_to_host(params->pBlitImageInfo, &pBlitImageInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBlitImage2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pBlitImageInfo_host); - return STATUS_SUCCESS; } @@ -6351,7 +6297,6 @@ static NTSTATUS thunk64_vkCmdBuildAccelerationStructureNV(void *args) TRACE("%p, %p, 0x%s, 0x%s, %u, 0x%s, 0x%s, 0x%s, 0x%s\n", params->commandBuffer, params->pInfo, wine_dbgstr_longlong(params->instanceData), wine_dbgstr_longlong(params->instanceOffset), params->update, wine_dbgstr_longlong(params->dst), wine_dbgstr_longlong(params->src), wine_dbgstr_longlong(params->scratch), wine_dbgstr_longlong(params->scratchOffset)); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBuildAccelerationStructureNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pInfo, params->instanceData, params->instanceOffset, params->update, params->dst, params->src, params->scratch, params->scratchOffset); - return STATUS_SUCCESS; } @@ -6365,7 +6310,6 @@ static NTSTATUS thunk32_vkCmdBuildAccelerationStructureNV(void *args) convert_VkAccelerationStructureInfoNV_win_to_host(params->pInfo, &pInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBuildAccelerationStructureNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pInfo_host, params->instanceData, params->instanceOffset, params->update, params->dst, params->src, params->scratch, params->scratchOffset); - free_VkAccelerationStructureInfoNV(&pInfo_host); return STATUS_SUCCESS; } @@ -6380,7 +6324,6 @@ static NTSTATUS thunk64_vkCmdBuildAccelerationStructuresIndirectKHR(void *args) TRACE("%p, %u, %p, %p, %p, %p\n", params->commandBuffer, params->infoCount, params->pInfos, params->pIndirectDeviceAddresses, params->pIndirectStrides, params->ppMaxPrimitiveCounts); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBuildAccelerationStructuresIndirectKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->infoCount, params->pInfos, params->pIndirectDeviceAddresses, params->pIndirectStrides, params->ppMaxPrimitiveCounts); - return STATUS_SUCCESS; } @@ -6394,7 +6337,6 @@ static NTSTATUS thunk32_vkCmdBuildAccelerationStructuresIndirectKHR(void *args) pInfos_host = convert_VkAccelerationStructureBuildGeometryInfoKHR_array_win_to_host(params->pInfos, params->infoCount); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBuildAccelerationStructuresIndirectKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->infoCount, pInfos_host, params->pIndirectDeviceAddresses, params->pIndirectStrides, params->ppMaxPrimitiveCounts); - free_VkAccelerationStructureBuildGeometryInfoKHR_array(pInfos_host, params->infoCount); return STATUS_SUCCESS; } @@ -6409,7 +6351,6 @@ static NTSTATUS thunk64_vkCmdBuildAccelerationStructuresKHR(void *args) TRACE("%p, %u, %p, %p\n", params->commandBuffer, params->infoCount, params->pInfos, params->ppBuildRangeInfos); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBuildAccelerationStructuresKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->infoCount, params->pInfos, params->ppBuildRangeInfos); - return STATUS_SUCCESS; } @@ -6423,7 +6364,6 @@ static NTSTATUS thunk32_vkCmdBuildAccelerationStructuresKHR(void *args) pInfos_host = convert_VkAccelerationStructureBuildGeometryInfoKHR_array_win_to_host(params->pInfos, params->infoCount); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdBuildAccelerationStructuresKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->infoCount, pInfos_host, params->ppBuildRangeInfos); - free_VkAccelerationStructureBuildGeometryInfoKHR_array(pInfos_host, params->infoCount); return STATUS_SUCCESS; } @@ -6438,7 +6378,6 @@ static NTSTATUS thunk64_vkCmdClearAttachments(void *args) TRACE("%p, %u, %p, %u, %p\n", params->commandBuffer, params->attachmentCount, params->pAttachments, params->rectCount, params->pRects); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdClearAttachments(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->attachmentCount, params->pAttachments, params->rectCount, params->pRects); - return STATUS_SUCCESS; } @@ -6450,7 +6389,6 @@ static NTSTATUS thunk32_vkCmdClearAttachments(void *args) TRACE("%p, %u, %p, %u, %p\n", params->commandBuffer, params->attachmentCount, params->pAttachments, params->rectCount, params->pRects); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdClearAttachments(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->attachmentCount, params->pAttachments, params->rectCount, params->pRects); - return STATUS_SUCCESS; } @@ -6464,7 +6402,6 @@ static NTSTATUS thunk64_vkCmdClearColorImage(void *args) TRACE("%p, 0x%s, %#x, %p, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->image), params->imageLayout, params->pColor, params->rangeCount, params->pRanges); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdClearColorImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->image, params->imageLayout, params->pColor, params->rangeCount, params->pRanges); - return STATUS_SUCCESS; } @@ -6476,7 +6413,6 @@ static NTSTATUS thunk32_vkCmdClearColorImage(void *args) TRACE("%p, 0x%s, %#x, %p, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->image), params->imageLayout, params->pColor, params->rangeCount, params->pRanges); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdClearColorImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->image, params->imageLayout, params->pColor, params->rangeCount, params->pRanges); - return STATUS_SUCCESS; } @@ -6490,7 +6426,6 @@ static NTSTATUS thunk64_vkCmdClearDepthStencilImage(void *args) TRACE("%p, 0x%s, %#x, %p, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->image), params->imageLayout, params->pDepthStencil, params->rangeCount, params->pRanges); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdClearDepthStencilImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->image, params->imageLayout, params->pDepthStencil, params->rangeCount, params->pRanges); - return STATUS_SUCCESS; } @@ -6502,7 +6437,6 @@ static NTSTATUS thunk32_vkCmdClearDepthStencilImage(void *args) TRACE("%p, 0x%s, %#x, %p, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->image), params->imageLayout, params->pDepthStencil, params->rangeCount, params->pRanges); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdClearDepthStencilImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->image, params->imageLayout, params->pDepthStencil, params->rangeCount, params->pRanges); - return STATUS_SUCCESS; } @@ -6516,7 +6450,6 @@ static NTSTATUS thunk64_vkCmdCopyAccelerationStructureKHR(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyAccelerationStructureKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pInfo); - return STATUS_SUCCESS; } @@ -6530,7 +6463,6 @@ static NTSTATUS thunk32_vkCmdCopyAccelerationStructureKHR(void *args) convert_VkCopyAccelerationStructureInfoKHR_win_to_host(params->pInfo, &pInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyAccelerationStructureKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pInfo_host); - return STATUS_SUCCESS; } @@ -6544,7 +6476,6 @@ static NTSTATUS thunk64_vkCmdCopyAccelerationStructureNV(void *args) TRACE("%p, 0x%s, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->dst), wine_dbgstr_longlong(params->src), params->mode); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyAccelerationStructureNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->dst, params->src, params->mode); - return STATUS_SUCCESS; } @@ -6556,7 +6487,6 @@ static NTSTATUS thunk32_vkCmdCopyAccelerationStructureNV(void *args) TRACE("%p, 0x%s, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->dst), wine_dbgstr_longlong(params->src), params->mode); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyAccelerationStructureNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->dst, params->src, params->mode); - return STATUS_SUCCESS; } @@ -6570,7 +6500,6 @@ static NTSTATUS thunk64_vkCmdCopyAccelerationStructureToMemoryKHR(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyAccelerationStructureToMemoryKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pInfo); - return STATUS_SUCCESS; } @@ -6584,7 +6513,6 @@ static NTSTATUS thunk32_vkCmdCopyAccelerationStructureToMemoryKHR(void *args) convert_VkCopyAccelerationStructureToMemoryInfoKHR_win_to_host(params->pInfo, &pInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyAccelerationStructureToMemoryKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pInfo_host); - return STATUS_SUCCESS; } @@ -6598,7 +6526,6 @@ static NTSTATUS thunk64_vkCmdCopyBuffer(void *args) TRACE("%p, 0x%s, 0x%s, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcBuffer), wine_dbgstr_longlong(params->dstBuffer), params->regionCount, params->pRegions); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcBuffer, params->dstBuffer, params->regionCount, params->pRegions); - return STATUS_SUCCESS; } @@ -6612,7 +6539,6 @@ static NTSTATUS thunk32_vkCmdCopyBuffer(void *args) pRegions_host = convert_VkBufferCopy_array_win_to_host(params->pRegions, params->regionCount); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcBuffer, params->dstBuffer, params->regionCount, pRegions_host); - free_VkBufferCopy_array(pRegions_host, params->regionCount); return STATUS_SUCCESS; } @@ -6627,7 +6553,6 @@ static NTSTATUS thunk64_vkCmdCopyBuffer2(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pCopyBufferInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBuffer2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyBufferInfo); - return STATUS_SUCCESS; } @@ -6641,7 +6566,6 @@ static NTSTATUS thunk32_vkCmdCopyBuffer2(void *args) convert_VkCopyBufferInfo2_win_to_host(params->pCopyBufferInfo, &pCopyBufferInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBuffer2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pCopyBufferInfo_host); - free_VkCopyBufferInfo2(&pCopyBufferInfo_host); return STATUS_SUCCESS; } @@ -6656,7 +6580,6 @@ static NTSTATUS thunk64_vkCmdCopyBuffer2KHR(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pCopyBufferInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBuffer2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyBufferInfo); - return STATUS_SUCCESS; } @@ -6670,7 +6593,6 @@ static NTSTATUS thunk32_vkCmdCopyBuffer2KHR(void *args) convert_VkCopyBufferInfo2_win_to_host(params->pCopyBufferInfo, &pCopyBufferInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBuffer2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pCopyBufferInfo_host); - free_VkCopyBufferInfo2(&pCopyBufferInfo_host); return STATUS_SUCCESS; } @@ -6685,7 +6607,6 @@ static NTSTATUS thunk64_vkCmdCopyBufferToImage(void *args) TRACE("%p, 0x%s, 0x%s, %#x, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcBuffer), wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBufferToImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcBuffer, params->dstImage, params->dstImageLayout, params->regionCount, params->pRegions); - return STATUS_SUCCESS; } @@ -6699,7 +6620,6 @@ static NTSTATUS thunk32_vkCmdCopyBufferToImage(void *args) pRegions_host = convert_VkBufferImageCopy_array_win_to_host(params->pRegions, params->regionCount); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBufferToImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcBuffer, params->dstImage, params->dstImageLayout, params->regionCount, pRegions_host); - free_VkBufferImageCopy_array(pRegions_host, params->regionCount); return STATUS_SUCCESS; } @@ -6714,7 +6634,6 @@ static NTSTATUS thunk64_vkCmdCopyBufferToImage2(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pCopyBufferToImageInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBufferToImage2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyBufferToImageInfo); - return STATUS_SUCCESS; } @@ -6728,7 +6647,6 @@ static NTSTATUS thunk32_vkCmdCopyBufferToImage2(void *args) convert_VkCopyBufferToImageInfo2_win_to_host(params->pCopyBufferToImageInfo, &pCopyBufferToImageInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBufferToImage2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pCopyBufferToImageInfo_host); - free_VkCopyBufferToImageInfo2(&pCopyBufferToImageInfo_host); return STATUS_SUCCESS; } @@ -6743,7 +6661,6 @@ static NTSTATUS thunk64_vkCmdCopyBufferToImage2KHR(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pCopyBufferToImageInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBufferToImage2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyBufferToImageInfo); - return STATUS_SUCCESS; } @@ -6757,7 +6674,6 @@ static NTSTATUS thunk32_vkCmdCopyBufferToImage2KHR(void *args) convert_VkCopyBufferToImageInfo2_win_to_host(params->pCopyBufferToImageInfo, &pCopyBufferToImageInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyBufferToImage2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pCopyBufferToImageInfo_host); - free_VkCopyBufferToImageInfo2(&pCopyBufferToImageInfo_host); return STATUS_SUCCESS; } @@ -6772,7 +6688,6 @@ static NTSTATUS thunk64_vkCmdCopyImage(void *args) TRACE("%p, 0x%s, %#x, 0x%s, %#x, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcImage, params->srcImageLayout, params->dstImage, params->dstImageLayout, params->regionCount, params->pRegions); - return STATUS_SUCCESS; } @@ -6784,7 +6699,6 @@ static NTSTATUS thunk32_vkCmdCopyImage(void *args) TRACE("%p, 0x%s, %#x, 0x%s, %#x, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcImage, params->srcImageLayout, params->dstImage, params->dstImageLayout, params->regionCount, params->pRegions); - return STATUS_SUCCESS; } @@ -6798,7 +6712,6 @@ static NTSTATUS thunk64_vkCmdCopyImage2(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImage2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyImageInfo); - return STATUS_SUCCESS; } @@ -6812,7 +6725,6 @@ static NTSTATUS thunk32_vkCmdCopyImage2(void *args) convert_VkCopyImageInfo2_win_to_host(params->pCopyImageInfo, &pCopyImageInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImage2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pCopyImageInfo_host); - return STATUS_SUCCESS; } @@ -6826,7 +6738,6 @@ static NTSTATUS thunk64_vkCmdCopyImage2KHR(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImage2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyImageInfo); - return STATUS_SUCCESS; } @@ -6840,7 +6751,6 @@ static NTSTATUS thunk32_vkCmdCopyImage2KHR(void *args) convert_VkCopyImageInfo2_win_to_host(params->pCopyImageInfo, &pCopyImageInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImage2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pCopyImageInfo_host); - return STATUS_SUCCESS; } @@ -6854,7 +6764,6 @@ static NTSTATUS thunk64_vkCmdCopyImageToBuffer(void *args) TRACE("%p, 0x%s, %#x, 0x%s, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstBuffer), params->regionCount, params->pRegions); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImageToBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcImage, params->srcImageLayout, params->dstBuffer, params->regionCount, params->pRegions); - return STATUS_SUCCESS; } @@ -6868,7 +6777,6 @@ static NTSTATUS thunk32_vkCmdCopyImageToBuffer(void *args) pRegions_host = convert_VkBufferImageCopy_array_win_to_host(params->pRegions, params->regionCount); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImageToBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcImage, params->srcImageLayout, params->dstBuffer, params->regionCount, pRegions_host); - free_VkBufferImageCopy_array(pRegions_host, params->regionCount); return STATUS_SUCCESS; } @@ -6883,7 +6791,6 @@ static NTSTATUS thunk64_vkCmdCopyImageToBuffer2(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageToBufferInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImageToBuffer2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyImageToBufferInfo); - return STATUS_SUCCESS; } @@ -6897,7 +6804,6 @@ static NTSTATUS thunk32_vkCmdCopyImageToBuffer2(void *args) convert_VkCopyImageToBufferInfo2_win_to_host(params->pCopyImageToBufferInfo, &pCopyImageToBufferInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImageToBuffer2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pCopyImageToBufferInfo_host); - free_VkCopyImageToBufferInfo2(&pCopyImageToBufferInfo_host); return STATUS_SUCCESS; } @@ -6912,7 +6818,6 @@ static NTSTATUS thunk64_vkCmdCopyImageToBuffer2KHR(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pCopyImageToBufferInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImageToBuffer2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCopyImageToBufferInfo); - return STATUS_SUCCESS; } @@ -6926,7 +6831,6 @@ static NTSTATUS thunk32_vkCmdCopyImageToBuffer2KHR(void *args) convert_VkCopyImageToBufferInfo2_win_to_host(params->pCopyImageToBufferInfo, &pCopyImageToBufferInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyImageToBuffer2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pCopyImageToBufferInfo_host); - free_VkCopyImageToBufferInfo2(&pCopyImageToBufferInfo_host); return STATUS_SUCCESS; } @@ -6941,7 +6845,6 @@ static NTSTATUS thunk64_vkCmdCopyMemoryToAccelerationStructureKHR(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyMemoryToAccelerationStructureKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pInfo); - return STATUS_SUCCESS; } @@ -6955,7 +6858,6 @@ static NTSTATUS thunk32_vkCmdCopyMemoryToAccelerationStructureKHR(void *args) convert_VkCopyMemoryToAccelerationStructureInfoKHR_win_to_host(params->pInfo, &pInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyMemoryToAccelerationStructureKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pInfo_host); - return STATUS_SUCCESS; } @@ -6969,7 +6871,6 @@ static NTSTATUS thunk64_vkCmdCopyQueryPoolResults(void *args) TRACE("%p, 0x%s, %u, %u, 0x%s, 0x%s, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), wine_dbgstr_longlong(params->stride), params->flags); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyQueryPoolResults(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->firstQuery, params->queryCount, params->dstBuffer, params->dstOffset, params->stride, params->flags); - return STATUS_SUCCESS; } @@ -6981,7 +6882,6 @@ static NTSTATUS thunk32_vkCmdCopyQueryPoolResults(void *args) TRACE("%p, 0x%s, %u, %u, 0x%s, 0x%s, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), wine_dbgstr_longlong(params->stride), params->flags); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCopyQueryPoolResults(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->firstQuery, params->queryCount, params->dstBuffer, params->dstOffset, params->stride, params->flags); - return STATUS_SUCCESS; } @@ -6995,7 +6895,6 @@ static NTSTATUS thunk64_vkCmdCuLaunchKernelNVX(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pLaunchInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCuLaunchKernelNVX(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pLaunchInfo); - return STATUS_SUCCESS; } @@ -7009,7 +6908,6 @@ static NTSTATUS thunk32_vkCmdCuLaunchKernelNVX(void *args) convert_VkCuLaunchInfoNVX_win_to_host(params->pLaunchInfo, &pLaunchInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdCuLaunchKernelNVX(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pLaunchInfo_host); - return STATUS_SUCCESS; } @@ -7023,7 +6921,6 @@ static NTSTATUS thunk64_vkCmdDebugMarkerBeginEXT(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDebugMarkerBeginEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pMarkerInfo); - return STATUS_SUCCESS; } @@ -7035,7 +6932,6 @@ static NTSTATUS thunk32_vkCmdDebugMarkerBeginEXT(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDebugMarkerBeginEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pMarkerInfo); - return STATUS_SUCCESS; } @@ -7049,7 +6945,6 @@ static NTSTATUS thunk64_vkCmdDebugMarkerEndEXT(void *args) TRACE("%p\n", params->commandBuffer); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDebugMarkerEndEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); - return STATUS_SUCCESS; } @@ -7061,7 +6956,6 @@ static NTSTATUS thunk32_vkCmdDebugMarkerEndEXT(void *args) TRACE("%p\n", params->commandBuffer); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDebugMarkerEndEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); - return STATUS_SUCCESS; } @@ -7075,7 +6969,6 @@ static NTSTATUS thunk64_vkCmdDebugMarkerInsertEXT(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDebugMarkerInsertEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pMarkerInfo); - return STATUS_SUCCESS; } @@ -7087,7 +6980,6 @@ static NTSTATUS thunk32_vkCmdDebugMarkerInsertEXT(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDebugMarkerInsertEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pMarkerInfo); - return STATUS_SUCCESS; } @@ -7101,7 +6993,6 @@ static NTSTATUS thunk64_vkCmdDispatch(void *args) TRACE("%p, %u, %u, %u\n", params->commandBuffer, params->groupCountX, params->groupCountY, params->groupCountZ); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDispatch(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->groupCountX, params->groupCountY, params->groupCountZ); - return STATUS_SUCCESS; } @@ -7113,7 +7004,6 @@ static NTSTATUS thunk32_vkCmdDispatch(void *args) TRACE("%p, %u, %u, %u\n", params->commandBuffer, params->groupCountX, params->groupCountY, params->groupCountZ); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDispatch(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->groupCountX, params->groupCountY, params->groupCountZ); - return STATUS_SUCCESS; } @@ -7127,7 +7017,6 @@ static NTSTATUS thunk64_vkCmdDispatchBase(void *args) TRACE("%p, %u, %u, %u, %u, %u, %u\n", params->commandBuffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDispatchBase(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ); - return STATUS_SUCCESS; } @@ -7139,7 +7028,6 @@ static NTSTATUS thunk32_vkCmdDispatchBase(void *args) TRACE("%p, %u, %u, %u, %u, %u, %u\n", params->commandBuffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDispatchBase(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ); - return STATUS_SUCCESS; } @@ -7153,7 +7041,6 @@ static NTSTATUS thunk64_vkCmdDispatchBaseKHR(void *args) TRACE("%p, %u, %u, %u, %u, %u, %u\n", params->commandBuffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDispatchBaseKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ); - return STATUS_SUCCESS; } @@ -7165,7 +7052,6 @@ static NTSTATUS thunk32_vkCmdDispatchBaseKHR(void *args) TRACE("%p, %u, %u, %u, %u, %u, %u\n", params->commandBuffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDispatchBaseKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->baseGroupX, params->baseGroupY, params->baseGroupZ, params->groupCountX, params->groupCountY, params->groupCountZ); - return STATUS_SUCCESS; } @@ -7179,7 +7065,6 @@ static NTSTATUS thunk64_vkCmdDispatchIndirect(void *args) TRACE("%p, 0x%s, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset)); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDispatchIndirect(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset); - return STATUS_SUCCESS; } @@ -7191,7 +7076,6 @@ static NTSTATUS thunk32_vkCmdDispatchIndirect(void *args) TRACE("%p, 0x%s, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset)); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDispatchIndirect(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset); - return STATUS_SUCCESS; } @@ -7205,7 +7089,6 @@ static NTSTATUS thunk64_vkCmdDraw(void *args) TRACE("%p, %u, %u, %u, %u\n", params->commandBuffer, params->vertexCount, params->instanceCount, params->firstVertex, params->firstInstance); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDraw(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->vertexCount, params->instanceCount, params->firstVertex, params->firstInstance); - return STATUS_SUCCESS; } @@ -7217,7 +7100,6 @@ static NTSTATUS thunk32_vkCmdDraw(void *args) TRACE("%p, %u, %u, %u, %u\n", params->commandBuffer, params->vertexCount, params->instanceCount, params->firstVertex, params->firstInstance); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDraw(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->vertexCount, params->instanceCount, params->firstVertex, params->firstInstance); - return STATUS_SUCCESS; } @@ -7231,7 +7113,6 @@ static NTSTATUS thunk64_vkCmdDrawIndexed(void *args) TRACE("%p, %u, %u, %u, %d, %u\n", params->commandBuffer, params->indexCount, params->instanceCount, params->firstIndex, params->vertexOffset, params->firstInstance); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexed(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->indexCount, params->instanceCount, params->firstIndex, params->vertexOffset, params->firstInstance); - return STATUS_SUCCESS; } @@ -7243,7 +7124,6 @@ static NTSTATUS thunk32_vkCmdDrawIndexed(void *args) TRACE("%p, %u, %u, %u, %d, %u\n", params->commandBuffer, params->indexCount, params->instanceCount, params->firstIndex, params->vertexOffset, params->firstInstance); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexed(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->indexCount, params->instanceCount, params->firstIndex, params->vertexOffset, params->firstInstance); - return STATUS_SUCCESS; } @@ -7257,7 +7137,6 @@ static NTSTATUS thunk64_vkCmdDrawIndexedIndirect(void *args) TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexedIndirect(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->drawCount, params->stride); - return STATUS_SUCCESS; } @@ -7269,7 +7148,6 @@ static NTSTATUS thunk32_vkCmdDrawIndexedIndirect(void *args) TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexedIndirect(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->drawCount, params->stride); - return STATUS_SUCCESS; } @@ -7283,7 +7161,6 @@ static NTSTATUS thunk64_vkCmdDrawIndexedIndirectCount(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexedIndirectCount(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); - return STATUS_SUCCESS; } @@ -7295,7 +7172,6 @@ static NTSTATUS thunk32_vkCmdDrawIndexedIndirectCount(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexedIndirectCount(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); - return STATUS_SUCCESS; } @@ -7309,7 +7185,6 @@ static NTSTATUS thunk64_vkCmdDrawIndexedIndirectCountAMD(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexedIndirectCountAMD(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); - return STATUS_SUCCESS; } @@ -7321,7 +7196,6 @@ static NTSTATUS thunk32_vkCmdDrawIndexedIndirectCountAMD(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexedIndirectCountAMD(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); - return STATUS_SUCCESS; } @@ -7335,7 +7209,6 @@ static NTSTATUS thunk64_vkCmdDrawIndexedIndirectCountKHR(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexedIndirectCountKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); - return STATUS_SUCCESS; } @@ -7347,7 +7220,6 @@ static NTSTATUS thunk32_vkCmdDrawIndexedIndirectCountKHR(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndexedIndirectCountKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); - return STATUS_SUCCESS; } @@ -7361,7 +7233,6 @@ static NTSTATUS thunk64_vkCmdDrawIndirect(void *args) TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirect(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->drawCount, params->stride); - return STATUS_SUCCESS; } @@ -7373,7 +7244,6 @@ static NTSTATUS thunk32_vkCmdDrawIndirect(void *args) TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirect(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->drawCount, params->stride); - return STATUS_SUCCESS; } @@ -7387,7 +7257,6 @@ static NTSTATUS thunk64_vkCmdDrawIndirectByteCountEXT(void *args) TRACE("%p, %u, %u, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, params->instanceCount, params->firstInstance, wine_dbgstr_longlong(params->counterBuffer), wine_dbgstr_longlong(params->counterBufferOffset), params->counterOffset, params->vertexStride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectByteCountEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->instanceCount, params->firstInstance, params->counterBuffer, params->counterBufferOffset, params->counterOffset, params->vertexStride); - return STATUS_SUCCESS; } @@ -7399,7 +7268,6 @@ static NTSTATUS thunk32_vkCmdDrawIndirectByteCountEXT(void *args) TRACE("%p, %u, %u, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, params->instanceCount, params->firstInstance, wine_dbgstr_longlong(params->counterBuffer), wine_dbgstr_longlong(params->counterBufferOffset), params->counterOffset, params->vertexStride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectByteCountEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->instanceCount, params->firstInstance, params->counterBuffer, params->counterBufferOffset, params->counterOffset, params->vertexStride); - return STATUS_SUCCESS; } @@ -7413,7 +7281,6 @@ static NTSTATUS thunk64_vkCmdDrawIndirectCount(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectCount(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); - return STATUS_SUCCESS; } @@ -7425,7 +7292,6 @@ static NTSTATUS thunk32_vkCmdDrawIndirectCount(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectCount(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); - return STATUS_SUCCESS; } @@ -7439,7 +7305,6 @@ static NTSTATUS thunk64_vkCmdDrawIndirectCountAMD(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectCountAMD(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); - return STATUS_SUCCESS; } @@ -7451,7 +7316,6 @@ static NTSTATUS thunk32_vkCmdDrawIndirectCountAMD(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectCountAMD(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); - return STATUS_SUCCESS; } @@ -7465,7 +7329,6 @@ static NTSTATUS thunk64_vkCmdDrawIndirectCountKHR(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectCountKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); - return STATUS_SUCCESS; } @@ -7477,7 +7340,6 @@ static NTSTATUS thunk32_vkCmdDrawIndirectCountKHR(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawIndirectCountKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); - return STATUS_SUCCESS; } @@ -7491,7 +7353,6 @@ static NTSTATUS thunk64_vkCmdDrawMeshTasksEXT(void *args) TRACE("%p, %u, %u, %u\n", params->commandBuffer, params->groupCountX, params->groupCountY, params->groupCountZ); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->groupCountX, params->groupCountY, params->groupCountZ); - return STATUS_SUCCESS; } @@ -7503,7 +7364,6 @@ static NTSTATUS thunk32_vkCmdDrawMeshTasksEXT(void *args) TRACE("%p, %u, %u, %u\n", params->commandBuffer, params->groupCountX, params->groupCountY, params->groupCountZ); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->groupCountX, params->groupCountY, params->groupCountZ); - return STATUS_SUCCESS; } @@ -7517,7 +7377,6 @@ static NTSTATUS thunk64_vkCmdDrawMeshTasksIndirectCountEXT(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksIndirectCountEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); - return STATUS_SUCCESS; } @@ -7529,7 +7388,6 @@ static NTSTATUS thunk32_vkCmdDrawMeshTasksIndirectCountEXT(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksIndirectCountEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); - return STATUS_SUCCESS; } @@ -7543,7 +7401,6 @@ static NTSTATUS thunk64_vkCmdDrawMeshTasksIndirectCountNV(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksIndirectCountNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); - return STATUS_SUCCESS; } @@ -7555,7 +7412,6 @@ static NTSTATUS thunk32_vkCmdDrawMeshTasksIndirectCountNV(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->countBuffer), wine_dbgstr_longlong(params->countBufferOffset), params->maxDrawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksIndirectCountNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->countBuffer, params->countBufferOffset, params->maxDrawCount, params->stride); - return STATUS_SUCCESS; } @@ -7569,7 +7425,6 @@ static NTSTATUS thunk64_vkCmdDrawMeshTasksIndirectEXT(void *args) TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksIndirectEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->drawCount, params->stride); - return STATUS_SUCCESS; } @@ -7581,7 +7436,6 @@ static NTSTATUS thunk32_vkCmdDrawMeshTasksIndirectEXT(void *args) TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksIndirectEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->drawCount, params->stride); - return STATUS_SUCCESS; } @@ -7595,7 +7449,6 @@ static NTSTATUS thunk64_vkCmdDrawMeshTasksIndirectNV(void *args) TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksIndirectNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->drawCount, params->stride); - return STATUS_SUCCESS; } @@ -7607,7 +7460,6 @@ static NTSTATUS thunk32_vkCmdDrawMeshTasksIndirectNV(void *args) TRACE("%p, 0x%s, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->buffer), wine_dbgstr_longlong(params->offset), params->drawCount, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksIndirectNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->buffer, params->offset, params->drawCount, params->stride); - return STATUS_SUCCESS; } @@ -7621,7 +7473,6 @@ static NTSTATUS thunk64_vkCmdDrawMeshTasksNV(void *args) TRACE("%p, %u, %u\n", params->commandBuffer, params->taskCount, params->firstTask); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->taskCount, params->firstTask); - return STATUS_SUCCESS; } @@ -7633,7 +7484,6 @@ static NTSTATUS thunk32_vkCmdDrawMeshTasksNV(void *args) TRACE("%p, %u, %u\n", params->commandBuffer, params->taskCount, params->firstTask); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMeshTasksNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->taskCount, params->firstTask); - return STATUS_SUCCESS; } @@ -7647,7 +7497,6 @@ static NTSTATUS thunk64_vkCmdDrawMultiEXT(void *args) TRACE("%p, %u, %p, %u, %u, %u\n", params->commandBuffer, params->drawCount, params->pVertexInfo, params->instanceCount, params->firstInstance, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMultiEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->drawCount, params->pVertexInfo, params->instanceCount, params->firstInstance, params->stride); - return STATUS_SUCCESS; } @@ -7659,7 +7508,6 @@ static NTSTATUS thunk32_vkCmdDrawMultiEXT(void *args) TRACE("%p, %u, %p, %u, %u, %u\n", params->commandBuffer, params->drawCount, params->pVertexInfo, params->instanceCount, params->firstInstance, params->stride); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMultiEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->drawCount, params->pVertexInfo, params->instanceCount, params->firstInstance, params->stride); - return STATUS_SUCCESS; } @@ -7673,7 +7521,6 @@ static NTSTATUS thunk64_vkCmdDrawMultiIndexedEXT(void *args) TRACE("%p, %u, %p, %u, %u, %u, %p\n", params->commandBuffer, params->drawCount, params->pIndexInfo, params->instanceCount, params->firstInstance, params->stride, params->pVertexOffset); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMultiIndexedEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->drawCount, params->pIndexInfo, params->instanceCount, params->firstInstance, params->stride, params->pVertexOffset); - return STATUS_SUCCESS; } @@ -7685,7 +7532,6 @@ static NTSTATUS thunk32_vkCmdDrawMultiIndexedEXT(void *args) TRACE("%p, %u, %p, %u, %u, %u, %p\n", params->commandBuffer, params->drawCount, params->pIndexInfo, params->instanceCount, params->firstInstance, params->stride, params->pVertexOffset); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdDrawMultiIndexedEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->drawCount, params->pIndexInfo, params->instanceCount, params->firstInstance, params->stride, params->pVertexOffset); - return STATUS_SUCCESS; } @@ -7699,7 +7545,6 @@ static NTSTATUS thunk64_vkCmdEndConditionalRenderingEXT(void *args) TRACE("%p\n", params->commandBuffer); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndConditionalRenderingEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); - return STATUS_SUCCESS; } @@ -7711,7 +7556,6 @@ static NTSTATUS thunk32_vkCmdEndConditionalRenderingEXT(void *args) TRACE("%p\n", params->commandBuffer); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndConditionalRenderingEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); - return STATUS_SUCCESS; } @@ -7725,7 +7569,6 @@ static NTSTATUS thunk64_vkCmdEndDebugUtilsLabelEXT(void *args) TRACE("%p\n", params->commandBuffer); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndDebugUtilsLabelEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); - return STATUS_SUCCESS; } @@ -7737,7 +7580,6 @@ static NTSTATUS thunk32_vkCmdEndDebugUtilsLabelEXT(void *args) TRACE("%p\n", params->commandBuffer); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndDebugUtilsLabelEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); - return STATUS_SUCCESS; } @@ -7751,7 +7593,6 @@ static NTSTATUS thunk64_vkCmdEndQuery(void *args) TRACE("%p, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndQuery(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->query); - return STATUS_SUCCESS; } @@ -7763,7 +7604,6 @@ static NTSTATUS thunk32_vkCmdEndQuery(void *args) TRACE("%p, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndQuery(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->query); - return STATUS_SUCCESS; } @@ -7777,7 +7617,6 @@ static NTSTATUS thunk64_vkCmdEndQueryIndexedEXT(void *args) TRACE("%p, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query, params->index); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndQueryIndexedEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->query, params->index); - return STATUS_SUCCESS; } @@ -7789,7 +7628,6 @@ static NTSTATUS thunk32_vkCmdEndQueryIndexedEXT(void *args) TRACE("%p, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->query, params->index); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndQueryIndexedEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->query, params->index); - return STATUS_SUCCESS; } @@ -7803,7 +7641,6 @@ static NTSTATUS thunk64_vkCmdEndRenderPass(void *args) TRACE("%p\n", params->commandBuffer); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRenderPass(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); - return STATUS_SUCCESS; } @@ -7815,7 +7652,6 @@ static NTSTATUS thunk32_vkCmdEndRenderPass(void *args) TRACE("%p\n", params->commandBuffer); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRenderPass(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); - return STATUS_SUCCESS; } @@ -7829,7 +7665,6 @@ static NTSTATUS thunk64_vkCmdEndRenderPass2(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pSubpassEndInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRenderPass2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSubpassEndInfo); - return STATUS_SUCCESS; } @@ -7841,7 +7676,6 @@ static NTSTATUS thunk32_vkCmdEndRenderPass2(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pSubpassEndInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRenderPass2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSubpassEndInfo); - return STATUS_SUCCESS; } @@ -7855,7 +7689,6 @@ static NTSTATUS thunk64_vkCmdEndRenderPass2KHR(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pSubpassEndInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRenderPass2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSubpassEndInfo); - return STATUS_SUCCESS; } @@ -7867,7 +7700,6 @@ static NTSTATUS thunk32_vkCmdEndRenderPass2KHR(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pSubpassEndInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRenderPass2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSubpassEndInfo); - return STATUS_SUCCESS; } @@ -7881,7 +7713,6 @@ static NTSTATUS thunk64_vkCmdEndRendering(void *args) TRACE("%p\n", params->commandBuffer); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRendering(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); - return STATUS_SUCCESS; } @@ -7893,7 +7724,6 @@ static NTSTATUS thunk32_vkCmdEndRendering(void *args) TRACE("%p\n", params->commandBuffer); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRendering(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); - return STATUS_SUCCESS; } @@ -7907,7 +7737,6 @@ static NTSTATUS thunk64_vkCmdEndRenderingKHR(void *args) TRACE("%p\n", params->commandBuffer); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRenderingKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); - return STATUS_SUCCESS; } @@ -7919,7 +7748,6 @@ static NTSTATUS thunk32_vkCmdEndRenderingKHR(void *args) TRACE("%p\n", params->commandBuffer); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndRenderingKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); - return STATUS_SUCCESS; } @@ -7933,7 +7761,6 @@ static NTSTATUS thunk64_vkCmdEndTransformFeedbackEXT(void *args) TRACE("%p, %u, %u, %p, %p\n", params->commandBuffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndTransformFeedbackEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets); - return STATUS_SUCCESS; } @@ -7945,7 +7772,6 @@ static NTSTATUS thunk32_vkCmdEndTransformFeedbackEXT(void *args) TRACE("%p, %u, %u, %p, %p\n", params->commandBuffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdEndTransformFeedbackEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstCounterBuffer, params->counterBufferCount, params->pCounterBuffers, params->pCounterBufferOffsets); - return STATUS_SUCCESS; } @@ -7961,7 +7787,6 @@ static NTSTATUS thunk64_vkCmdExecuteCommands(void *args) pCommandBuffers_host = convert_VkCommandBuffer_array_win_to_host(params->pCommandBuffers, params->commandBufferCount); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdExecuteCommands(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->commandBufferCount, pCommandBuffers_host); - free_VkCommandBuffer_array(pCommandBuffers_host, params->commandBufferCount); return STATUS_SUCCESS; } @@ -7976,7 +7801,6 @@ static NTSTATUS thunk32_vkCmdExecuteCommands(void *args) pCommandBuffers_host = convert_VkCommandBuffer_array_win_to_host(params->pCommandBuffers, params->commandBufferCount); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdExecuteCommands(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->commandBufferCount, pCommandBuffers_host); - free_VkCommandBuffer_array(pCommandBuffers_host, params->commandBufferCount); return STATUS_SUCCESS; } @@ -7991,7 +7815,6 @@ static NTSTATUS thunk64_vkCmdExecuteGeneratedCommandsNV(void *args) TRACE("%p, %u, %p\n", params->commandBuffer, params->isPreprocessed, params->pGeneratedCommandsInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdExecuteGeneratedCommandsNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->isPreprocessed, params->pGeneratedCommandsInfo); - return STATUS_SUCCESS; } @@ -8005,7 +7828,6 @@ static NTSTATUS thunk32_vkCmdExecuteGeneratedCommandsNV(void *args) convert_VkGeneratedCommandsInfoNV_win_to_host(params->pGeneratedCommandsInfo, &pGeneratedCommandsInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdExecuteGeneratedCommandsNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->isPreprocessed, &pGeneratedCommandsInfo_host); - free_VkGeneratedCommandsInfoNV(&pGeneratedCommandsInfo_host); return STATUS_SUCCESS; } @@ -8020,7 +7842,6 @@ static NTSTATUS thunk64_vkCmdFillBuffer(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), wine_dbgstr_longlong(params->size), params->data); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdFillBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->dstBuffer, params->dstOffset, params->size, params->data); - return STATUS_SUCCESS; } @@ -8032,7 +7853,6 @@ static NTSTATUS thunk32_vkCmdFillBuffer(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), wine_dbgstr_longlong(params->size), params->data); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdFillBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->dstBuffer, params->dstOffset, params->size, params->data); - return STATUS_SUCCESS; } @@ -8046,7 +7866,6 @@ static NTSTATUS thunk64_vkCmdInsertDebugUtilsLabelEXT(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pLabelInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdInsertDebugUtilsLabelEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pLabelInfo); - return STATUS_SUCCESS; } @@ -8058,7 +7877,6 @@ static NTSTATUS thunk32_vkCmdInsertDebugUtilsLabelEXT(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pLabelInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdInsertDebugUtilsLabelEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pLabelInfo); - return STATUS_SUCCESS; } @@ -8072,7 +7890,6 @@ static NTSTATUS thunk64_vkCmdNextSubpass(void *args) TRACE("%p, %#x\n", params->commandBuffer, params->contents); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdNextSubpass(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->contents); - return STATUS_SUCCESS; } @@ -8084,7 +7901,6 @@ static NTSTATUS thunk32_vkCmdNextSubpass(void *args) TRACE("%p, %#x\n", params->commandBuffer, params->contents); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdNextSubpass(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->contents); - return STATUS_SUCCESS; } @@ -8098,7 +7914,6 @@ static NTSTATUS thunk64_vkCmdNextSubpass2(void *args) TRACE("%p, %p, %p\n", params->commandBuffer, params->pSubpassBeginInfo, params->pSubpassEndInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdNextSubpass2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSubpassBeginInfo, params->pSubpassEndInfo); - return STATUS_SUCCESS; } @@ -8110,7 +7925,6 @@ static NTSTATUS thunk32_vkCmdNextSubpass2(void *args) TRACE("%p, %p, %p\n", params->commandBuffer, params->pSubpassBeginInfo, params->pSubpassEndInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdNextSubpass2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSubpassBeginInfo, params->pSubpassEndInfo); - return STATUS_SUCCESS; } @@ -8124,7 +7938,6 @@ static NTSTATUS thunk64_vkCmdNextSubpass2KHR(void *args) TRACE("%p, %p, %p\n", params->commandBuffer, params->pSubpassBeginInfo, params->pSubpassEndInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdNextSubpass2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSubpassBeginInfo, params->pSubpassEndInfo); - return STATUS_SUCCESS; } @@ -8136,7 +7949,6 @@ static NTSTATUS thunk32_vkCmdNextSubpass2KHR(void *args) TRACE("%p, %p, %p\n", params->commandBuffer, params->pSubpassBeginInfo, params->pSubpassEndInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdNextSubpass2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSubpassBeginInfo, params->pSubpassEndInfo); - return STATUS_SUCCESS; } @@ -8150,7 +7962,6 @@ static NTSTATUS thunk64_vkCmdPipelineBarrier(void *args) TRACE("%p, %#x, %#x, %#x, %u, %p, %u, %p, %u, %p\n", params->commandBuffer, params->srcStageMask, params->dstStageMask, params->dependencyFlags, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, params->pBufferMemoryBarriers, params->imageMemoryBarrierCount, params->pImageMemoryBarriers); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPipelineBarrier(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcStageMask, params->dstStageMask, params->dependencyFlags, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, params->pBufferMemoryBarriers, params->imageMemoryBarrierCount, params->pImageMemoryBarriers); - return STATUS_SUCCESS; } @@ -8166,7 +7977,6 @@ static NTSTATUS thunk32_vkCmdPipelineBarrier(void *args) pBufferMemoryBarriers_host = convert_VkBufferMemoryBarrier_array_win_to_host(params->pBufferMemoryBarriers, params->bufferMemoryBarrierCount); pImageMemoryBarriers_host = convert_VkImageMemoryBarrier_array_win_to_host(params->pImageMemoryBarriers, params->imageMemoryBarrierCount); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPipelineBarrier(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcStageMask, params->dstStageMask, params->dependencyFlags, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, pBufferMemoryBarriers_host, params->imageMemoryBarrierCount, pImageMemoryBarriers_host); - free_VkBufferMemoryBarrier_array(pBufferMemoryBarriers_host, params->bufferMemoryBarrierCount); free_VkImageMemoryBarrier_array(pImageMemoryBarriers_host, params->imageMemoryBarrierCount); return STATUS_SUCCESS; @@ -8182,7 +7992,6 @@ static NTSTATUS thunk64_vkCmdPipelineBarrier2(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pDependencyInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPipelineBarrier2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pDependencyInfo); - return STATUS_SUCCESS; } @@ -8196,7 +8005,6 @@ static NTSTATUS thunk32_vkCmdPipelineBarrier2(void *args) convert_VkDependencyInfo_win_to_host(params->pDependencyInfo, &pDependencyInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPipelineBarrier2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pDependencyInfo_host); - free_VkDependencyInfo(&pDependencyInfo_host); return STATUS_SUCCESS; } @@ -8211,7 +8019,6 @@ static NTSTATUS thunk64_vkCmdPipelineBarrier2KHR(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pDependencyInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPipelineBarrier2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pDependencyInfo); - return STATUS_SUCCESS; } @@ -8225,7 +8032,6 @@ static NTSTATUS thunk32_vkCmdPipelineBarrier2KHR(void *args) convert_VkDependencyInfo_win_to_host(params->pDependencyInfo, &pDependencyInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPipelineBarrier2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pDependencyInfo_host); - free_VkDependencyInfo(&pDependencyInfo_host); return STATUS_SUCCESS; } @@ -8240,7 +8046,6 @@ static NTSTATUS thunk64_vkCmdPreprocessGeneratedCommandsNV(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pGeneratedCommandsInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPreprocessGeneratedCommandsNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pGeneratedCommandsInfo); - return STATUS_SUCCESS; } @@ -8254,7 +8059,6 @@ static NTSTATUS thunk32_vkCmdPreprocessGeneratedCommandsNV(void *args) convert_VkGeneratedCommandsInfoNV_win_to_host(params->pGeneratedCommandsInfo, &pGeneratedCommandsInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPreprocessGeneratedCommandsNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pGeneratedCommandsInfo_host); - free_VkGeneratedCommandsInfoNV(&pGeneratedCommandsInfo_host); return STATUS_SUCCESS; } @@ -8269,7 +8073,6 @@ static NTSTATUS thunk64_vkCmdPushConstants(void *args) TRACE("%p, 0x%s, %#x, %u, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->layout), params->stageFlags, params->offset, params->size, params->pValues); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPushConstants(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->layout, params->stageFlags, params->offset, params->size, params->pValues); - return STATUS_SUCCESS; } @@ -8281,7 +8084,6 @@ static NTSTATUS thunk32_vkCmdPushConstants(void *args) TRACE("%p, 0x%s, %#x, %u, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->layout), params->stageFlags, params->offset, params->size, params->pValues); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPushConstants(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->layout, params->stageFlags, params->offset, params->size, params->pValues); - return STATUS_SUCCESS; } @@ -8295,7 +8097,6 @@ static NTSTATUS thunk64_vkCmdPushDescriptorSetKHR(void *args) TRACE("%p, %#x, 0x%s, %u, %u, %p\n", params->commandBuffer, params->pipelineBindPoint, wine_dbgstr_longlong(params->layout), params->set, params->descriptorWriteCount, params->pDescriptorWrites); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPushDescriptorSetKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineBindPoint, params->layout, params->set, params->descriptorWriteCount, params->pDescriptorWrites); - return STATUS_SUCCESS; } @@ -8309,7 +8110,6 @@ static NTSTATUS thunk32_vkCmdPushDescriptorSetKHR(void *args) pDescriptorWrites_host = convert_VkWriteDescriptorSet_array_win_to_host(params->pDescriptorWrites, params->descriptorWriteCount); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPushDescriptorSetKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineBindPoint, params->layout, params->set, params->descriptorWriteCount, pDescriptorWrites_host); - free_VkWriteDescriptorSet_array(pDescriptorWrites_host, params->descriptorWriteCount); return STATUS_SUCCESS; } @@ -8324,7 +8124,6 @@ static NTSTATUS thunk64_vkCmdPushDescriptorSetWithTemplateKHR(void *args) TRACE("%p, 0x%s, 0x%s, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->descriptorUpdateTemplate), wine_dbgstr_longlong(params->layout), params->set, params->pData); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPushDescriptorSetWithTemplateKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->descriptorUpdateTemplate, params->layout, params->set, params->pData); - return STATUS_SUCCESS; } @@ -8336,7 +8135,6 @@ static NTSTATUS thunk32_vkCmdPushDescriptorSetWithTemplateKHR(void *args) TRACE("%p, 0x%s, 0x%s, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->descriptorUpdateTemplate), wine_dbgstr_longlong(params->layout), params->set, params->pData); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdPushDescriptorSetWithTemplateKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->descriptorUpdateTemplate, params->layout, params->set, params->pData); - return STATUS_SUCCESS; } @@ -8350,7 +8148,6 @@ static NTSTATUS thunk64_vkCmdResetEvent(void *args) TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->stageMask); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResetEvent(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->stageMask); - return STATUS_SUCCESS; } @@ -8362,7 +8159,6 @@ static NTSTATUS thunk32_vkCmdResetEvent(void *args) TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->stageMask); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResetEvent(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->stageMask); - return STATUS_SUCCESS; } @@ -8376,7 +8172,6 @@ static NTSTATUS thunk64_vkCmdResetEvent2(void *args) TRACE("%p, 0x%s, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->event), wine_dbgstr_longlong(params->stageMask)); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResetEvent2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->stageMask); - return STATUS_SUCCESS; } @@ -8388,7 +8183,6 @@ static NTSTATUS thunk32_vkCmdResetEvent2(void *args) TRACE("%p, 0x%s, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->event), wine_dbgstr_longlong(params->stageMask)); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResetEvent2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->stageMask); - return STATUS_SUCCESS; } @@ -8402,7 +8196,6 @@ static NTSTATUS thunk64_vkCmdResetEvent2KHR(void *args) TRACE("%p, 0x%s, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->event), wine_dbgstr_longlong(params->stageMask)); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResetEvent2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->stageMask); - return STATUS_SUCCESS; } @@ -8414,7 +8207,6 @@ static NTSTATUS thunk32_vkCmdResetEvent2KHR(void *args) TRACE("%p, 0x%s, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->event), wine_dbgstr_longlong(params->stageMask)); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResetEvent2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->stageMask); - return STATUS_SUCCESS; } @@ -8428,7 +8220,6 @@ static NTSTATUS thunk64_vkCmdResetQueryPool(void *args) TRACE("%p, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResetQueryPool(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->firstQuery, params->queryCount); - return STATUS_SUCCESS; } @@ -8440,7 +8231,6 @@ static NTSTATUS thunk32_vkCmdResetQueryPool(void *args) TRACE("%p, 0x%s, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResetQueryPool(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->queryPool, params->firstQuery, params->queryCount); - return STATUS_SUCCESS; } @@ -8454,7 +8244,6 @@ static NTSTATUS thunk64_vkCmdResolveImage(void *args) TRACE("%p, 0x%s, %#x, 0x%s, %#x, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResolveImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcImage, params->srcImageLayout, params->dstImage, params->dstImageLayout, params->regionCount, params->pRegions); - return STATUS_SUCCESS; } @@ -8466,7 +8255,6 @@ static NTSTATUS thunk32_vkCmdResolveImage(void *args) TRACE("%p, 0x%s, %#x, 0x%s, %#x, %u, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->srcImage), params->srcImageLayout, wine_dbgstr_longlong(params->dstImage), params->dstImageLayout, params->regionCount, params->pRegions); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResolveImage(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->srcImage, params->srcImageLayout, params->dstImage, params->dstImageLayout, params->regionCount, params->pRegions); - return STATUS_SUCCESS; } @@ -8480,7 +8268,6 @@ static NTSTATUS thunk64_vkCmdResolveImage2(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pResolveImageInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResolveImage2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pResolveImageInfo); - return STATUS_SUCCESS; } @@ -8494,7 +8281,6 @@ static NTSTATUS thunk32_vkCmdResolveImage2(void *args) convert_VkResolveImageInfo2_win_to_host(params->pResolveImageInfo, &pResolveImageInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResolveImage2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pResolveImageInfo_host); - return STATUS_SUCCESS; } @@ -8508,7 +8294,6 @@ static NTSTATUS thunk64_vkCmdResolveImage2KHR(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pResolveImageInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResolveImage2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pResolveImageInfo); - return STATUS_SUCCESS; } @@ -8522,7 +8307,6 @@ static NTSTATUS thunk32_vkCmdResolveImage2KHR(void *args) convert_VkResolveImageInfo2_win_to_host(params->pResolveImageInfo, &pResolveImageInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdResolveImage2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pResolveImageInfo_host); - return STATUS_SUCCESS; } @@ -8536,7 +8320,6 @@ static NTSTATUS thunk64_vkCmdSetBlendConstants(void *args) TRACE("%p, %p\n", params->commandBuffer, params->blendConstants); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetBlendConstants(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->blendConstants); - return STATUS_SUCCESS; } @@ -8548,7 +8331,6 @@ static NTSTATUS thunk32_vkCmdSetBlendConstants(void *args) TRACE("%p, %p\n", params->commandBuffer, params->blendConstants); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetBlendConstants(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->blendConstants); - return STATUS_SUCCESS; } @@ -8562,7 +8344,6 @@ static NTSTATUS thunk64_vkCmdSetCheckpointNV(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pCheckpointMarker); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetCheckpointNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCheckpointMarker); - return STATUS_SUCCESS; } @@ -8574,7 +8355,6 @@ static NTSTATUS thunk32_vkCmdSetCheckpointNV(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pCheckpointMarker); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetCheckpointNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pCheckpointMarker); - return STATUS_SUCCESS; } @@ -8588,7 +8368,6 @@ static NTSTATUS thunk64_vkCmdSetCoarseSampleOrderNV(void *args) TRACE("%p, %#x, %u, %p\n", params->commandBuffer, params->sampleOrderType, params->customSampleOrderCount, params->pCustomSampleOrders); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetCoarseSampleOrderNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->sampleOrderType, params->customSampleOrderCount, params->pCustomSampleOrders); - return STATUS_SUCCESS; } @@ -8600,7 +8379,6 @@ static NTSTATUS thunk32_vkCmdSetCoarseSampleOrderNV(void *args) TRACE("%p, %#x, %u, %p\n", params->commandBuffer, params->sampleOrderType, params->customSampleOrderCount, params->pCustomSampleOrders); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetCoarseSampleOrderNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->sampleOrderType, params->customSampleOrderCount, params->pCustomSampleOrders); - return STATUS_SUCCESS; } @@ -8614,7 +8392,6 @@ static NTSTATUS thunk64_vkCmdSetColorWriteEnableEXT(void *args) TRACE("%p, %u, %p\n", params->commandBuffer, params->attachmentCount, params->pColorWriteEnables); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetColorWriteEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->attachmentCount, params->pColorWriteEnables); - return STATUS_SUCCESS; } @@ -8626,7 +8403,6 @@ static NTSTATUS thunk32_vkCmdSetColorWriteEnableEXT(void *args) TRACE("%p, %u, %p\n", params->commandBuffer, params->attachmentCount, params->pColorWriteEnables); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetColorWriteEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->attachmentCount, params->pColorWriteEnables); - return STATUS_SUCCESS; } @@ -8640,7 +8416,6 @@ static NTSTATUS thunk64_vkCmdSetCullMode(void *args) TRACE("%p, %#x\n", params->commandBuffer, params->cullMode); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetCullMode(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->cullMode); - return STATUS_SUCCESS; } @@ -8652,7 +8427,6 @@ static NTSTATUS thunk32_vkCmdSetCullMode(void *args) TRACE("%p, %#x\n", params->commandBuffer, params->cullMode); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetCullMode(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->cullMode); - return STATUS_SUCCESS; } @@ -8666,7 +8440,6 @@ static NTSTATUS thunk64_vkCmdSetCullModeEXT(void *args) TRACE("%p, %#x\n", params->commandBuffer, params->cullMode); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetCullModeEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->cullMode); - return STATUS_SUCCESS; } @@ -8678,7 +8451,6 @@ static NTSTATUS thunk32_vkCmdSetCullModeEXT(void *args) TRACE("%p, %#x\n", params->commandBuffer, params->cullMode); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetCullModeEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->cullMode); - return STATUS_SUCCESS; } @@ -8692,7 +8464,6 @@ static NTSTATUS thunk64_vkCmdSetDepthBias(void *args) TRACE("%p, %f, %f, %f\n", params->commandBuffer, params->depthBiasConstantFactor, params->depthBiasClamp, params->depthBiasSlopeFactor); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBias(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBiasConstantFactor, params->depthBiasClamp, params->depthBiasSlopeFactor); - return STATUS_SUCCESS; } @@ -8704,7 +8475,6 @@ static NTSTATUS thunk32_vkCmdSetDepthBias(void *args) TRACE("%p, %f, %f, %f\n", params->commandBuffer, params->depthBiasConstantFactor, params->depthBiasClamp, params->depthBiasSlopeFactor); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBias(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBiasConstantFactor, params->depthBiasClamp, params->depthBiasSlopeFactor); - return STATUS_SUCCESS; } @@ -8718,7 +8488,6 @@ static NTSTATUS thunk64_vkCmdSetDepthBiasEnable(void *args) TRACE("%p, %u\n", params->commandBuffer, params->depthBiasEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBiasEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBiasEnable); - return STATUS_SUCCESS; } @@ -8730,7 +8499,6 @@ static NTSTATUS thunk32_vkCmdSetDepthBiasEnable(void *args) TRACE("%p, %u\n", params->commandBuffer, params->depthBiasEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBiasEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBiasEnable); - return STATUS_SUCCESS; } @@ -8744,7 +8512,6 @@ static NTSTATUS thunk64_vkCmdSetDepthBiasEnableEXT(void *args) TRACE("%p, %u\n", params->commandBuffer, params->depthBiasEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBiasEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBiasEnable); - return STATUS_SUCCESS; } @@ -8756,7 +8523,6 @@ static NTSTATUS thunk32_vkCmdSetDepthBiasEnableEXT(void *args) TRACE("%p, %u\n", params->commandBuffer, params->depthBiasEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBiasEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBiasEnable); - return STATUS_SUCCESS; } @@ -8770,7 +8536,6 @@ static NTSTATUS thunk64_vkCmdSetDepthBounds(void *args) TRACE("%p, %f, %f\n", params->commandBuffer, params->minDepthBounds, params->maxDepthBounds); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBounds(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->minDepthBounds, params->maxDepthBounds); - return STATUS_SUCCESS; } @@ -8782,7 +8547,6 @@ static NTSTATUS thunk32_vkCmdSetDepthBounds(void *args) TRACE("%p, %f, %f\n", params->commandBuffer, params->minDepthBounds, params->maxDepthBounds); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBounds(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->minDepthBounds, params->maxDepthBounds); - return STATUS_SUCCESS; } @@ -8796,7 +8560,6 @@ static NTSTATUS thunk64_vkCmdSetDepthBoundsTestEnable(void *args) TRACE("%p, %u\n", params->commandBuffer, params->depthBoundsTestEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBoundsTestEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBoundsTestEnable); - return STATUS_SUCCESS; } @@ -8808,7 +8571,6 @@ static NTSTATUS thunk32_vkCmdSetDepthBoundsTestEnable(void *args) TRACE("%p, %u\n", params->commandBuffer, params->depthBoundsTestEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBoundsTestEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBoundsTestEnable); - return STATUS_SUCCESS; } @@ -8822,7 +8584,6 @@ static NTSTATUS thunk64_vkCmdSetDepthBoundsTestEnableEXT(void *args) TRACE("%p, %u\n", params->commandBuffer, params->depthBoundsTestEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBoundsTestEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBoundsTestEnable); - return STATUS_SUCCESS; } @@ -8834,7 +8595,6 @@ static NTSTATUS thunk32_vkCmdSetDepthBoundsTestEnableEXT(void *args) TRACE("%p, %u\n", params->commandBuffer, params->depthBoundsTestEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthBoundsTestEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthBoundsTestEnable); - return STATUS_SUCCESS; } @@ -8848,7 +8608,6 @@ static NTSTATUS thunk64_vkCmdSetDepthCompareOp(void *args) TRACE("%p, %#x\n", params->commandBuffer, params->depthCompareOp); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthCompareOp(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthCompareOp); - return STATUS_SUCCESS; } @@ -8860,7 +8619,6 @@ static NTSTATUS thunk32_vkCmdSetDepthCompareOp(void *args) TRACE("%p, %#x\n", params->commandBuffer, params->depthCompareOp); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthCompareOp(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthCompareOp); - return STATUS_SUCCESS; } @@ -8874,7 +8632,6 @@ static NTSTATUS thunk64_vkCmdSetDepthCompareOpEXT(void *args) TRACE("%p, %#x\n", params->commandBuffer, params->depthCompareOp); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthCompareOpEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthCompareOp); - return STATUS_SUCCESS; } @@ -8886,7 +8643,6 @@ static NTSTATUS thunk32_vkCmdSetDepthCompareOpEXT(void *args) TRACE("%p, %#x\n", params->commandBuffer, params->depthCompareOp); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthCompareOpEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthCompareOp); - return STATUS_SUCCESS; } @@ -8900,7 +8656,6 @@ static NTSTATUS thunk64_vkCmdSetDepthTestEnable(void *args) TRACE("%p, %u\n", params->commandBuffer, params->depthTestEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthTestEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthTestEnable); - return STATUS_SUCCESS; } @@ -8912,7 +8667,6 @@ static NTSTATUS thunk32_vkCmdSetDepthTestEnable(void *args) TRACE("%p, %u\n", params->commandBuffer, params->depthTestEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthTestEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthTestEnable); - return STATUS_SUCCESS; } @@ -8926,7 +8680,6 @@ static NTSTATUS thunk64_vkCmdSetDepthTestEnableEXT(void *args) TRACE("%p, %u\n", params->commandBuffer, params->depthTestEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthTestEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthTestEnable); - return STATUS_SUCCESS; } @@ -8938,7 +8691,6 @@ static NTSTATUS thunk32_vkCmdSetDepthTestEnableEXT(void *args) TRACE("%p, %u\n", params->commandBuffer, params->depthTestEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthTestEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthTestEnable); - return STATUS_SUCCESS; } @@ -8952,7 +8704,6 @@ static NTSTATUS thunk64_vkCmdSetDepthWriteEnable(void *args) TRACE("%p, %u\n", params->commandBuffer, params->depthWriteEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthWriteEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthWriteEnable); - return STATUS_SUCCESS; } @@ -8964,7 +8715,6 @@ static NTSTATUS thunk32_vkCmdSetDepthWriteEnable(void *args) TRACE("%p, %u\n", params->commandBuffer, params->depthWriteEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthWriteEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthWriteEnable); - return STATUS_SUCCESS; } @@ -8978,7 +8728,6 @@ static NTSTATUS thunk64_vkCmdSetDepthWriteEnableEXT(void *args) TRACE("%p, %u\n", params->commandBuffer, params->depthWriteEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthWriteEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthWriteEnable); - return STATUS_SUCCESS; } @@ -8990,7 +8739,6 @@ static NTSTATUS thunk32_vkCmdSetDepthWriteEnableEXT(void *args) TRACE("%p, %u\n", params->commandBuffer, params->depthWriteEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDepthWriteEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->depthWriteEnable); - return STATUS_SUCCESS; } @@ -9004,7 +8752,6 @@ static NTSTATUS thunk64_vkCmdSetDeviceMask(void *args) TRACE("%p, %u\n", params->commandBuffer, params->deviceMask); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDeviceMask(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->deviceMask); - return STATUS_SUCCESS; } @@ -9016,7 +8763,6 @@ static NTSTATUS thunk32_vkCmdSetDeviceMask(void *args) TRACE("%p, %u\n", params->commandBuffer, params->deviceMask); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDeviceMask(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->deviceMask); - return STATUS_SUCCESS; } @@ -9030,7 +8776,6 @@ static NTSTATUS thunk64_vkCmdSetDeviceMaskKHR(void *args) TRACE("%p, %u\n", params->commandBuffer, params->deviceMask); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDeviceMaskKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->deviceMask); - return STATUS_SUCCESS; } @@ -9042,7 +8787,6 @@ static NTSTATUS thunk32_vkCmdSetDeviceMaskKHR(void *args) TRACE("%p, %u\n", params->commandBuffer, params->deviceMask); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDeviceMaskKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->deviceMask); - return STATUS_SUCCESS; } @@ -9056,7 +8800,6 @@ static NTSTATUS thunk64_vkCmdSetDiscardRectangleEXT(void *args) TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstDiscardRectangle, params->discardRectangleCount, params->pDiscardRectangles); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDiscardRectangleEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstDiscardRectangle, params->discardRectangleCount, params->pDiscardRectangles); - return STATUS_SUCCESS; } @@ -9068,7 +8811,6 @@ static NTSTATUS thunk32_vkCmdSetDiscardRectangleEXT(void *args) TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstDiscardRectangle, params->discardRectangleCount, params->pDiscardRectangles); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetDiscardRectangleEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstDiscardRectangle, params->discardRectangleCount, params->pDiscardRectangles); - return STATUS_SUCCESS; } @@ -9082,7 +8824,6 @@ static NTSTATUS thunk64_vkCmdSetEvent(void *args) TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->stageMask); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetEvent(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->stageMask); - return STATUS_SUCCESS; } @@ -9094,7 +8835,6 @@ static NTSTATUS thunk32_vkCmdSetEvent(void *args) TRACE("%p, 0x%s, %#x\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->stageMask); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetEvent(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->stageMask); - return STATUS_SUCCESS; } @@ -9108,7 +8848,6 @@ static NTSTATUS thunk64_vkCmdSetEvent2(void *args) TRACE("%p, 0x%s, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->pDependencyInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetEvent2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->pDependencyInfo); - return STATUS_SUCCESS; } @@ -9122,7 +8861,6 @@ static NTSTATUS thunk32_vkCmdSetEvent2(void *args) convert_VkDependencyInfo_win_to_host(params->pDependencyInfo, &pDependencyInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetEvent2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, &pDependencyInfo_host); - free_VkDependencyInfo(&pDependencyInfo_host); return STATUS_SUCCESS; } @@ -9137,7 +8875,6 @@ static NTSTATUS thunk64_vkCmdSetEvent2KHR(void *args) TRACE("%p, 0x%s, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->event), params->pDependencyInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetEvent2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, params->pDependencyInfo); - return STATUS_SUCCESS; } @@ -9151,7 +8888,6 @@ static NTSTATUS thunk32_vkCmdSetEvent2KHR(void *args) convert_VkDependencyInfo_win_to_host(params->pDependencyInfo, &pDependencyInfo_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetEvent2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->event, &pDependencyInfo_host); - free_VkDependencyInfo(&pDependencyInfo_host); return STATUS_SUCCESS; } @@ -9166,7 +8902,6 @@ static NTSTATUS thunk64_vkCmdSetExclusiveScissorNV(void *args) TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstExclusiveScissor, params->exclusiveScissorCount, params->pExclusiveScissors); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetExclusiveScissorNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstExclusiveScissor, params->exclusiveScissorCount, params->pExclusiveScissors); - return STATUS_SUCCESS; } @@ -9178,7 +8913,6 @@ static NTSTATUS thunk32_vkCmdSetExclusiveScissorNV(void *args) TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstExclusiveScissor, params->exclusiveScissorCount, params->pExclusiveScissors); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetExclusiveScissorNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstExclusiveScissor, params->exclusiveScissorCount, params->pExclusiveScissors); - return STATUS_SUCCESS; } @@ -9192,7 +8926,6 @@ static NTSTATUS thunk64_vkCmdSetFragmentShadingRateEnumNV(void *args) TRACE("%p, %#x, %p\n", params->commandBuffer, params->shadingRate, params->combinerOps); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetFragmentShadingRateEnumNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->shadingRate, params->combinerOps); - return STATUS_SUCCESS; } @@ -9204,7 +8937,6 @@ static NTSTATUS thunk32_vkCmdSetFragmentShadingRateEnumNV(void *args) TRACE("%p, %#x, %p\n", params->commandBuffer, params->shadingRate, params->combinerOps); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetFragmentShadingRateEnumNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->shadingRate, params->combinerOps); - return STATUS_SUCCESS; } @@ -9218,7 +8950,6 @@ static NTSTATUS thunk64_vkCmdSetFragmentShadingRateKHR(void *args) TRACE("%p, %p, %p\n", params->commandBuffer, params->pFragmentSize, params->combinerOps); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetFragmentShadingRateKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pFragmentSize, params->combinerOps); - return STATUS_SUCCESS; } @@ -9230,7 +8961,6 @@ static NTSTATUS thunk32_vkCmdSetFragmentShadingRateKHR(void *args) TRACE("%p, %p, %p\n", params->commandBuffer, params->pFragmentSize, params->combinerOps); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetFragmentShadingRateKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pFragmentSize, params->combinerOps); - return STATUS_SUCCESS; } @@ -9244,7 +8974,6 @@ static NTSTATUS thunk64_vkCmdSetFrontFace(void *args) TRACE("%p, %#x\n", params->commandBuffer, params->frontFace); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetFrontFace(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->frontFace); - return STATUS_SUCCESS; } @@ -9256,7 +8985,6 @@ static NTSTATUS thunk32_vkCmdSetFrontFace(void *args) TRACE("%p, %#x\n", params->commandBuffer, params->frontFace); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetFrontFace(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->frontFace); - return STATUS_SUCCESS; } @@ -9270,7 +8998,6 @@ static NTSTATUS thunk64_vkCmdSetFrontFaceEXT(void *args) TRACE("%p, %#x\n", params->commandBuffer, params->frontFace); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetFrontFaceEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->frontFace); - return STATUS_SUCCESS; } @@ -9282,7 +9009,6 @@ static NTSTATUS thunk32_vkCmdSetFrontFaceEXT(void *args) TRACE("%p, %#x\n", params->commandBuffer, params->frontFace); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetFrontFaceEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->frontFace); - return STATUS_SUCCESS; } @@ -9296,7 +9022,6 @@ static NTSTATUS thunk64_vkCmdSetLineStippleEXT(void *args) TRACE("%p, %u, %u\n", params->commandBuffer, params->lineStippleFactor, params->lineStipplePattern); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetLineStippleEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->lineStippleFactor, params->lineStipplePattern); - return STATUS_SUCCESS; } @@ -9308,7 +9033,6 @@ static NTSTATUS thunk32_vkCmdSetLineStippleEXT(void *args) TRACE("%p, %u, %u\n", params->commandBuffer, params->lineStippleFactor, params->lineStipplePattern); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetLineStippleEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->lineStippleFactor, params->lineStipplePattern); - return STATUS_SUCCESS; } @@ -9322,7 +9046,6 @@ static NTSTATUS thunk64_vkCmdSetLineWidth(void *args) TRACE("%p, %f\n", params->commandBuffer, params->lineWidth); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetLineWidth(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->lineWidth); - return STATUS_SUCCESS; } @@ -9334,7 +9057,6 @@ static NTSTATUS thunk32_vkCmdSetLineWidth(void *args) TRACE("%p, %f\n", params->commandBuffer, params->lineWidth); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetLineWidth(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->lineWidth); - return STATUS_SUCCESS; } @@ -9348,7 +9070,6 @@ static NTSTATUS thunk64_vkCmdSetLogicOpEXT(void *args) TRACE("%p, %#x\n", params->commandBuffer, params->logicOp); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetLogicOpEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->logicOp); - return STATUS_SUCCESS; } @@ -9360,7 +9081,6 @@ static NTSTATUS thunk32_vkCmdSetLogicOpEXT(void *args) TRACE("%p, %#x\n", params->commandBuffer, params->logicOp); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetLogicOpEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->logicOp); - return STATUS_SUCCESS; } @@ -9374,7 +9094,6 @@ static NTSTATUS thunk64_vkCmdSetPatchControlPointsEXT(void *args) TRACE("%p, %u\n", params->commandBuffer, params->patchControlPoints); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPatchControlPointsEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->patchControlPoints); - return STATUS_SUCCESS; } @@ -9386,7 +9105,6 @@ static NTSTATUS thunk32_vkCmdSetPatchControlPointsEXT(void *args) TRACE("%p, %u\n", params->commandBuffer, params->patchControlPoints); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPatchControlPointsEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->patchControlPoints); - return STATUS_SUCCESS; } @@ -9401,7 +9119,6 @@ static NTSTATUS thunk64_vkCmdSetPerformanceMarkerINTEL(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo); result = wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPerformanceMarkerINTEL(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pMarkerInfo); - return result; } @@ -9416,7 +9133,6 @@ static NTSTATUS thunk32_vkCmdSetPerformanceMarkerINTEL(void *args) convert_VkPerformanceMarkerInfoINTEL_win_to_host(params->pMarkerInfo, &pMarkerInfo_host); result = wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPerformanceMarkerINTEL(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pMarkerInfo_host); - return result; } @@ -9431,7 +9147,6 @@ static NTSTATUS thunk64_vkCmdSetPerformanceOverrideINTEL(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pOverrideInfo); result = wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPerformanceOverrideINTEL(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pOverrideInfo); - return result; } @@ -9446,7 +9161,6 @@ static NTSTATUS thunk32_vkCmdSetPerformanceOverrideINTEL(void *args) convert_VkPerformanceOverrideInfoINTEL_win_to_host(params->pOverrideInfo, &pOverrideInfo_host); result = wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPerformanceOverrideINTEL(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pOverrideInfo_host); - return result; } @@ -9461,7 +9175,6 @@ static NTSTATUS thunk64_vkCmdSetPerformanceStreamMarkerINTEL(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo); result = wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPerformanceStreamMarkerINTEL(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pMarkerInfo); - return result; } @@ -9474,7 +9187,6 @@ static NTSTATUS thunk32_vkCmdSetPerformanceStreamMarkerINTEL(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pMarkerInfo); result = wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPerformanceStreamMarkerINTEL(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pMarkerInfo); - return result; } @@ -9488,7 +9200,6 @@ static NTSTATUS thunk64_vkCmdSetPrimitiveRestartEnable(void *args) TRACE("%p, %u\n", params->commandBuffer, params->primitiveRestartEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPrimitiveRestartEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->primitiveRestartEnable); - return STATUS_SUCCESS; } @@ -9500,7 +9211,6 @@ static NTSTATUS thunk32_vkCmdSetPrimitiveRestartEnable(void *args) TRACE("%p, %u\n", params->commandBuffer, params->primitiveRestartEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPrimitiveRestartEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->primitiveRestartEnable); - return STATUS_SUCCESS; } @@ -9514,7 +9224,6 @@ static NTSTATUS thunk64_vkCmdSetPrimitiveRestartEnableEXT(void *args) TRACE("%p, %u\n", params->commandBuffer, params->primitiveRestartEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPrimitiveRestartEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->primitiveRestartEnable); - return STATUS_SUCCESS; } @@ -9526,7 +9235,6 @@ static NTSTATUS thunk32_vkCmdSetPrimitiveRestartEnableEXT(void *args) TRACE("%p, %u\n", params->commandBuffer, params->primitiveRestartEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPrimitiveRestartEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->primitiveRestartEnable); - return STATUS_SUCCESS; } @@ -9540,7 +9248,6 @@ static NTSTATUS thunk64_vkCmdSetPrimitiveTopology(void *args) TRACE("%p, %#x\n", params->commandBuffer, params->primitiveTopology); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPrimitiveTopology(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->primitiveTopology); - return STATUS_SUCCESS; } @@ -9552,7 +9259,6 @@ static NTSTATUS thunk32_vkCmdSetPrimitiveTopology(void *args) TRACE("%p, %#x\n", params->commandBuffer, params->primitiveTopology); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPrimitiveTopology(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->primitiveTopology); - return STATUS_SUCCESS; } @@ -9566,7 +9272,6 @@ static NTSTATUS thunk64_vkCmdSetPrimitiveTopologyEXT(void *args) TRACE("%p, %#x\n", params->commandBuffer, params->primitiveTopology); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPrimitiveTopologyEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->primitiveTopology); - return STATUS_SUCCESS; } @@ -9578,7 +9283,6 @@ static NTSTATUS thunk32_vkCmdSetPrimitiveTopologyEXT(void *args) TRACE("%p, %#x\n", params->commandBuffer, params->primitiveTopology); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetPrimitiveTopologyEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->primitiveTopology); - return STATUS_SUCCESS; } @@ -9592,7 +9296,6 @@ static NTSTATUS thunk64_vkCmdSetRasterizerDiscardEnable(void *args) TRACE("%p, %u\n", params->commandBuffer, params->rasterizerDiscardEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetRasterizerDiscardEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->rasterizerDiscardEnable); - return STATUS_SUCCESS; } @@ -9604,7 +9307,6 @@ static NTSTATUS thunk32_vkCmdSetRasterizerDiscardEnable(void *args) TRACE("%p, %u\n", params->commandBuffer, params->rasterizerDiscardEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetRasterizerDiscardEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->rasterizerDiscardEnable); - return STATUS_SUCCESS; } @@ -9618,7 +9320,6 @@ static NTSTATUS thunk64_vkCmdSetRasterizerDiscardEnableEXT(void *args) TRACE("%p, %u\n", params->commandBuffer, params->rasterizerDiscardEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetRasterizerDiscardEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->rasterizerDiscardEnable); - return STATUS_SUCCESS; } @@ -9630,7 +9331,6 @@ static NTSTATUS thunk32_vkCmdSetRasterizerDiscardEnableEXT(void *args) TRACE("%p, %u\n", params->commandBuffer, params->rasterizerDiscardEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetRasterizerDiscardEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->rasterizerDiscardEnable); - return STATUS_SUCCESS; } @@ -9644,7 +9344,6 @@ static NTSTATUS thunk64_vkCmdSetRayTracingPipelineStackSizeKHR(void *args) TRACE("%p, %u\n", params->commandBuffer, params->pipelineStackSize); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetRayTracingPipelineStackSizeKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineStackSize); - return STATUS_SUCCESS; } @@ -9656,7 +9355,6 @@ static NTSTATUS thunk32_vkCmdSetRayTracingPipelineStackSizeKHR(void *args) TRACE("%p, %u\n", params->commandBuffer, params->pipelineStackSize); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetRayTracingPipelineStackSizeKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineStackSize); - return STATUS_SUCCESS; } @@ -9670,7 +9368,6 @@ static NTSTATUS thunk64_vkCmdSetSampleLocationsEXT(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pSampleLocationsInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetSampleLocationsEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSampleLocationsInfo); - return STATUS_SUCCESS; } @@ -9682,7 +9379,6 @@ static NTSTATUS thunk32_vkCmdSetSampleLocationsEXT(void *args) TRACE("%p, %p\n", params->commandBuffer, params->pSampleLocationsInfo); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetSampleLocationsEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pSampleLocationsInfo); - return STATUS_SUCCESS; } @@ -9696,7 +9392,6 @@ static NTSTATUS thunk64_vkCmdSetScissor(void *args) TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstScissor, params->scissorCount, params->pScissors); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetScissor(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstScissor, params->scissorCount, params->pScissors); - return STATUS_SUCCESS; } @@ -9708,7 +9403,6 @@ static NTSTATUS thunk32_vkCmdSetScissor(void *args) TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstScissor, params->scissorCount, params->pScissors); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetScissor(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstScissor, params->scissorCount, params->pScissors); - return STATUS_SUCCESS; } @@ -9722,7 +9416,6 @@ static NTSTATUS thunk64_vkCmdSetScissorWithCount(void *args) TRACE("%p, %u, %p\n", params->commandBuffer, params->scissorCount, params->pScissors); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetScissorWithCount(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->scissorCount, params->pScissors); - return STATUS_SUCCESS; } @@ -9734,7 +9427,6 @@ static NTSTATUS thunk32_vkCmdSetScissorWithCount(void *args) TRACE("%p, %u, %p\n", params->commandBuffer, params->scissorCount, params->pScissors); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetScissorWithCount(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->scissorCount, params->pScissors); - return STATUS_SUCCESS; } @@ -9748,7 +9440,6 @@ static NTSTATUS thunk64_vkCmdSetScissorWithCountEXT(void *args) TRACE("%p, %u, %p\n", params->commandBuffer, params->scissorCount, params->pScissors); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetScissorWithCountEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->scissorCount, params->pScissors); - return STATUS_SUCCESS; } @@ -9760,7 +9451,6 @@ static NTSTATUS thunk32_vkCmdSetScissorWithCountEXT(void *args) TRACE("%p, %u, %p\n", params->commandBuffer, params->scissorCount, params->pScissors); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetScissorWithCountEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->scissorCount, params->pScissors); - return STATUS_SUCCESS; } @@ -9774,7 +9464,6 @@ static NTSTATUS thunk64_vkCmdSetStencilCompareMask(void *args) TRACE("%p, %#x, %u\n", params->commandBuffer, params->faceMask, params->compareMask); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilCompareMask(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->compareMask); - return STATUS_SUCCESS; } @@ -9786,7 +9475,6 @@ static NTSTATUS thunk32_vkCmdSetStencilCompareMask(void *args) TRACE("%p, %#x, %u\n", params->commandBuffer, params->faceMask, params->compareMask); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilCompareMask(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->compareMask); - return STATUS_SUCCESS; } @@ -9800,7 +9488,6 @@ static NTSTATUS thunk64_vkCmdSetStencilOp(void *args) TRACE("%p, %#x, %#x, %#x, %#x, %#x\n", params->commandBuffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilOp(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp); - return STATUS_SUCCESS; } @@ -9812,7 +9499,6 @@ static NTSTATUS thunk32_vkCmdSetStencilOp(void *args) TRACE("%p, %#x, %#x, %#x, %#x, %#x\n", params->commandBuffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilOp(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp); - return STATUS_SUCCESS; } @@ -9826,7 +9512,6 @@ static NTSTATUS thunk64_vkCmdSetStencilOpEXT(void *args) TRACE("%p, %#x, %#x, %#x, %#x, %#x\n", params->commandBuffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilOpEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp); - return STATUS_SUCCESS; } @@ -9838,7 +9523,6 @@ static NTSTATUS thunk32_vkCmdSetStencilOpEXT(void *args) TRACE("%p, %#x, %#x, %#x, %#x, %#x\n", params->commandBuffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilOpEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->failOp, params->passOp, params->depthFailOp, params->compareOp); - return STATUS_SUCCESS; } @@ -9852,7 +9536,6 @@ static NTSTATUS thunk64_vkCmdSetStencilReference(void *args) TRACE("%p, %#x, %u\n", params->commandBuffer, params->faceMask, params->reference); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilReference(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->reference); - return STATUS_SUCCESS; } @@ -9864,7 +9547,6 @@ static NTSTATUS thunk32_vkCmdSetStencilReference(void *args) TRACE("%p, %#x, %u\n", params->commandBuffer, params->faceMask, params->reference); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilReference(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->reference); - return STATUS_SUCCESS; } @@ -9878,7 +9560,6 @@ static NTSTATUS thunk64_vkCmdSetStencilTestEnable(void *args) TRACE("%p, %u\n", params->commandBuffer, params->stencilTestEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilTestEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stencilTestEnable); - return STATUS_SUCCESS; } @@ -9890,7 +9571,6 @@ static NTSTATUS thunk32_vkCmdSetStencilTestEnable(void *args) TRACE("%p, %u\n", params->commandBuffer, params->stencilTestEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilTestEnable(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stencilTestEnable); - return STATUS_SUCCESS; } @@ -9904,7 +9584,6 @@ static NTSTATUS thunk64_vkCmdSetStencilTestEnableEXT(void *args) TRACE("%p, %u\n", params->commandBuffer, params->stencilTestEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilTestEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stencilTestEnable); - return STATUS_SUCCESS; } @@ -9916,7 +9595,6 @@ static NTSTATUS thunk32_vkCmdSetStencilTestEnableEXT(void *args) TRACE("%p, %u\n", params->commandBuffer, params->stencilTestEnable); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilTestEnableEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stencilTestEnable); - return STATUS_SUCCESS; } @@ -9930,7 +9608,6 @@ static NTSTATUS thunk64_vkCmdSetStencilWriteMask(void *args) TRACE("%p, %#x, %u\n", params->commandBuffer, params->faceMask, params->writeMask); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilWriteMask(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->writeMask); - return STATUS_SUCCESS; } @@ -9942,7 +9619,6 @@ static NTSTATUS thunk32_vkCmdSetStencilWriteMask(void *args) TRACE("%p, %#x, %u\n", params->commandBuffer, params->faceMask, params->writeMask); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetStencilWriteMask(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->faceMask, params->writeMask); - return STATUS_SUCCESS; } @@ -9956,7 +9632,6 @@ static NTSTATUS thunk64_vkCmdSetVertexInputEXT(void *args) TRACE("%p, %u, %p, %u, %p\n", params->commandBuffer, params->vertexBindingDescriptionCount, params->pVertexBindingDescriptions, params->vertexAttributeDescriptionCount, params->pVertexAttributeDescriptions); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetVertexInputEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->vertexBindingDescriptionCount, params->pVertexBindingDescriptions, params->vertexAttributeDescriptionCount, params->pVertexAttributeDescriptions); - return STATUS_SUCCESS; } @@ -9968,7 +9643,6 @@ static NTSTATUS thunk32_vkCmdSetVertexInputEXT(void *args) TRACE("%p, %u, %p, %u, %p\n", params->commandBuffer, params->vertexBindingDescriptionCount, params->pVertexBindingDescriptions, params->vertexAttributeDescriptionCount, params->pVertexAttributeDescriptions); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetVertexInputEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->vertexBindingDescriptionCount, params->pVertexBindingDescriptions, params->vertexAttributeDescriptionCount, params->pVertexAttributeDescriptions); - return STATUS_SUCCESS; } @@ -9982,7 +9656,6 @@ static NTSTATUS thunk64_vkCmdSetViewport(void *args) TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstViewport, params->viewportCount, params->pViewports); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewport(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstViewport, params->viewportCount, params->pViewports); - return STATUS_SUCCESS; } @@ -9994,7 +9667,6 @@ static NTSTATUS thunk32_vkCmdSetViewport(void *args) TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstViewport, params->viewportCount, params->pViewports); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewport(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstViewport, params->viewportCount, params->pViewports); - return STATUS_SUCCESS; } @@ -10008,7 +9680,6 @@ static NTSTATUS thunk64_vkCmdSetViewportShadingRatePaletteNV(void *args) TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstViewport, params->viewportCount, params->pShadingRatePalettes); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewportShadingRatePaletteNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstViewport, params->viewportCount, params->pShadingRatePalettes); - return STATUS_SUCCESS; } @@ -10020,7 +9691,6 @@ static NTSTATUS thunk32_vkCmdSetViewportShadingRatePaletteNV(void *args) TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstViewport, params->viewportCount, params->pShadingRatePalettes); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewportShadingRatePaletteNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstViewport, params->viewportCount, params->pShadingRatePalettes); - return STATUS_SUCCESS; } @@ -10034,7 +9704,6 @@ static NTSTATUS thunk64_vkCmdSetViewportWScalingNV(void *args) TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstViewport, params->viewportCount, params->pViewportWScalings); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewportWScalingNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstViewport, params->viewportCount, params->pViewportWScalings); - return STATUS_SUCCESS; } @@ -10046,7 +9715,6 @@ static NTSTATUS thunk32_vkCmdSetViewportWScalingNV(void *args) TRACE("%p, %u, %u, %p\n", params->commandBuffer, params->firstViewport, params->viewportCount, params->pViewportWScalings); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewportWScalingNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->firstViewport, params->viewportCount, params->pViewportWScalings); - return STATUS_SUCCESS; } @@ -10060,7 +9728,6 @@ static NTSTATUS thunk64_vkCmdSetViewportWithCount(void *args) TRACE("%p, %u, %p\n", params->commandBuffer, params->viewportCount, params->pViewports); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewportWithCount(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->viewportCount, params->pViewports); - return STATUS_SUCCESS; } @@ -10072,7 +9739,6 @@ static NTSTATUS thunk32_vkCmdSetViewportWithCount(void *args) TRACE("%p, %u, %p\n", params->commandBuffer, params->viewportCount, params->pViewports); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewportWithCount(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->viewportCount, params->pViewports); - return STATUS_SUCCESS; } @@ -10086,7 +9752,6 @@ static NTSTATUS thunk64_vkCmdSetViewportWithCountEXT(void *args) TRACE("%p, %u, %p\n", params->commandBuffer, params->viewportCount, params->pViewports); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewportWithCountEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->viewportCount, params->pViewports); - return STATUS_SUCCESS; } @@ -10098,7 +9763,6 @@ static NTSTATUS thunk32_vkCmdSetViewportWithCountEXT(void *args) TRACE("%p, %u, %p\n", params->commandBuffer, params->viewportCount, params->pViewports); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSetViewportWithCountEXT(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->viewportCount, params->pViewports); - return STATUS_SUCCESS; } @@ -10112,7 +9776,6 @@ static NTSTATUS thunk64_vkCmdSubpassShadingHUAWEI(void *args) TRACE("%p\n", params->commandBuffer); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSubpassShadingHUAWEI(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); - return STATUS_SUCCESS; } @@ -10124,7 +9787,6 @@ static NTSTATUS thunk32_vkCmdSubpassShadingHUAWEI(void *args) TRACE("%p\n", params->commandBuffer); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdSubpassShadingHUAWEI(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); - return STATUS_SUCCESS; } @@ -10138,7 +9800,6 @@ static NTSTATUS thunk64_vkCmdTraceRaysIndirect2KHR(void *args) TRACE("%p, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->indirectDeviceAddress)); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdTraceRaysIndirect2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->indirectDeviceAddress); - return STATUS_SUCCESS; } @@ -10150,7 +9811,6 @@ static NTSTATUS thunk32_vkCmdTraceRaysIndirect2KHR(void *args) TRACE("%p, 0x%s\n", params->commandBuffer, wine_dbgstr_longlong(params->indirectDeviceAddress)); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdTraceRaysIndirect2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->indirectDeviceAddress); - return STATUS_SUCCESS; } @@ -10164,7 +9824,6 @@ static NTSTATUS thunk64_vkCmdTraceRaysIndirectKHR(void *args) TRACE("%p, %p, %p, %p, %p, 0x%s\n", params->commandBuffer, params->pRaygenShaderBindingTable, params->pMissShaderBindingTable, params->pHitShaderBindingTable, params->pCallableShaderBindingTable, wine_dbgstr_longlong(params->indirectDeviceAddress)); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdTraceRaysIndirectKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRaygenShaderBindingTable, params->pMissShaderBindingTable, params->pHitShaderBindingTable, params->pCallableShaderBindingTable, params->indirectDeviceAddress); - return STATUS_SUCCESS; } @@ -10184,7 +9843,6 @@ static NTSTATUS thunk32_vkCmdTraceRaysIndirectKHR(void *args) convert_VkStridedDeviceAddressRegionKHR_win_to_host(params->pHitShaderBindingTable, &pHitShaderBindingTable_host); convert_VkStridedDeviceAddressRegionKHR_win_to_host(params->pCallableShaderBindingTable, &pCallableShaderBindingTable_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdTraceRaysIndirectKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pRaygenShaderBindingTable_host, &pMissShaderBindingTable_host, &pHitShaderBindingTable_host, &pCallableShaderBindingTable_host, params->indirectDeviceAddress); - return STATUS_SUCCESS; } @@ -10198,7 +9856,6 @@ static NTSTATUS thunk64_vkCmdTraceRaysKHR(void *args) TRACE("%p, %p, %p, %p, %p, %u, %u, %u\n", params->commandBuffer, params->pRaygenShaderBindingTable, params->pMissShaderBindingTable, params->pHitShaderBindingTable, params->pCallableShaderBindingTable, params->width, params->height, params->depth); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdTraceRaysKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pRaygenShaderBindingTable, params->pMissShaderBindingTable, params->pHitShaderBindingTable, params->pCallableShaderBindingTable, params->width, params->height, params->depth); - return STATUS_SUCCESS; } @@ -10218,7 +9875,6 @@ static NTSTATUS thunk32_vkCmdTraceRaysKHR(void *args) convert_VkStridedDeviceAddressRegionKHR_win_to_host(params->pHitShaderBindingTable, &pHitShaderBindingTable_host); convert_VkStridedDeviceAddressRegionKHR_win_to_host(params->pCallableShaderBindingTable, &pCallableShaderBindingTable_host); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdTraceRaysKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, &pRaygenShaderBindingTable_host, &pMissShaderBindingTable_host, &pHitShaderBindingTable_host, &pCallableShaderBindingTable_host, params->width, params->height, params->depth); - return STATUS_SUCCESS; } @@ -10232,7 +9888,6 @@ static NTSTATUS thunk64_vkCmdTraceRaysNV(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->raygenShaderBindingTableBuffer), wine_dbgstr_longlong(params->raygenShaderBindingOffset), wine_dbgstr_longlong(params->missShaderBindingTableBuffer), wine_dbgstr_longlong(params->missShaderBindingOffset), wine_dbgstr_longlong(params->missShaderBindingStride), wine_dbgstr_longlong(params->hitShaderBindingTableBuffer), wine_dbgstr_longlong(params->hitShaderBindingOffset), wine_dbgstr_longlong(params->hitShaderBindingStride), wine_dbgstr_longlong(params->callableShaderBindingTableBuffer), wine_dbgstr_longlong(params->callableShaderBindingOffset), wine_dbgstr_longlong(params->callableShaderBindingStride), params->width, params->height, params->depth); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdTraceRaysNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->raygenShaderBindingTableBuffer, params->raygenShaderBindingOffset, params->missShaderBindingTableBuffer, params->missShaderBindingOffset, params->missShaderBindingStride, params->hitShaderBindingTableBuffer, params->hitShaderBindingOffset, params->hitShaderBindingStride, params->callableShaderBindingTableBuffer, params->callableShaderBindingOffset, params->callableShaderBindingStride, params->width, params->height, params->depth); - return STATUS_SUCCESS; } @@ -10244,7 +9899,6 @@ static NTSTATUS thunk32_vkCmdTraceRaysNV(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->raygenShaderBindingTableBuffer), wine_dbgstr_longlong(params->raygenShaderBindingOffset), wine_dbgstr_longlong(params->missShaderBindingTableBuffer), wine_dbgstr_longlong(params->missShaderBindingOffset), wine_dbgstr_longlong(params->missShaderBindingStride), wine_dbgstr_longlong(params->hitShaderBindingTableBuffer), wine_dbgstr_longlong(params->hitShaderBindingOffset), wine_dbgstr_longlong(params->hitShaderBindingStride), wine_dbgstr_longlong(params->callableShaderBindingTableBuffer), wine_dbgstr_longlong(params->callableShaderBindingOffset), wine_dbgstr_longlong(params->callableShaderBindingStride), params->width, params->height, params->depth); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdTraceRaysNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->raygenShaderBindingTableBuffer, params->raygenShaderBindingOffset, params->missShaderBindingTableBuffer, params->missShaderBindingOffset, params->missShaderBindingStride, params->hitShaderBindingTableBuffer, params->hitShaderBindingOffset, params->hitShaderBindingStride, params->callableShaderBindingTableBuffer, params->callableShaderBindingOffset, params->callableShaderBindingStride, params->width, params->height, params->depth); - return STATUS_SUCCESS; } @@ -10258,7 +9912,6 @@ static NTSTATUS thunk64_vkCmdUpdateBuffer(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), wine_dbgstr_longlong(params->dataSize), params->pData); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdUpdateBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->dstBuffer, params->dstOffset, params->dataSize, params->pData); - return STATUS_SUCCESS; } @@ -10270,7 +9923,6 @@ static NTSTATUS thunk32_vkCmdUpdateBuffer(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, %p\n", params->commandBuffer, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), wine_dbgstr_longlong(params->dataSize), params->pData); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdUpdateBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->dstBuffer, params->dstOffset, params->dataSize, params->pData); - return STATUS_SUCCESS; } @@ -10284,7 +9936,6 @@ static NTSTATUS thunk64_vkCmdWaitEvents(void *args) TRACE("%p, %u, %p, %#x, %#x, %u, %p, %u, %p, %u, %p\n", params->commandBuffer, params->eventCount, params->pEvents, params->srcStageMask, params->dstStageMask, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, params->pBufferMemoryBarriers, params->imageMemoryBarrierCount, params->pImageMemoryBarriers); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWaitEvents(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->eventCount, params->pEvents, params->srcStageMask, params->dstStageMask, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, params->pBufferMemoryBarriers, params->imageMemoryBarrierCount, params->pImageMemoryBarriers); - return STATUS_SUCCESS; } @@ -10300,7 +9951,6 @@ static NTSTATUS thunk32_vkCmdWaitEvents(void *args) pBufferMemoryBarriers_host = convert_VkBufferMemoryBarrier_array_win_to_host(params->pBufferMemoryBarriers, params->bufferMemoryBarrierCount); pImageMemoryBarriers_host = convert_VkImageMemoryBarrier_array_win_to_host(params->pImageMemoryBarriers, params->imageMemoryBarrierCount); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWaitEvents(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->eventCount, params->pEvents, params->srcStageMask, params->dstStageMask, params->memoryBarrierCount, params->pMemoryBarriers, params->bufferMemoryBarrierCount, pBufferMemoryBarriers_host, params->imageMemoryBarrierCount, pImageMemoryBarriers_host); - free_VkBufferMemoryBarrier_array(pBufferMemoryBarriers_host, params->bufferMemoryBarrierCount); free_VkImageMemoryBarrier_array(pImageMemoryBarriers_host, params->imageMemoryBarrierCount); return STATUS_SUCCESS; @@ -10316,7 +9966,6 @@ static NTSTATUS thunk64_vkCmdWaitEvents2(void *args) TRACE("%p, %u, %p, %p\n", params->commandBuffer, params->eventCount, params->pEvents, params->pDependencyInfos); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWaitEvents2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->eventCount, params->pEvents, params->pDependencyInfos); - return STATUS_SUCCESS; } @@ -10330,7 +9979,6 @@ static NTSTATUS thunk32_vkCmdWaitEvents2(void *args) pDependencyInfos_host = convert_VkDependencyInfo_array_win_to_host(params->pDependencyInfos, params->eventCount); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWaitEvents2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->eventCount, params->pEvents, pDependencyInfos_host); - free_VkDependencyInfo_array(pDependencyInfos_host, params->eventCount); return STATUS_SUCCESS; } @@ -10345,7 +9993,6 @@ static NTSTATUS thunk64_vkCmdWaitEvents2KHR(void *args) TRACE("%p, %u, %p, %p\n", params->commandBuffer, params->eventCount, params->pEvents, params->pDependencyInfos); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWaitEvents2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->eventCount, params->pEvents, params->pDependencyInfos); - return STATUS_SUCCESS; } @@ -10359,7 +10006,6 @@ static NTSTATUS thunk32_vkCmdWaitEvents2KHR(void *args) pDependencyInfos_host = convert_VkDependencyInfo_array_win_to_host(params->pDependencyInfos, params->eventCount); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWaitEvents2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->eventCount, params->pEvents, pDependencyInfos_host); - free_VkDependencyInfo_array(pDependencyInfos_host, params->eventCount); return STATUS_SUCCESS; } @@ -10374,7 +10020,6 @@ static NTSTATUS thunk64_vkCmdWriteAccelerationStructuresPropertiesKHR(void *args TRACE("%p, %u, %p, %#x, 0x%s, %u\n", params->commandBuffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, wine_dbgstr_longlong(params->queryPool), params->firstQuery); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteAccelerationStructuresPropertiesKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, params->queryPool, params->firstQuery); - return STATUS_SUCCESS; } @@ -10386,7 +10031,6 @@ static NTSTATUS thunk32_vkCmdWriteAccelerationStructuresPropertiesKHR(void *args TRACE("%p, %u, %p, %#x, 0x%s, %u\n", params->commandBuffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, wine_dbgstr_longlong(params->queryPool), params->firstQuery); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteAccelerationStructuresPropertiesKHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, params->queryPool, params->firstQuery); - return STATUS_SUCCESS; } @@ -10400,7 +10044,6 @@ static NTSTATUS thunk64_vkCmdWriteAccelerationStructuresPropertiesNV(void *args) TRACE("%p, %u, %p, %#x, 0x%s, %u\n", params->commandBuffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, wine_dbgstr_longlong(params->queryPool), params->firstQuery); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteAccelerationStructuresPropertiesNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, params->queryPool, params->firstQuery); - return STATUS_SUCCESS; } @@ -10412,7 +10055,6 @@ static NTSTATUS thunk32_vkCmdWriteAccelerationStructuresPropertiesNV(void *args) TRACE("%p, %u, %p, %#x, 0x%s, %u\n", params->commandBuffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, wine_dbgstr_longlong(params->queryPool), params->firstQuery); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteAccelerationStructuresPropertiesNV(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, params->queryPool, params->firstQuery); - return STATUS_SUCCESS; } @@ -10426,7 +10068,6 @@ static NTSTATUS thunk64_vkCmdWriteBufferMarker2AMD(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->stage), wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), params->marker); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteBufferMarker2AMD(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stage, params->dstBuffer, params->dstOffset, params->marker); - return STATUS_SUCCESS; } @@ -10438,7 +10079,6 @@ static NTSTATUS thunk32_vkCmdWriteBufferMarker2AMD(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->stage), wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), params->marker); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteBufferMarker2AMD(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stage, params->dstBuffer, params->dstOffset, params->marker); - return STATUS_SUCCESS; } @@ -10452,7 +10092,6 @@ static NTSTATUS thunk64_vkCmdWriteBufferMarkerAMD(void *args) TRACE("%p, %#x, 0x%s, 0x%s, %u\n", params->commandBuffer, params->pipelineStage, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), params->marker); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteBufferMarkerAMD(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineStage, params->dstBuffer, params->dstOffset, params->marker); - return STATUS_SUCCESS; } @@ -10464,7 +10103,6 @@ static NTSTATUS thunk32_vkCmdWriteBufferMarkerAMD(void *args) TRACE("%p, %#x, 0x%s, 0x%s, %u\n", params->commandBuffer, params->pipelineStage, wine_dbgstr_longlong(params->dstBuffer), wine_dbgstr_longlong(params->dstOffset), params->marker); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteBufferMarkerAMD(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineStage, params->dstBuffer, params->dstOffset, params->marker); - return STATUS_SUCCESS; } @@ -10478,7 +10116,6 @@ static NTSTATUS thunk64_vkCmdWriteTimestamp(void *args) TRACE("%p, %#x, 0x%s, %u\n", params->commandBuffer, params->pipelineStage, wine_dbgstr_longlong(params->queryPool), params->query); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteTimestamp(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineStage, params->queryPool, params->query); - return STATUS_SUCCESS; } @@ -10490,7 +10127,6 @@ static NTSTATUS thunk32_vkCmdWriteTimestamp(void *args) TRACE("%p, %#x, 0x%s, %u\n", params->commandBuffer, params->pipelineStage, wine_dbgstr_longlong(params->queryPool), params->query); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteTimestamp(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->pipelineStage, params->queryPool, params->query); - return STATUS_SUCCESS; } @@ -10504,7 +10140,6 @@ static NTSTATUS thunk64_vkCmdWriteTimestamp2(void *args) TRACE("%p, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->stage), wine_dbgstr_longlong(params->queryPool), params->query); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteTimestamp2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stage, params->queryPool, params->query); - return STATUS_SUCCESS; } @@ -10516,7 +10151,6 @@ static NTSTATUS thunk32_vkCmdWriteTimestamp2(void *args) TRACE("%p, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->stage), wine_dbgstr_longlong(params->queryPool), params->query); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteTimestamp2(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stage, params->queryPool, params->query); - return STATUS_SUCCESS; } @@ -10530,7 +10164,6 @@ static NTSTATUS thunk64_vkCmdWriteTimestamp2KHR(void *args) TRACE("%p, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->stage), wine_dbgstr_longlong(params->queryPool), params->query); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteTimestamp2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stage, params->queryPool, params->query); - return STATUS_SUCCESS; } @@ -10542,7 +10175,6 @@ static NTSTATUS thunk32_vkCmdWriteTimestamp2KHR(void *args) TRACE("%p, 0x%s, 0x%s, %u\n", params->commandBuffer, wine_dbgstr_longlong(params->stage), wine_dbgstr_longlong(params->queryPool), params->query); wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkCmdWriteTimestamp2KHR(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->stage, params->queryPool, params->query); - return STATUS_SUCCESS; } @@ -10557,7 +10189,6 @@ static NTSTATUS thunk64_vkCompileDeferredNV(void *args) TRACE("%p, 0x%s, %u\n", params->device, wine_dbgstr_longlong(params->pipeline), params->shader); result = wine_device_from_handle(params->device)->funcs.p_vkCompileDeferredNV(wine_device_from_handle(params->device)->device, params->pipeline, params->shader); - return result; } @@ -10570,7 +10201,6 @@ static NTSTATUS thunk32_vkCompileDeferredNV(void *args) TRACE("%p, 0x%s, %u\n", params->device, wine_dbgstr_longlong(params->pipeline), params->shader); result = wine_device_from_handle(params->device)->funcs.p_vkCompileDeferredNV(wine_device_from_handle(params->device)->device, params->pipeline, params->shader); - return result; } @@ -10585,7 +10215,6 @@ static NTSTATUS thunk64_vkCopyAccelerationStructureKHR(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo); result = wine_device_from_handle(params->device)->funcs.p_vkCopyAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, params->pInfo); - return result; } @@ -10600,7 +10229,6 @@ static NTSTATUS thunk32_vkCopyAccelerationStructureKHR(void *args) convert_VkCopyAccelerationStructureInfoKHR_win_to_host(params->pInfo, &pInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkCopyAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, &pInfo_host); - return result; } @@ -10615,7 +10243,6 @@ static NTSTATUS thunk64_vkCopyAccelerationStructureToMemoryKHR(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo); result = wine_device_from_handle(params->device)->funcs.p_vkCopyAccelerationStructureToMemoryKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, params->pInfo); - return result; } @@ -10630,7 +10257,6 @@ static NTSTATUS thunk32_vkCopyAccelerationStructureToMemoryKHR(void *args) convert_VkCopyAccelerationStructureToMemoryInfoKHR_win_to_host(params->pInfo, &pInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkCopyAccelerationStructureToMemoryKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, &pInfo_host); - return result; } @@ -10645,7 +10271,6 @@ static NTSTATUS thunk64_vkCopyMemoryToAccelerationStructureKHR(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), params->pInfo); result = wine_device_from_handle(params->device)->funcs.p_vkCopyMemoryToAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, params->pInfo); - return result; } @@ -10660,7 +10285,6 @@ static NTSTATUS thunk32_vkCopyMemoryToAccelerationStructureKHR(void *args) convert_VkCopyMemoryToAccelerationStructureInfoKHR_win_to_host(params->pInfo, &pInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkCopyMemoryToAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->deferredOperation, &pInfo_host); - return result; } @@ -10675,7 +10299,6 @@ static NTSTATUS thunk64_vkCreateAccelerationStructureKHR(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pAccelerationStructure); result = wine_device_from_handle(params->device)->funcs.p_vkCreateAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pAccelerationStructure); - return result; } @@ -10690,7 +10313,6 @@ static NTSTATUS thunk32_vkCreateAccelerationStructureKHR(void *args) convert_VkAccelerationStructureCreateInfoKHR_win_to_host(params->pCreateInfo, &pCreateInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkCreateAccelerationStructureKHR(wine_device_from_handle(params->device)->device, &pCreateInfo_host, NULL, params->pAccelerationStructure); - return result; } @@ -10705,7 +10327,6 @@ static NTSTATUS thunk64_vkCreateAccelerationStructureNV(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pAccelerationStructure); result = wine_device_from_handle(params->device)->funcs.p_vkCreateAccelerationStructureNV(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pAccelerationStructure); - return result; } @@ -10720,7 +10341,6 @@ static NTSTATUS thunk32_vkCreateAccelerationStructureNV(void *args) convert_VkAccelerationStructureCreateInfoNV_win_to_host(params->pCreateInfo, &pCreateInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkCreateAccelerationStructureNV(wine_device_from_handle(params->device)->device, &pCreateInfo_host, NULL, params->pAccelerationStructure); - return result; } @@ -10735,7 +10355,6 @@ static NTSTATUS thunk64_vkCreateBuffer(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pBuffer); result = wine_device_from_handle(params->device)->funcs.p_vkCreateBuffer(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pBuffer); - return result; } @@ -10750,7 +10369,6 @@ static NTSTATUS thunk32_vkCreateBuffer(void *args) convert_VkBufferCreateInfo_win_to_host(params->pCreateInfo, &pCreateInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkCreateBuffer(wine_device_from_handle(params->device)->device, &pCreateInfo_host, NULL, params->pBuffer); - return result; } @@ -10765,7 +10383,6 @@ static NTSTATUS thunk64_vkCreateBufferView(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pView); result = wine_device_from_handle(params->device)->funcs.p_vkCreateBufferView(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pView); - return result; } @@ -10780,7 +10397,28 @@ static NTSTATUS thunk32_vkCreateBufferView(void *args) convert_VkBufferViewCreateInfo_win_to_host(params->pCreateInfo, &pCreateInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkCreateBufferView(wine_device_from_handle(params->device)->device, &pCreateInfo_host, NULL, params->pView); + return result; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateCommandPool(void *args) +{ + struct vkCreateCommandPool_params *params = args; + VkResult result; + result = wine_vkCreateCommandPool(params->device, params->pCreateInfo, params->pAllocator, params->pCommandPool, params->client_ptr); + return result; +} + +#else /* USE_STRUCT_CONVERSION */ +static NTSTATUS thunk32_vkCreateCommandPool(void *args) +{ + struct vkCreateCommandPool_params *params = args; + VkResult result; + result = wine_vkCreateCommandPool(params->device, params->pCreateInfo, params->pAllocator, params->pCommandPool, params->client_ptr); return result; } @@ -10792,7 +10430,14 @@ VkResult thunk_vkCreateComputePipelines(VkDevice device, VkPipelineCache pipelin { VkResult result; result = wine_device_from_handle(device)->funcs.p_vkCreateComputePipelines(wine_device_from_handle(device)->device, pipelineCache, createInfoCount, pCreateInfos, NULL, pPipelines); + return result; +} +static NTSTATUS thunk64_vkCreateComputePipelines(void *args) +{ + struct vkCreateComputePipelines_params *params = args; + VkResult result; + result = wine_vkCreateComputePipelines(params->device, params->pipelineCache, params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); return result; } @@ -10804,11 +10449,18 @@ VkResult thunk_vkCreateComputePipelines(VkDevice device, VkPipelineCache pipelin VkComputePipelineCreateInfo_host *pCreateInfos_host; pCreateInfos_host = convert_VkComputePipelineCreateInfo_array_win_to_host(pCreateInfos, createInfoCount); result = wine_device_from_handle(device)->funcs.p_vkCreateComputePipelines(wine_device_from_handle(device)->device, pipelineCache, createInfoCount, pCreateInfos_host, NULL, pPipelines); - free_VkComputePipelineCreateInfo_array(pCreateInfos_host, createInfoCount); return result; } +static NTSTATUS thunk32_vkCreateComputePipelines(void *args) +{ + struct vkCreateComputePipelines_params *params = args; + VkResult result; + result = wine_vkCreateComputePipelines(params->device, params->pipelineCache, params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + return result; +} + #endif /* USE_STRUCT_CONVERSION */ #if !defined(USE_STRUCT_CONVERSION) @@ -10820,7 +10472,6 @@ static NTSTATUS thunk64_vkCreateCuFunctionNVX(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pFunction); result = wine_device_from_handle(params->device)->funcs.p_vkCreateCuFunctionNVX(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pFunction); - return result; } @@ -10835,7 +10486,6 @@ static NTSTATUS thunk32_vkCreateCuFunctionNVX(void *args) convert_VkCuFunctionCreateInfoNVX_win_to_host(params->pCreateInfo, &pCreateInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkCreateCuFunctionNVX(wine_device_from_handle(params->device)->device, &pCreateInfo_host, NULL, params->pFunction); - return result; } @@ -10850,7 +10500,6 @@ static NTSTATUS thunk64_vkCreateCuModuleNVX(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pModule); result = wine_device_from_handle(params->device)->funcs.p_vkCreateCuModuleNVX(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pModule); - return result; } @@ -10863,7 +10512,50 @@ static NTSTATUS thunk32_vkCreateCuModuleNVX(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pModule); result = wine_device_from_handle(params->device)->funcs.p_vkCreateCuModuleNVX(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pModule); + return result; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateDebugReportCallbackEXT(void *args) +{ + struct vkCreateDebugReportCallbackEXT_params *params = args; + VkResult result; + result = wine_vkCreateDebugReportCallbackEXT(params->instance, params->pCreateInfo, params->pAllocator, params->pCallback); + return result; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateDebugReportCallbackEXT(void *args) +{ + struct vkCreateDebugReportCallbackEXT_params *params = args; + VkResult result; + result = wine_vkCreateDebugReportCallbackEXT(params->instance, params->pCreateInfo, params->pAllocator, params->pCallback); + return result; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateDebugUtilsMessengerEXT(void *args) +{ + struct vkCreateDebugUtilsMessengerEXT_params *params = args; + VkResult result; + result = wine_vkCreateDebugUtilsMessengerEXT(params->instance, params->pCreateInfo, params->pAllocator, params->pMessenger); + return result; +} + +#else /* USE_STRUCT_CONVERSION */ +static NTSTATUS thunk32_vkCreateDebugUtilsMessengerEXT(void *args) +{ + struct vkCreateDebugUtilsMessengerEXT_params *params = args; + VkResult result; + result = wine_vkCreateDebugUtilsMessengerEXT(params->instance, params->pCreateInfo, params->pAllocator, params->pMessenger); return result; } @@ -10878,7 +10570,6 @@ static NTSTATUS thunk64_vkCreateDeferredOperationKHR(void *args) TRACE("%p, %p, %p\n", params->device, params->pAllocator, params->pDeferredOperation); result = wine_device_from_handle(params->device)->funcs.p_vkCreateDeferredOperationKHR(wine_device_from_handle(params->device)->device, NULL, params->pDeferredOperation); - return result; } @@ -10891,7 +10582,6 @@ static NTSTATUS thunk32_vkCreateDeferredOperationKHR(void *args) TRACE("%p, %p, %p\n", params->device, params->pAllocator, params->pDeferredOperation); result = wine_device_from_handle(params->device)->funcs.p_vkCreateDeferredOperationKHR(wine_device_from_handle(params->device)->device, NULL, params->pDeferredOperation); - return result; } @@ -10906,7 +10596,6 @@ static NTSTATUS thunk64_vkCreateDescriptorPool(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pDescriptorPool); result = wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorPool(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pDescriptorPool); - return result; } @@ -10919,7 +10608,6 @@ static NTSTATUS thunk32_vkCreateDescriptorPool(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pDescriptorPool); result = wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorPool(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pDescriptorPool); - return result; } @@ -10934,7 +10622,6 @@ static NTSTATUS thunk64_vkCreateDescriptorSetLayout(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSetLayout); result = wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorSetLayout(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSetLayout); - return result; } @@ -10947,7 +10634,6 @@ static NTSTATUS thunk32_vkCreateDescriptorSetLayout(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSetLayout); result = wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorSetLayout(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSetLayout); - return result; } @@ -10962,7 +10648,6 @@ static NTSTATUS thunk64_vkCreateDescriptorUpdateTemplate(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pDescriptorUpdateTemplate); result = wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorUpdateTemplate(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pDescriptorUpdateTemplate); - return result; } @@ -10977,7 +10662,6 @@ static NTSTATUS thunk32_vkCreateDescriptorUpdateTemplate(void *args) convert_VkDescriptorUpdateTemplateCreateInfo_win_to_host(params->pCreateInfo, &pCreateInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorUpdateTemplate(wine_device_from_handle(params->device)->device, &pCreateInfo_host, NULL, params->pDescriptorUpdateTemplate); - return result; } @@ -10992,7 +10676,6 @@ static NTSTATUS thunk64_vkCreateDescriptorUpdateTemplateKHR(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pDescriptorUpdateTemplate); result = wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorUpdateTemplateKHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pDescriptorUpdateTemplate); - return result; } @@ -11007,7 +10690,28 @@ static NTSTATUS thunk32_vkCreateDescriptorUpdateTemplateKHR(void *args) convert_VkDescriptorUpdateTemplateCreateInfo_win_to_host(params->pCreateInfo, &pCreateInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkCreateDescriptorUpdateTemplateKHR(wine_device_from_handle(params->device)->device, &pCreateInfo_host, NULL, params->pDescriptorUpdateTemplate); + return result; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateDevice(void *args) +{ + struct vkCreateDevice_params *params = args; + VkResult result; + result = wine_vkCreateDevice(params->physicalDevice, params->pCreateInfo, params->pAllocator, params->pDevice, params->client_ptr); + return result; +} + +#else /* USE_STRUCT_CONVERSION */ +static NTSTATUS thunk32_vkCreateDevice(void *args) +{ + struct vkCreateDevice_params *params = args; + VkResult result; + result = wine_vkCreateDevice(params->physicalDevice, params->pCreateInfo, params->pAllocator, params->pDevice, params->client_ptr); return result; } @@ -11022,7 +10726,6 @@ static NTSTATUS thunk64_vkCreateEvent(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pEvent); result = wine_device_from_handle(params->device)->funcs.p_vkCreateEvent(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pEvent); - return result; } @@ -11035,7 +10738,6 @@ static NTSTATUS thunk32_vkCreateEvent(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pEvent); result = wine_device_from_handle(params->device)->funcs.p_vkCreateEvent(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pEvent); - return result; } @@ -11050,7 +10752,6 @@ static NTSTATUS thunk64_vkCreateFence(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pFence); result = wine_device_from_handle(params->device)->funcs.p_vkCreateFence(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pFence); - return result; } @@ -11063,7 +10764,6 @@ static NTSTATUS thunk32_vkCreateFence(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pFence); result = wine_device_from_handle(params->device)->funcs.p_vkCreateFence(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pFence); - return result; } @@ -11078,7 +10778,6 @@ static NTSTATUS thunk64_vkCreateFramebuffer(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pFramebuffer); result = wine_device_from_handle(params->device)->funcs.p_vkCreateFramebuffer(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pFramebuffer); - return result; } @@ -11093,7 +10792,6 @@ static NTSTATUS thunk32_vkCreateFramebuffer(void *args) convert_VkFramebufferCreateInfo_win_to_host(params->pCreateInfo, &pCreateInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkCreateFramebuffer(wine_device_from_handle(params->device)->device, &pCreateInfo_host, NULL, params->pFramebuffer); - return result; } @@ -11105,7 +10803,14 @@ VkResult thunk_vkCreateGraphicsPipelines(VkDevice device, VkPipelineCache pipeli { VkResult result; result = wine_device_from_handle(device)->funcs.p_vkCreateGraphicsPipelines(wine_device_from_handle(device)->device, pipelineCache, createInfoCount, pCreateInfos, NULL, pPipelines); + return result; +} +static NTSTATUS thunk64_vkCreateGraphicsPipelines(void *args) +{ + struct vkCreateGraphicsPipelines_params *params = args; + VkResult result; + result = wine_vkCreateGraphicsPipelines(params->device, params->pipelineCache, params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); return result; } @@ -11117,11 +10822,18 @@ VkResult thunk_vkCreateGraphicsPipelines(VkDevice device, VkPipelineCache pipeli VkGraphicsPipelineCreateInfo_host *pCreateInfos_host; pCreateInfos_host = convert_VkGraphicsPipelineCreateInfo_array_win_to_host(pCreateInfos, createInfoCount); result = wine_device_from_handle(device)->funcs.p_vkCreateGraphicsPipelines(wine_device_from_handle(device)->device, pipelineCache, createInfoCount, pCreateInfos_host, NULL, pPipelines); - free_VkGraphicsPipelineCreateInfo_array(pCreateInfos_host, createInfoCount); return result; } +static NTSTATUS thunk32_vkCreateGraphicsPipelines(void *args) +{ + struct vkCreateGraphicsPipelines_params *params = args; + VkResult result; + result = wine_vkCreateGraphicsPipelines(params->device, params->pipelineCache, params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + return result; +} + #endif /* USE_STRUCT_CONVERSION */ #if !defined(USE_STRUCT_CONVERSION) @@ -11133,7 +10845,6 @@ static NTSTATUS thunk64_vkCreateImage(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pImage); result = wine_device_from_handle(params->device)->funcs.p_vkCreateImage(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pImage); - return result; } @@ -11146,7 +10857,6 @@ static NTSTATUS thunk32_vkCreateImage(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pImage); result = wine_device_from_handle(params->device)->funcs.p_vkCreateImage(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pImage); - return result; } @@ -11161,7 +10871,6 @@ static NTSTATUS thunk64_vkCreateImageView(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pView); result = wine_device_from_handle(params->device)->funcs.p_vkCreateImageView(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pView); - return result; } @@ -11176,7 +10885,6 @@ static NTSTATUS thunk32_vkCreateImageView(void *args) convert_VkImageViewCreateInfo_win_to_host(params->pCreateInfo, &pCreateInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkCreateImageView(wine_device_from_handle(params->device)->device, &pCreateInfo_host, NULL, params->pView); - return result; } @@ -11191,7 +10899,6 @@ static NTSTATUS thunk64_vkCreateIndirectCommandsLayoutNV(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pIndirectCommandsLayout); result = wine_device_from_handle(params->device)->funcs.p_vkCreateIndirectCommandsLayoutNV(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pIndirectCommandsLayout); - return result; } @@ -11206,7 +10913,6 @@ static NTSTATUS thunk32_vkCreateIndirectCommandsLayoutNV(void *args) convert_VkIndirectCommandsLayoutCreateInfoNV_win_to_host(params->pCreateInfo, &pCreateInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkCreateIndirectCommandsLayoutNV(wine_device_from_handle(params->device)->device, &pCreateInfo_host, NULL, params->pIndirectCommandsLayout); - free_VkIndirectCommandsLayoutCreateInfoNV(&pCreateInfo_host); return result; } @@ -11215,6 +10921,28 @@ static NTSTATUS thunk32_vkCreateIndirectCommandsLayoutNV(void *args) #if !defined(USE_STRUCT_CONVERSION) +static NTSTATUS thunk64_vkCreateInstance(void *args) +{ + struct vkCreateInstance_params *params = args; + VkResult result; + result = wine_vkCreateInstance(params->pCreateInfo, params->pAllocator, params->pInstance, params->client_ptr); + return result; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateInstance(void *args) +{ + struct vkCreateInstance_params *params = args; + VkResult result; + result = wine_vkCreateInstance(params->pCreateInfo, params->pAllocator, params->pInstance, params->client_ptr); + return result; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + static NTSTATUS thunk64_vkCreatePipelineCache(void *args) { struct vkCreatePipelineCache_params *params = args; @@ -11222,7 +10950,6 @@ static NTSTATUS thunk64_vkCreatePipelineCache(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPipelineCache); result = wine_device_from_handle(params->device)->funcs.p_vkCreatePipelineCache(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPipelineCache); - return result; } @@ -11235,7 +10962,6 @@ static NTSTATUS thunk32_vkCreatePipelineCache(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPipelineCache); result = wine_device_from_handle(params->device)->funcs.p_vkCreatePipelineCache(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPipelineCache); - return result; } @@ -11250,7 +10976,6 @@ static NTSTATUS thunk64_vkCreatePipelineLayout(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPipelineLayout); result = wine_device_from_handle(params->device)->funcs.p_vkCreatePipelineLayout(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPipelineLayout); - return result; } @@ -11263,7 +10988,6 @@ static NTSTATUS thunk32_vkCreatePipelineLayout(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPipelineLayout); result = wine_device_from_handle(params->device)->funcs.p_vkCreatePipelineLayout(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPipelineLayout); - return result; } @@ -11278,7 +11002,6 @@ static NTSTATUS thunk64_vkCreatePrivateDataSlot(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPrivateDataSlot); result = wine_device_from_handle(params->device)->funcs.p_vkCreatePrivateDataSlot(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPrivateDataSlot); - return result; } @@ -11291,7 +11014,6 @@ static NTSTATUS thunk32_vkCreatePrivateDataSlot(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPrivateDataSlot); result = wine_device_from_handle(params->device)->funcs.p_vkCreatePrivateDataSlot(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPrivateDataSlot); - return result; } @@ -11306,7 +11028,6 @@ static NTSTATUS thunk64_vkCreatePrivateDataSlotEXT(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPrivateDataSlot); result = wine_device_from_handle(params->device)->funcs.p_vkCreatePrivateDataSlotEXT(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPrivateDataSlot); - return result; } @@ -11319,7 +11040,6 @@ static NTSTATUS thunk32_vkCreatePrivateDataSlotEXT(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pPrivateDataSlot); result = wine_device_from_handle(params->device)->funcs.p_vkCreatePrivateDataSlotEXT(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pPrivateDataSlot); - return result; } @@ -11334,7 +11054,6 @@ static NTSTATUS thunk64_vkCreateQueryPool(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pQueryPool); result = wine_device_from_handle(params->device)->funcs.p_vkCreateQueryPool(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pQueryPool); - return result; } @@ -11347,7 +11066,6 @@ static NTSTATUS thunk32_vkCreateQueryPool(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pQueryPool); result = wine_device_from_handle(params->device)->funcs.p_vkCreateQueryPool(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pQueryPool); - return result; } @@ -11359,7 +11077,14 @@ VkResult thunk_vkCreateRayTracingPipelinesKHR(VkDevice device, VkDeferredOperati { VkResult result; result = wine_device_from_handle(device)->funcs.p_vkCreateRayTracingPipelinesKHR(wine_device_from_handle(device)->device, deferredOperation, pipelineCache, createInfoCount, pCreateInfos, NULL, pPipelines); + return result; +} +static NTSTATUS thunk64_vkCreateRayTracingPipelinesKHR(void *args) +{ + struct vkCreateRayTracingPipelinesKHR_params *params = args; + VkResult result; + result = wine_vkCreateRayTracingPipelinesKHR(params->device, params->deferredOperation, params->pipelineCache, params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); return result; } @@ -11371,11 +11096,18 @@ VkResult thunk_vkCreateRayTracingPipelinesKHR(VkDevice device, VkDeferredOperati VkRayTracingPipelineCreateInfoKHR_host *pCreateInfos_host; pCreateInfos_host = convert_VkRayTracingPipelineCreateInfoKHR_array_win_to_host(pCreateInfos, createInfoCount); result = wine_device_from_handle(device)->funcs.p_vkCreateRayTracingPipelinesKHR(wine_device_from_handle(device)->device, deferredOperation, pipelineCache, createInfoCount, pCreateInfos_host, NULL, pPipelines); - free_VkRayTracingPipelineCreateInfoKHR_array(pCreateInfos_host, createInfoCount); return result; } +static NTSTATUS thunk32_vkCreateRayTracingPipelinesKHR(void *args) +{ + struct vkCreateRayTracingPipelinesKHR_params *params = args; + VkResult result; + result = wine_vkCreateRayTracingPipelinesKHR(params->device, params->deferredOperation, params->pipelineCache, params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + return result; +} + #endif /* USE_STRUCT_CONVERSION */ #if !defined(USE_STRUCT_CONVERSION) @@ -11384,7 +11116,14 @@ VkResult thunk_vkCreateRayTracingPipelinesNV(VkDevice device, VkPipelineCache pi { VkResult result; result = wine_device_from_handle(device)->funcs.p_vkCreateRayTracingPipelinesNV(wine_device_from_handle(device)->device, pipelineCache, createInfoCount, pCreateInfos, NULL, pPipelines); + return result; +} +static NTSTATUS thunk64_vkCreateRayTracingPipelinesNV(void *args) +{ + struct vkCreateRayTracingPipelinesNV_params *params = args; + VkResult result; + result = wine_vkCreateRayTracingPipelinesNV(params->device, params->pipelineCache, params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); return result; } @@ -11396,11 +11135,18 @@ VkResult thunk_vkCreateRayTracingPipelinesNV(VkDevice device, VkPipelineCache pi VkRayTracingPipelineCreateInfoNV_host *pCreateInfos_host; pCreateInfos_host = convert_VkRayTracingPipelineCreateInfoNV_array_win_to_host(pCreateInfos, createInfoCount); result = wine_device_from_handle(device)->funcs.p_vkCreateRayTracingPipelinesNV(wine_device_from_handle(device)->device, pipelineCache, createInfoCount, pCreateInfos_host, NULL, pPipelines); - free_VkRayTracingPipelineCreateInfoNV_array(pCreateInfos_host, createInfoCount); return result; } +static NTSTATUS thunk32_vkCreateRayTracingPipelinesNV(void *args) +{ + struct vkCreateRayTracingPipelinesNV_params *params = args; + VkResult result; + result = wine_vkCreateRayTracingPipelinesNV(params->device, params->pipelineCache, params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + return result; +} + #endif /* USE_STRUCT_CONVERSION */ #if !defined(USE_STRUCT_CONVERSION) @@ -11412,7 +11158,6 @@ static NTSTATUS thunk64_vkCreateRenderPass(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pRenderPass); result = wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); - return result; } @@ -11425,7 +11170,6 @@ static NTSTATUS thunk32_vkCreateRenderPass(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pRenderPass); result = wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); - return result; } @@ -11440,7 +11184,6 @@ static NTSTATUS thunk64_vkCreateRenderPass2(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pRenderPass); result = wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass2(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); - return result; } @@ -11453,7 +11196,6 @@ static NTSTATUS thunk32_vkCreateRenderPass2(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pRenderPass); result = wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass2(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); - return result; } @@ -11468,7 +11210,6 @@ static NTSTATUS thunk64_vkCreateRenderPass2KHR(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pRenderPass); result = wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass2KHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); - return result; } @@ -11481,7 +11222,6 @@ static NTSTATUS thunk32_vkCreateRenderPass2KHR(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pRenderPass); result = wine_device_from_handle(params->device)->funcs.p_vkCreateRenderPass2KHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pRenderPass); - return result; } @@ -11496,7 +11236,6 @@ static NTSTATUS thunk64_vkCreateSampler(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSampler); result = wine_device_from_handle(params->device)->funcs.p_vkCreateSampler(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSampler); - return result; } @@ -11509,7 +11248,6 @@ static NTSTATUS thunk32_vkCreateSampler(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSampler); result = wine_device_from_handle(params->device)->funcs.p_vkCreateSampler(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSampler); - return result; } @@ -11524,7 +11262,6 @@ static NTSTATUS thunk64_vkCreateSamplerYcbcrConversion(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pYcbcrConversion); result = wine_device_from_handle(params->device)->funcs.p_vkCreateSamplerYcbcrConversion(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pYcbcrConversion); - return result; } @@ -11537,7 +11274,6 @@ static NTSTATUS thunk32_vkCreateSamplerYcbcrConversion(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pYcbcrConversion); result = wine_device_from_handle(params->device)->funcs.p_vkCreateSamplerYcbcrConversion(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pYcbcrConversion); - return result; } @@ -11552,7 +11288,6 @@ static NTSTATUS thunk64_vkCreateSamplerYcbcrConversionKHR(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pYcbcrConversion); result = wine_device_from_handle(params->device)->funcs.p_vkCreateSamplerYcbcrConversionKHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pYcbcrConversion); - return result; } @@ -11565,7 +11300,6 @@ static NTSTATUS thunk32_vkCreateSamplerYcbcrConversionKHR(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pYcbcrConversion); result = wine_device_from_handle(params->device)->funcs.p_vkCreateSamplerYcbcrConversionKHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pYcbcrConversion); - return result; } @@ -11580,7 +11314,6 @@ static NTSTATUS thunk64_vkCreateSemaphore(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSemaphore); result = wine_device_from_handle(params->device)->funcs.p_vkCreateSemaphore(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSemaphore); - return result; } @@ -11593,7 +11326,6 @@ static NTSTATUS thunk32_vkCreateSemaphore(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pSemaphore); result = wine_device_from_handle(params->device)->funcs.p_vkCreateSemaphore(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pSemaphore); - return result; } @@ -11608,7 +11340,6 @@ static NTSTATUS thunk64_vkCreateShaderModule(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pShaderModule); result = wine_device_from_handle(params->device)->funcs.p_vkCreateShaderModule(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pShaderModule); - return result; } @@ -11621,7 +11352,6 @@ static NTSTATUS thunk32_vkCreateShaderModule(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pShaderModule); result = wine_device_from_handle(params->device)->funcs.p_vkCreateShaderModule(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pShaderModule); - return result; } @@ -11638,7 +11368,6 @@ static NTSTATUS thunk64_vkCreateSwapchainKHR(void *args) convert_VkSwapchainCreateInfoKHR_win_to_host(params->pCreateInfo, &pCreateInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkCreateSwapchainKHR(wine_device_from_handle(params->device)->device, &pCreateInfo_host, NULL, params->pSwapchain); - return result; } @@ -11653,7 +11382,6 @@ static NTSTATUS thunk32_vkCreateSwapchainKHR(void *args) convert_VkSwapchainCreateInfoKHR_win_to_host(params->pCreateInfo, &pCreateInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkCreateSwapchainKHR(wine_device_from_handle(params->device)->device, &pCreateInfo_host, NULL, params->pSwapchain); - return result; } @@ -11668,7 +11396,6 @@ static NTSTATUS thunk64_vkCreateValidationCacheEXT(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pValidationCache); result = wine_device_from_handle(params->device)->funcs.p_vkCreateValidationCacheEXT(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pValidationCache); - return result; } @@ -11681,7 +11408,28 @@ static NTSTATUS thunk32_vkCreateValidationCacheEXT(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pValidationCache); result = wine_device_from_handle(params->device)->funcs.p_vkCreateValidationCacheEXT(wine_device_from_handle(params->device)->device, params->pCreateInfo, NULL, params->pValidationCache); + return result; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkCreateWin32SurfaceKHR(void *args) +{ + struct vkCreateWin32SurfaceKHR_params *params = args; + VkResult result; + result = wine_vkCreateWin32SurfaceKHR(params->instance, params->pCreateInfo, params->pAllocator, params->pSurface); + return result; +} +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkCreateWin32SurfaceKHR(void *args) +{ + struct vkCreateWin32SurfaceKHR_params *params = args; + VkResult result; + result = wine_vkCreateWin32SurfaceKHR(params->instance, params->pCreateInfo, params->pAllocator, params->pSurface); return result; } @@ -11698,7 +11446,6 @@ static NTSTATUS thunk64_vkDebugMarkerSetObjectNameEXT(void *args) convert_VkDebugMarkerObjectNameInfoEXT_win_to_host(params->pNameInfo, &pNameInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkDebugMarkerSetObjectNameEXT(wine_device_from_handle(params->device)->device, &pNameInfo_host); - return result; } @@ -11713,7 +11460,6 @@ static NTSTATUS thunk32_vkDebugMarkerSetObjectNameEXT(void *args) convert_VkDebugMarkerObjectNameInfoEXT_win_to_host(params->pNameInfo, &pNameInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkDebugMarkerSetObjectNameEXT(wine_device_from_handle(params->device)->device, &pNameInfo_host); - return result; } @@ -11730,7 +11476,6 @@ static NTSTATUS thunk64_vkDebugMarkerSetObjectTagEXT(void *args) convert_VkDebugMarkerObjectTagInfoEXT_win_to_host(params->pTagInfo, &pTagInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkDebugMarkerSetObjectTagEXT(wine_device_from_handle(params->device)->device, &pTagInfo_host); - return result; } @@ -11745,7 +11490,6 @@ static NTSTATUS thunk32_vkDebugMarkerSetObjectTagEXT(void *args) convert_VkDebugMarkerObjectTagInfoEXT_win_to_host(params->pTagInfo, &pTagInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkDebugMarkerSetObjectTagEXT(wine_device_from_handle(params->device)->device, &pTagInfo_host); - return result; } @@ -11759,7 +11503,6 @@ static NTSTATUS thunk64_vkDebugReportMessageEXT(void *args) TRACE("%p, %#x, %#x, 0x%s, 0x%s, %d, %p, %p\n", params->instance, params->flags, params->objectType, wine_dbgstr_longlong(params->object), wine_dbgstr_longlong(params->location), params->messageCode, params->pLayerPrefix, params->pMessage); wine_instance_from_handle(params->instance)->funcs.p_vkDebugReportMessageEXT(wine_instance_from_handle(params->instance)->instance, params->flags, params->objectType, wine_vk_unwrap_handle(params->objectType, params->object), params->location, params->messageCode, params->pLayerPrefix, params->pMessage); - return STATUS_SUCCESS; } @@ -11771,7 +11514,6 @@ static NTSTATUS thunk32_vkDebugReportMessageEXT(void *args) TRACE("%p, %#x, %#x, 0x%s, 0x%s, %d, %p, %p\n", params->instance, params->flags, params->objectType, wine_dbgstr_longlong(params->object), wine_dbgstr_longlong(params->location), params->messageCode, params->pLayerPrefix, params->pMessage); wine_instance_from_handle(params->instance)->funcs.p_vkDebugReportMessageEXT(wine_instance_from_handle(params->instance)->instance, params->flags, params->objectType, wine_vk_unwrap_handle(params->objectType, params->object), params->location, params->messageCode, params->pLayerPrefix, params->pMessage); - return STATUS_SUCCESS; } @@ -11786,7 +11528,6 @@ static NTSTATUS thunk64_vkDeferredOperationJoinKHR(void *args) TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->operation)); result = wine_device_from_handle(params->device)->funcs.p_vkDeferredOperationJoinKHR(wine_device_from_handle(params->device)->device, params->operation); - return result; } @@ -11799,7 +11540,6 @@ static NTSTATUS thunk32_vkDeferredOperationJoinKHR(void *args) TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->operation)); result = wine_device_from_handle(params->device)->funcs.p_vkDeferredOperationJoinKHR(wine_device_from_handle(params->device)->device, params->operation); - return result; } @@ -11813,7 +11553,6 @@ static NTSTATUS thunk64_vkDestroyAccelerationStructureKHR(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->accelerationStructure), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->accelerationStructure, NULL); - return STATUS_SUCCESS; } @@ -11825,7 +11564,6 @@ static NTSTATUS thunk32_vkDestroyAccelerationStructureKHR(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->accelerationStructure), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyAccelerationStructureKHR(wine_device_from_handle(params->device)->device, params->accelerationStructure, NULL); - return STATUS_SUCCESS; } @@ -11839,7 +11577,6 @@ static NTSTATUS thunk64_vkDestroyAccelerationStructureNV(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->accelerationStructure), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyAccelerationStructureNV(wine_device_from_handle(params->device)->device, params->accelerationStructure, NULL); - return STATUS_SUCCESS; } @@ -11851,7 +11588,6 @@ static NTSTATUS thunk32_vkDestroyAccelerationStructureNV(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->accelerationStructure), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyAccelerationStructureNV(wine_device_from_handle(params->device)->device, params->accelerationStructure, NULL); - return STATUS_SUCCESS; } @@ -11865,7 +11601,6 @@ static NTSTATUS thunk64_vkDestroyBuffer(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->buffer), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyBuffer(wine_device_from_handle(params->device)->device, params->buffer, NULL); - return STATUS_SUCCESS; } @@ -11877,7 +11612,6 @@ static NTSTATUS thunk32_vkDestroyBuffer(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->buffer), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyBuffer(wine_device_from_handle(params->device)->device, params->buffer, NULL); - return STATUS_SUCCESS; } @@ -11891,7 +11625,6 @@ static NTSTATUS thunk64_vkDestroyBufferView(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->bufferView), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyBufferView(wine_device_from_handle(params->device)->device, params->bufferView, NULL); - return STATUS_SUCCESS; } @@ -11903,7 +11636,26 @@ static NTSTATUS thunk32_vkDestroyBufferView(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->bufferView), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyBufferView(wine_device_from_handle(params->device)->device, params->bufferView, NULL); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyCommandPool(void *args) +{ + struct vkDestroyCommandPool_params *params = args; + wine_vkDestroyCommandPool(params->device, params->commandPool, params->pAllocator); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ +static NTSTATUS thunk32_vkDestroyCommandPool(void *args) +{ + struct vkDestroyCommandPool_params *params = args; + wine_vkDestroyCommandPool(params->device, params->commandPool, params->pAllocator); return STATUS_SUCCESS; } @@ -11917,7 +11669,6 @@ static NTSTATUS thunk64_vkDestroyCuFunctionNVX(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->function), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyCuFunctionNVX(wine_device_from_handle(params->device)->device, params->function, NULL); - return STATUS_SUCCESS; } @@ -11929,7 +11680,6 @@ static NTSTATUS thunk32_vkDestroyCuFunctionNVX(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->function), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyCuFunctionNVX(wine_device_from_handle(params->device)->device, params->function, NULL); - return STATUS_SUCCESS; } @@ -11943,7 +11693,6 @@ static NTSTATUS thunk64_vkDestroyCuModuleNVX(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->module), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyCuModuleNVX(wine_device_from_handle(params->device)->device, params->module, NULL); - return STATUS_SUCCESS; } @@ -11955,7 +11704,46 @@ static NTSTATUS thunk32_vkDestroyCuModuleNVX(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->module), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyCuModuleNVX(wine_device_from_handle(params->device)->device, params->module, NULL); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyDebugReportCallbackEXT(void *args) +{ + struct vkDestroyDebugReportCallbackEXT_params *params = args; + wine_vkDestroyDebugReportCallbackEXT(params->instance, params->callback, params->pAllocator); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkDestroyDebugReportCallbackEXT(void *args) +{ + struct vkDestroyDebugReportCallbackEXT_params *params = args; + wine_vkDestroyDebugReportCallbackEXT(params->instance, params->callback, params->pAllocator); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyDebugUtilsMessengerEXT(void *args) +{ + struct vkDestroyDebugUtilsMessengerEXT_params *params = args; + wine_vkDestroyDebugUtilsMessengerEXT(params->instance, params->messenger, params->pAllocator); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ +static NTSTATUS thunk32_vkDestroyDebugUtilsMessengerEXT(void *args) +{ + struct vkDestroyDebugUtilsMessengerEXT_params *params = args; + wine_vkDestroyDebugUtilsMessengerEXT(params->instance, params->messenger, params->pAllocator); return STATUS_SUCCESS; } @@ -11969,7 +11757,6 @@ static NTSTATUS thunk64_vkDestroyDeferredOperationKHR(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->operation), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyDeferredOperationKHR(wine_device_from_handle(params->device)->device, params->operation, NULL); - return STATUS_SUCCESS; } @@ -11981,7 +11768,6 @@ static NTSTATUS thunk32_vkDestroyDeferredOperationKHR(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->operation), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyDeferredOperationKHR(wine_device_from_handle(params->device)->device, params->operation, NULL); - return STATUS_SUCCESS; } @@ -11995,7 +11781,6 @@ static NTSTATUS thunk64_vkDestroyDescriptorPool(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorPool), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyDescriptorPool(wine_device_from_handle(params->device)->device, params->descriptorPool, NULL); - return STATUS_SUCCESS; } @@ -12007,7 +11792,6 @@ static NTSTATUS thunk32_vkDestroyDescriptorPool(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorPool), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyDescriptorPool(wine_device_from_handle(params->device)->device, params->descriptorPool, NULL); - return STATUS_SUCCESS; } @@ -12021,7 +11805,6 @@ static NTSTATUS thunk64_vkDestroyDescriptorSetLayout(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSetLayout), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyDescriptorSetLayout(wine_device_from_handle(params->device)->device, params->descriptorSetLayout, NULL); - return STATUS_SUCCESS; } @@ -12033,7 +11816,6 @@ static NTSTATUS thunk32_vkDestroyDescriptorSetLayout(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSetLayout), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyDescriptorSetLayout(wine_device_from_handle(params->device)->device, params->descriptorSetLayout, NULL); - return STATUS_SUCCESS; } @@ -12047,7 +11829,6 @@ static NTSTATUS thunk64_vkDestroyDescriptorUpdateTemplate(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyDescriptorUpdateTemplate(wine_device_from_handle(params->device)->device, params->descriptorUpdateTemplate, NULL); - return STATUS_SUCCESS; } @@ -12059,7 +11840,6 @@ static NTSTATUS thunk32_vkDestroyDescriptorUpdateTemplate(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyDescriptorUpdateTemplate(wine_device_from_handle(params->device)->device, params->descriptorUpdateTemplate, NULL); - return STATUS_SUCCESS; } @@ -12073,7 +11853,6 @@ static NTSTATUS thunk64_vkDestroyDescriptorUpdateTemplateKHR(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyDescriptorUpdateTemplateKHR(wine_device_from_handle(params->device)->device, params->descriptorUpdateTemplate, NULL); - return STATUS_SUCCESS; } @@ -12085,7 +11864,26 @@ static NTSTATUS thunk32_vkDestroyDescriptorUpdateTemplateKHR(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyDescriptorUpdateTemplateKHR(wine_device_from_handle(params->device)->device, params->descriptorUpdateTemplate, NULL); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyDevice(void *args) +{ + struct vkDestroyDevice_params *params = args; + wine_vkDestroyDevice(params->device, params->pAllocator); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ +static NTSTATUS thunk32_vkDestroyDevice(void *args) +{ + struct vkDestroyDevice_params *params = args; + wine_vkDestroyDevice(params->device, params->pAllocator); return STATUS_SUCCESS; } @@ -12099,7 +11897,6 @@ static NTSTATUS thunk64_vkDestroyEvent(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->event), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyEvent(wine_device_from_handle(params->device)->device, params->event, NULL); - return STATUS_SUCCESS; } @@ -12111,7 +11908,6 @@ static NTSTATUS thunk32_vkDestroyEvent(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->event), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyEvent(wine_device_from_handle(params->device)->device, params->event, NULL); - return STATUS_SUCCESS; } @@ -12125,7 +11921,6 @@ static NTSTATUS thunk64_vkDestroyFence(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->fence), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyFence(wine_device_from_handle(params->device)->device, params->fence, NULL); - return STATUS_SUCCESS; } @@ -12137,7 +11932,6 @@ static NTSTATUS thunk32_vkDestroyFence(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->fence), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyFence(wine_device_from_handle(params->device)->device, params->fence, NULL); - return STATUS_SUCCESS; } @@ -12151,7 +11945,6 @@ static NTSTATUS thunk64_vkDestroyFramebuffer(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->framebuffer), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyFramebuffer(wine_device_from_handle(params->device)->device, params->framebuffer, NULL); - return STATUS_SUCCESS; } @@ -12163,7 +11956,6 @@ static NTSTATUS thunk32_vkDestroyFramebuffer(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->framebuffer), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyFramebuffer(wine_device_from_handle(params->device)->device, params->framebuffer, NULL); - return STATUS_SUCCESS; } @@ -12177,7 +11969,6 @@ static NTSTATUS thunk64_vkDestroyImage(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyImage(wine_device_from_handle(params->device)->device, params->image, NULL); - return STATUS_SUCCESS; } @@ -12189,7 +11980,6 @@ static NTSTATUS thunk32_vkDestroyImage(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyImage(wine_device_from_handle(params->device)->device, params->image, NULL); - return STATUS_SUCCESS; } @@ -12203,7 +11993,6 @@ static NTSTATUS thunk64_vkDestroyImageView(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->imageView), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyImageView(wine_device_from_handle(params->device)->device, params->imageView, NULL); - return STATUS_SUCCESS; } @@ -12215,7 +12004,6 @@ static NTSTATUS thunk32_vkDestroyImageView(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->imageView), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyImageView(wine_device_from_handle(params->device)->device, params->imageView, NULL); - return STATUS_SUCCESS; } @@ -12229,7 +12017,6 @@ static NTSTATUS thunk64_vkDestroyIndirectCommandsLayoutNV(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->indirectCommandsLayout), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyIndirectCommandsLayoutNV(wine_device_from_handle(params->device)->device, params->indirectCommandsLayout, NULL); - return STATUS_SUCCESS; } @@ -12241,7 +12028,26 @@ static NTSTATUS thunk32_vkDestroyIndirectCommandsLayoutNV(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->indirectCommandsLayout), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyIndirectCommandsLayoutNV(wine_device_from_handle(params->device)->device, params->indirectCommandsLayout, NULL); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroyInstance(void *args) +{ + struct vkDestroyInstance_params *params = args; + wine_vkDestroyInstance(params->instance, params->pAllocator); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ +static NTSTATUS thunk32_vkDestroyInstance(void *args) +{ + struct vkDestroyInstance_params *params = args; + wine_vkDestroyInstance(params->instance, params->pAllocator); return STATUS_SUCCESS; } @@ -12255,7 +12061,6 @@ static NTSTATUS thunk64_vkDestroyPipeline(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyPipeline(wine_device_from_handle(params->device)->device, params->pipeline, NULL); - return STATUS_SUCCESS; } @@ -12267,7 +12072,6 @@ static NTSTATUS thunk32_vkDestroyPipeline(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyPipeline(wine_device_from_handle(params->device)->device, params->pipeline, NULL); - return STATUS_SUCCESS; } @@ -12281,7 +12085,6 @@ static NTSTATUS thunk64_vkDestroyPipelineCache(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyPipelineCache(wine_device_from_handle(params->device)->device, params->pipelineCache, NULL); - return STATUS_SUCCESS; } @@ -12293,7 +12096,6 @@ static NTSTATUS thunk32_vkDestroyPipelineCache(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyPipelineCache(wine_device_from_handle(params->device)->device, params->pipelineCache, NULL); - return STATUS_SUCCESS; } @@ -12307,7 +12109,6 @@ static NTSTATUS thunk64_vkDestroyPipelineLayout(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipelineLayout), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyPipelineLayout(wine_device_from_handle(params->device)->device, params->pipelineLayout, NULL); - return STATUS_SUCCESS; } @@ -12319,7 +12120,6 @@ static NTSTATUS thunk32_vkDestroyPipelineLayout(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipelineLayout), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyPipelineLayout(wine_device_from_handle(params->device)->device, params->pipelineLayout, NULL); - return STATUS_SUCCESS; } @@ -12333,7 +12133,6 @@ static NTSTATUS thunk64_vkDestroyPrivateDataSlot(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->privateDataSlot), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyPrivateDataSlot(wine_device_from_handle(params->device)->device, params->privateDataSlot, NULL); - return STATUS_SUCCESS; } @@ -12345,7 +12144,6 @@ static NTSTATUS thunk32_vkDestroyPrivateDataSlot(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->privateDataSlot), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyPrivateDataSlot(wine_device_from_handle(params->device)->device, params->privateDataSlot, NULL); - return STATUS_SUCCESS; } @@ -12359,7 +12157,6 @@ static NTSTATUS thunk64_vkDestroyPrivateDataSlotEXT(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->privateDataSlot), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyPrivateDataSlotEXT(wine_device_from_handle(params->device)->device, params->privateDataSlot, NULL); - return STATUS_SUCCESS; } @@ -12371,7 +12168,6 @@ static NTSTATUS thunk32_vkDestroyPrivateDataSlotEXT(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->privateDataSlot), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyPrivateDataSlotEXT(wine_device_from_handle(params->device)->device, params->privateDataSlot, NULL); - return STATUS_SUCCESS; } @@ -12385,7 +12181,6 @@ static NTSTATUS thunk64_vkDestroyQueryPool(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->queryPool), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyQueryPool(wine_device_from_handle(params->device)->device, params->queryPool, NULL); - return STATUS_SUCCESS; } @@ -12397,7 +12192,6 @@ static NTSTATUS thunk32_vkDestroyQueryPool(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->queryPool), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyQueryPool(wine_device_from_handle(params->device)->device, params->queryPool, NULL); - return STATUS_SUCCESS; } @@ -12411,7 +12205,6 @@ static NTSTATUS thunk64_vkDestroyRenderPass(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->renderPass), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyRenderPass(wine_device_from_handle(params->device)->device, params->renderPass, NULL); - return STATUS_SUCCESS; } @@ -12423,7 +12216,6 @@ static NTSTATUS thunk32_vkDestroyRenderPass(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->renderPass), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyRenderPass(wine_device_from_handle(params->device)->device, params->renderPass, NULL); - return STATUS_SUCCESS; } @@ -12437,7 +12229,6 @@ static NTSTATUS thunk64_vkDestroySampler(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->sampler), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroySampler(wine_device_from_handle(params->device)->device, params->sampler, NULL); - return STATUS_SUCCESS; } @@ -12449,7 +12240,6 @@ static NTSTATUS thunk32_vkDestroySampler(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->sampler), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroySampler(wine_device_from_handle(params->device)->device, params->sampler, NULL); - return STATUS_SUCCESS; } @@ -12463,7 +12253,6 @@ static NTSTATUS thunk64_vkDestroySamplerYcbcrConversion(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->ycbcrConversion), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroySamplerYcbcrConversion(wine_device_from_handle(params->device)->device, params->ycbcrConversion, NULL); - return STATUS_SUCCESS; } @@ -12475,7 +12264,6 @@ static NTSTATUS thunk32_vkDestroySamplerYcbcrConversion(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->ycbcrConversion), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroySamplerYcbcrConversion(wine_device_from_handle(params->device)->device, params->ycbcrConversion, NULL); - return STATUS_SUCCESS; } @@ -12489,7 +12277,6 @@ static NTSTATUS thunk64_vkDestroySamplerYcbcrConversionKHR(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->ycbcrConversion), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroySamplerYcbcrConversionKHR(wine_device_from_handle(params->device)->device, params->ycbcrConversion, NULL); - return STATUS_SUCCESS; } @@ -12501,7 +12288,6 @@ static NTSTATUS thunk32_vkDestroySamplerYcbcrConversionKHR(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->ycbcrConversion), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroySamplerYcbcrConversionKHR(wine_device_from_handle(params->device)->device, params->ycbcrConversion, NULL); - return STATUS_SUCCESS; } @@ -12515,7 +12301,6 @@ static NTSTATUS thunk64_vkDestroySemaphore(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->semaphore), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroySemaphore(wine_device_from_handle(params->device)->device, params->semaphore, NULL); - return STATUS_SUCCESS; } @@ -12527,7 +12312,6 @@ static NTSTATUS thunk32_vkDestroySemaphore(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->semaphore), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroySemaphore(wine_device_from_handle(params->device)->device, params->semaphore, NULL); - return STATUS_SUCCESS; } @@ -12541,7 +12325,6 @@ static NTSTATUS thunk64_vkDestroyShaderModule(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->shaderModule), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyShaderModule(wine_device_from_handle(params->device)->device, params->shaderModule, NULL); - return STATUS_SUCCESS; } @@ -12553,7 +12336,26 @@ static NTSTATUS thunk32_vkDestroyShaderModule(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->shaderModule), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyShaderModule(wine_device_from_handle(params->device)->device, params->shaderModule, NULL); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkDestroySurfaceKHR(void *args) +{ + struct vkDestroySurfaceKHR_params *params = args; + wine_vkDestroySurfaceKHR(params->instance, params->surface, params->pAllocator); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ +static NTSTATUS thunk32_vkDestroySurfaceKHR(void *args) +{ + struct vkDestroySurfaceKHR_params *params = args; + wine_vkDestroySurfaceKHR(params->instance, params->surface, params->pAllocator); return STATUS_SUCCESS; } @@ -12567,7 +12369,6 @@ static NTSTATUS thunk64_vkDestroySwapchainKHR(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->swapchain), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroySwapchainKHR(wine_device_from_handle(params->device)->device, params->swapchain, NULL); - return STATUS_SUCCESS; } @@ -12579,7 +12380,6 @@ static NTSTATUS thunk32_vkDestroySwapchainKHR(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->swapchain), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroySwapchainKHR(wine_device_from_handle(params->device)->device, params->swapchain, NULL); - return STATUS_SUCCESS; } @@ -12593,7 +12393,6 @@ static NTSTATUS thunk64_vkDestroyValidationCacheEXT(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->validationCache), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyValidationCacheEXT(wine_device_from_handle(params->device)->device, params->validationCache, NULL); - return STATUS_SUCCESS; } @@ -12605,7 +12404,6 @@ static NTSTATUS thunk32_vkDestroyValidationCacheEXT(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->validationCache), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkDestroyValidationCacheEXT(wine_device_from_handle(params->device)->device, params->validationCache, NULL); - return STATUS_SUCCESS; } @@ -12620,7 +12418,6 @@ static NTSTATUS thunk64_vkDeviceWaitIdle(void *args) TRACE("%p\n", params->device); result = wine_device_from_handle(params->device)->funcs.p_vkDeviceWaitIdle(wine_device_from_handle(params->device)->device); - return result; } @@ -12633,7 +12430,6 @@ static NTSTATUS thunk32_vkDeviceWaitIdle(void *args) TRACE("%p\n", params->device); result = wine_device_from_handle(params->device)->funcs.p_vkDeviceWaitIdle(wine_device_from_handle(params->device)->device); - return result; } @@ -12648,7 +12444,6 @@ static NTSTATUS thunk64_vkEndCommandBuffer(void *args) TRACE("%p\n", params->commandBuffer); result = wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkEndCommandBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); - return result; } @@ -12661,7 +12456,6 @@ static NTSTATUS thunk32_vkEndCommandBuffer(void *args) TRACE("%p\n", params->commandBuffer); result = wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkEndCommandBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer); - return result; } @@ -12669,27 +12463,21 @@ static NTSTATUS thunk32_vkEndCommandBuffer(void *args) #if !defined(USE_STRUCT_CONVERSION) -static NTSTATUS thunk64_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(void *args) +static NTSTATUS thunk64_vkEnumerateDeviceExtensionProperties(void *args) { - struct vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR_params *params = args; + struct vkEnumerateDeviceExtensionProperties_params *params = args; VkResult result; - TRACE("%p, %u, %p, %p, %p\n", params->physicalDevice, params->queueFamilyIndex, params->pCounterCount, params->pCounters, params->pCounterDescriptions); - - result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex, params->pCounterCount, params->pCounters, params->pCounterDescriptions); - + result = wine_vkEnumerateDeviceExtensionProperties(params->physicalDevice, params->pLayerName, params->pPropertyCount, params->pProperties); return result; } #else /* USE_STRUCT_CONVERSION */ -static NTSTATUS thunk32_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(void *args) +static NTSTATUS thunk32_vkEnumerateDeviceExtensionProperties(void *args) { - struct vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR_params *params = args; + struct vkEnumerateDeviceExtensionProperties_params *params = args; VkResult result; - TRACE("%p, %u, %p, %p, %p\n", params->physicalDevice, params->queueFamilyIndex, params->pCounterCount, params->pCounters, params->pCounterDescriptions); - - result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex, params->pCounterCount, params->pCounters, params->pCounterDescriptions); - + result = wine_vkEnumerateDeviceExtensionProperties(params->physicalDevice, params->pLayerName, params->pPropertyCount, params->pProperties); return result; } @@ -12697,14 +12485,171 @@ static NTSTATUS thunk32_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCoun #if !defined(USE_STRUCT_CONVERSION) -static NTSTATUS thunk64_vkFlushMappedMemoryRanges(void *args) +static NTSTATUS thunk64_vkEnumerateDeviceLayerProperties(void *args) { - struct vkFlushMappedMemoryRanges_params *params = args; + struct vkEnumerateDeviceLayerProperties_params *params = args; VkResult result; - TRACE("%p, %u, %p\n", params->device, params->memoryRangeCount, params->pMemoryRanges); - - result = wine_device_from_handle(params->device)->funcs.p_vkFlushMappedMemoryRanges(wine_device_from_handle(params->device)->device, params->memoryRangeCount, params->pMemoryRanges); + result = wine_vkEnumerateDeviceLayerProperties(params->physicalDevice, params->pPropertyCount, params->pProperties); + return result; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkEnumerateDeviceLayerProperties(void *args) +{ + struct vkEnumerateDeviceLayerProperties_params *params = args; + VkResult result; + result = wine_vkEnumerateDeviceLayerProperties(params->physicalDevice, params->pPropertyCount, params->pProperties); + return result; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkEnumerateInstanceExtensionProperties(void *args) +{ + struct vkEnumerateInstanceExtensionProperties_params *params = args; + VkResult result; + result = wine_vkEnumerateInstanceExtensionProperties(params->pLayerName, params->pPropertyCount, params->pProperties); + return result; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkEnumerateInstanceExtensionProperties(void *args) +{ + struct vkEnumerateInstanceExtensionProperties_params *params = args; + VkResult result; + result = wine_vkEnumerateInstanceExtensionProperties(params->pLayerName, params->pPropertyCount, params->pProperties); + return result; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkEnumerateInstanceVersion(void *args) +{ + struct vkEnumerateInstanceVersion_params *params = args; + VkResult result; + result = wine_vkEnumerateInstanceVersion(params->pApiVersion); + return result; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkEnumerateInstanceVersion(void *args) +{ + struct vkEnumerateInstanceVersion_params *params = args; + VkResult result; + result = wine_vkEnumerateInstanceVersion(params->pApiVersion); + return result; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkEnumeratePhysicalDeviceGroups(void *args) +{ + struct vkEnumeratePhysicalDeviceGroups_params *params = args; + VkResult result; + result = wine_vkEnumeratePhysicalDeviceGroups(params->instance, params->pPhysicalDeviceGroupCount, params->pPhysicalDeviceGroupProperties); + return result; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkEnumeratePhysicalDeviceGroups(void *args) +{ + struct vkEnumeratePhysicalDeviceGroups_params *params = args; + VkResult result; + result = wine_vkEnumeratePhysicalDeviceGroups(params->instance, params->pPhysicalDeviceGroupCount, params->pPhysicalDeviceGroupProperties); + return result; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkEnumeratePhysicalDeviceGroupsKHR(void *args) +{ + struct vkEnumeratePhysicalDeviceGroupsKHR_params *params = args; + VkResult result; + result = wine_vkEnumeratePhysicalDeviceGroupsKHR(params->instance, params->pPhysicalDeviceGroupCount, params->pPhysicalDeviceGroupProperties); + return result; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkEnumeratePhysicalDeviceGroupsKHR(void *args) +{ + struct vkEnumeratePhysicalDeviceGroupsKHR_params *params = args; + VkResult result; + result = wine_vkEnumeratePhysicalDeviceGroupsKHR(params->instance, params->pPhysicalDeviceGroupCount, params->pPhysicalDeviceGroupProperties); + return result; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(void *args) +{ + struct vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR_params *params = args; + VkResult result; + TRACE("%p, %u, %p, %p, %p\n", params->physicalDevice, params->queueFamilyIndex, params->pCounterCount, params->pCounters, params->pCounterDescriptions); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex, params->pCounterCount, params->pCounters, params->pCounterDescriptions); + return result; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(void *args) +{ + struct vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR_params *params = args; + VkResult result; + TRACE("%p, %u, %p, %p, %p\n", params->physicalDevice, params->queueFamilyIndex, params->pCounterCount, params->pCounters, params->pCounterDescriptions); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex, params->pCounterCount, params->pCounters, params->pCounterDescriptions); + return result; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkEnumeratePhysicalDevices(void *args) +{ + struct vkEnumeratePhysicalDevices_params *params = args; + VkResult result; + result = wine_vkEnumeratePhysicalDevices(params->instance, params->pPhysicalDeviceCount, params->pPhysicalDevices); + return result; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkEnumeratePhysicalDevices(void *args) +{ + struct vkEnumeratePhysicalDevices_params *params = args; + VkResult result; + result = wine_vkEnumeratePhysicalDevices(params->instance, params->pPhysicalDeviceCount, params->pPhysicalDevices); + return result; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkFlushMappedMemoryRanges(void *args) +{ + struct vkFlushMappedMemoryRanges_params *params = args; + VkResult result; + TRACE("%p, %u, %p\n", params->device, params->memoryRangeCount, params->pMemoryRanges); + result = wine_device_from_handle(params->device)->funcs.p_vkFlushMappedMemoryRanges(wine_device_from_handle(params->device)->device, params->memoryRangeCount, params->pMemoryRanges); return result; } @@ -12719,7 +12664,6 @@ static NTSTATUS thunk32_vkFlushMappedMemoryRanges(void *args) pMemoryRanges_host = convert_VkMappedMemoryRange_array_win_to_host(params->pMemoryRanges, params->memoryRangeCount); result = wine_device_from_handle(params->device)->funcs.p_vkFlushMappedMemoryRanges(wine_device_from_handle(params->device)->device, params->memoryRangeCount, pMemoryRanges_host); - free_VkMappedMemoryRange_array(pMemoryRanges_host, params->memoryRangeCount); return result; } @@ -12728,6 +12672,26 @@ static NTSTATUS thunk32_vkFlushMappedMemoryRanges(void *args) #if !defined(USE_STRUCT_CONVERSION) +static NTSTATUS thunk64_vkFreeCommandBuffers(void *args) +{ + struct vkFreeCommandBuffers_params *params = args; + wine_vkFreeCommandBuffers(params->device, params->commandPool, params->commandBufferCount, params->pCommandBuffers); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkFreeCommandBuffers(void *args) +{ + struct vkFreeCommandBuffers_params *params = args; + wine_vkFreeCommandBuffers(params->device, params->commandPool, params->commandBufferCount, params->pCommandBuffers); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + static NTSTATUS thunk64_vkFreeDescriptorSets(void *args) { struct vkFreeDescriptorSets_params *params = args; @@ -12735,7 +12699,6 @@ static NTSTATUS thunk64_vkFreeDescriptorSets(void *args) TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->descriptorPool), params->descriptorSetCount, params->pDescriptorSets); result = wine_device_from_handle(params->device)->funcs.p_vkFreeDescriptorSets(wine_device_from_handle(params->device)->device, params->descriptorPool, params->descriptorSetCount, params->pDescriptorSets); - return result; } @@ -12748,7 +12711,6 @@ static NTSTATUS thunk32_vkFreeDescriptorSets(void *args) TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->descriptorPool), params->descriptorSetCount, params->pDescriptorSets); result = wine_device_from_handle(params->device)->funcs.p_vkFreeDescriptorSets(wine_device_from_handle(params->device)->device, params->descriptorPool, params->descriptorSetCount, params->pDescriptorSets); - return result; } @@ -12762,7 +12724,6 @@ static NTSTATUS thunk64_vkFreeMemory(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->memory), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkFreeMemory(wine_device_from_handle(params->device)->device, params->memory, NULL); - return STATUS_SUCCESS; } @@ -12774,7 +12735,6 @@ static NTSTATUS thunk32_vkFreeMemory(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->memory), params->pAllocator); wine_device_from_handle(params->device)->funcs.p_vkFreeMemory(wine_device_from_handle(params->device)->device, params->memory, NULL); - return STATUS_SUCCESS; } @@ -12788,7 +12748,6 @@ static NTSTATUS thunk64_vkGetAccelerationStructureBuildSizesKHR(void *args) TRACE("%p, %#x, %p, %p, %p\n", params->device, params->buildType, params->pBuildInfo, params->pMaxPrimitiveCounts, params->pSizeInfo); wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureBuildSizesKHR(wine_device_from_handle(params->device)->device, params->buildType, params->pBuildInfo, params->pMaxPrimitiveCounts, params->pSizeInfo); - return STATUS_SUCCESS; } @@ -12804,7 +12763,6 @@ static NTSTATUS thunk32_vkGetAccelerationStructureBuildSizesKHR(void *args) convert_VkAccelerationStructureBuildGeometryInfoKHR_win_to_host(params->pBuildInfo, &pBuildInfo_host); convert_VkAccelerationStructureBuildSizesInfoKHR_win_to_host(params->pSizeInfo, &pSizeInfo_host); wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureBuildSizesKHR(wine_device_from_handle(params->device)->device, params->buildType, &pBuildInfo_host, params->pMaxPrimitiveCounts, &pSizeInfo_host); - return STATUS_SUCCESS; } @@ -12818,7 +12776,6 @@ static NTSTATUS thunk64_vkGetAccelerationStructureDeviceAddressKHR(void *args) TRACE("%p, %p\n", params->device, params->pInfo); params->result = wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureDeviceAddressKHR(wine_device_from_handle(params->device)->device, params->pInfo); - return STATUS_SUCCESS; } @@ -12832,7 +12789,6 @@ static NTSTATUS thunk32_vkGetAccelerationStructureDeviceAddressKHR(void *args) convert_VkAccelerationStructureDeviceAddressInfoKHR_win_to_host(params->pInfo, &pInfo_host); params->result = wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureDeviceAddressKHR(wine_device_from_handle(params->device)->device, &pInfo_host); - return STATUS_SUCCESS; } @@ -12847,7 +12803,6 @@ static NTSTATUS thunk64_vkGetAccelerationStructureHandleNV(void *args) TRACE("%p, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->accelerationStructure), wine_dbgstr_longlong(params->dataSize), params->pData); result = wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureHandleNV(wine_device_from_handle(params->device)->device, params->accelerationStructure, params->dataSize, params->pData); - return result; } @@ -12860,7 +12815,6 @@ static NTSTATUS thunk32_vkGetAccelerationStructureHandleNV(void *args) TRACE("%p, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->accelerationStructure), wine_dbgstr_longlong(params->dataSize), params->pData); result = wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureHandleNV(wine_device_from_handle(params->device)->device, params->accelerationStructure, params->dataSize, params->pData); - return result; } @@ -12874,7 +12828,6 @@ static NTSTATUS thunk64_vkGetAccelerationStructureMemoryRequirementsNV(void *arg TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureMemoryRequirementsNV(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); - return STATUS_SUCCESS; } @@ -12890,7 +12843,6 @@ static NTSTATUS thunk32_vkGetAccelerationStructureMemoryRequirementsNV(void *arg convert_VkAccelerationStructureMemoryRequirementsInfoNV_win_to_host(params->pInfo, &pInfo_host); convert_VkMemoryRequirements2KHR_win_to_host(params->pMemoryRequirements, &pMemoryRequirements_host); wine_device_from_handle(params->device)->funcs.p_vkGetAccelerationStructureMemoryRequirementsNV(wine_device_from_handle(params->device)->device, &pInfo_host, &pMemoryRequirements_host); - convert_VkMemoryRequirements2KHR_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); return STATUS_SUCCESS; } @@ -12905,7 +12857,6 @@ static NTSTATUS thunk64_vkGetBufferDeviceAddress(void *args) TRACE("%p, %p\n", params->device, params->pInfo); params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferDeviceAddress(wine_device_from_handle(params->device)->device, params->pInfo); - return STATUS_SUCCESS; } @@ -12919,7 +12870,6 @@ static NTSTATUS thunk32_vkGetBufferDeviceAddress(void *args) convert_VkBufferDeviceAddressInfo_win_to_host(params->pInfo, &pInfo_host); params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferDeviceAddress(wine_device_from_handle(params->device)->device, &pInfo_host); - return STATUS_SUCCESS; } @@ -12933,7 +12883,6 @@ static NTSTATUS thunk64_vkGetBufferDeviceAddressEXT(void *args) TRACE("%p, %p\n", params->device, params->pInfo); params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferDeviceAddressEXT(wine_device_from_handle(params->device)->device, params->pInfo); - return STATUS_SUCCESS; } @@ -12947,7 +12896,6 @@ static NTSTATUS thunk32_vkGetBufferDeviceAddressEXT(void *args) convert_VkBufferDeviceAddressInfo_win_to_host(params->pInfo, &pInfo_host); params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferDeviceAddressEXT(wine_device_from_handle(params->device)->device, &pInfo_host); - return STATUS_SUCCESS; } @@ -12961,7 +12909,6 @@ static NTSTATUS thunk64_vkGetBufferDeviceAddressKHR(void *args) TRACE("%p, %p\n", params->device, params->pInfo); params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferDeviceAddressKHR(wine_device_from_handle(params->device)->device, params->pInfo); - return STATUS_SUCCESS; } @@ -12975,7 +12922,6 @@ static NTSTATUS thunk32_vkGetBufferDeviceAddressKHR(void *args) convert_VkBufferDeviceAddressInfo_win_to_host(params->pInfo, &pInfo_host); params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferDeviceAddressKHR(wine_device_from_handle(params->device)->device, &pInfo_host); - return STATUS_SUCCESS; } @@ -12989,7 +12935,6 @@ static NTSTATUS thunk64_vkGetBufferMemoryRequirements(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->buffer), params->pMemoryRequirements); wine_device_from_handle(params->device)->funcs.p_vkGetBufferMemoryRequirements(wine_device_from_handle(params->device)->device, params->buffer, params->pMemoryRequirements); - return STATUS_SUCCESS; } @@ -13002,7 +12947,6 @@ static NTSTATUS thunk32_vkGetBufferMemoryRequirements(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->buffer), params->pMemoryRequirements); wine_device_from_handle(params->device)->funcs.p_vkGetBufferMemoryRequirements(wine_device_from_handle(params->device)->device, params->buffer, &pMemoryRequirements_host); - convert_VkMemoryRequirements_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); return STATUS_SUCCESS; } @@ -13017,7 +12961,6 @@ static NTSTATUS thunk64_vkGetBufferMemoryRequirements2(void *args) TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); wine_device_from_handle(params->device)->funcs.p_vkGetBufferMemoryRequirements2(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); - return STATUS_SUCCESS; } @@ -13033,7 +12976,6 @@ static NTSTATUS thunk32_vkGetBufferMemoryRequirements2(void *args) convert_VkBufferMemoryRequirementsInfo2_win_to_host(params->pInfo, &pInfo_host); convert_VkMemoryRequirements2_win_to_host(params->pMemoryRequirements, &pMemoryRequirements_host); wine_device_from_handle(params->device)->funcs.p_vkGetBufferMemoryRequirements2(wine_device_from_handle(params->device)->device, &pInfo_host, &pMemoryRequirements_host); - convert_VkMemoryRequirements2_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); return STATUS_SUCCESS; } @@ -13048,7 +12990,6 @@ static NTSTATUS thunk64_vkGetBufferMemoryRequirements2KHR(void *args) TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); wine_device_from_handle(params->device)->funcs.p_vkGetBufferMemoryRequirements2KHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); - return STATUS_SUCCESS; } @@ -13064,7 +13005,6 @@ static NTSTATUS thunk32_vkGetBufferMemoryRequirements2KHR(void *args) convert_VkBufferMemoryRequirementsInfo2_win_to_host(params->pInfo, &pInfo_host); convert_VkMemoryRequirements2_win_to_host(params->pMemoryRequirements, &pMemoryRequirements_host); wine_device_from_handle(params->device)->funcs.p_vkGetBufferMemoryRequirements2KHR(wine_device_from_handle(params->device)->device, &pInfo_host, &pMemoryRequirements_host); - convert_VkMemoryRequirements2_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); return STATUS_SUCCESS; } @@ -13079,7 +13019,6 @@ static NTSTATUS thunk64_vkGetBufferOpaqueCaptureAddress(void *args) TRACE("%p, %p\n", params->device, params->pInfo); params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferOpaqueCaptureAddress(wine_device_from_handle(params->device)->device, params->pInfo); - return STATUS_SUCCESS; } @@ -13093,7 +13032,6 @@ static NTSTATUS thunk32_vkGetBufferOpaqueCaptureAddress(void *args) convert_VkBufferDeviceAddressInfo_win_to_host(params->pInfo, &pInfo_host); params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferOpaqueCaptureAddress(wine_device_from_handle(params->device)->device, &pInfo_host); - return STATUS_SUCCESS; } @@ -13107,7 +13045,6 @@ static NTSTATUS thunk64_vkGetBufferOpaqueCaptureAddressKHR(void *args) TRACE("%p, %p\n", params->device, params->pInfo); params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferOpaqueCaptureAddressKHR(wine_device_from_handle(params->device)->device, params->pInfo); - return STATUS_SUCCESS; } @@ -13121,7 +13058,6 @@ static NTSTATUS thunk32_vkGetBufferOpaqueCaptureAddressKHR(void *args) convert_VkBufferDeviceAddressInfo_win_to_host(params->pInfo, &pInfo_host); params->result = wine_device_from_handle(params->device)->funcs.p_vkGetBufferOpaqueCaptureAddressKHR(wine_device_from_handle(params->device)->device, &pInfo_host); - return STATUS_SUCCESS; } @@ -13129,6 +13065,28 @@ static NTSTATUS thunk32_vkGetBufferOpaqueCaptureAddressKHR(void *args) #if !defined(USE_STRUCT_CONVERSION) +static NTSTATUS thunk64_vkGetCalibratedTimestampsEXT(void *args) +{ + struct vkGetCalibratedTimestampsEXT_params *params = args; + VkResult result; + result = wine_vkGetCalibratedTimestampsEXT(params->device, params->timestampCount, params->pTimestampInfos, params->pTimestamps, params->pMaxDeviation); + return result; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetCalibratedTimestampsEXT(void *args) +{ + struct vkGetCalibratedTimestampsEXT_params *params = args; + VkResult result; + result = wine_vkGetCalibratedTimestampsEXT(params->device, params->timestampCount, params->pTimestampInfos, params->pTimestamps, params->pMaxDeviation); + return result; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + static NTSTATUS thunk64_vkGetDeferredOperationMaxConcurrencyKHR(void *args) { struct vkGetDeferredOperationMaxConcurrencyKHR_params *params = args; @@ -13136,7 +13094,6 @@ static NTSTATUS thunk64_vkGetDeferredOperationMaxConcurrencyKHR(void *args) TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->operation)); result = wine_device_from_handle(params->device)->funcs.p_vkGetDeferredOperationMaxConcurrencyKHR(wine_device_from_handle(params->device)->device, params->operation); - return result; } @@ -13149,7 +13106,6 @@ static NTSTATUS thunk32_vkGetDeferredOperationMaxConcurrencyKHR(void *args) TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->operation)); result = wine_device_from_handle(params->device)->funcs.p_vkGetDeferredOperationMaxConcurrencyKHR(wine_device_from_handle(params->device)->device, params->operation); - return result; } @@ -13164,7 +13120,6 @@ static NTSTATUS thunk64_vkGetDeferredOperationResultKHR(void *args) TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->operation)); result = wine_device_from_handle(params->device)->funcs.p_vkGetDeferredOperationResultKHR(wine_device_from_handle(params->device)->device, params->operation); - return result; } @@ -13177,7 +13132,6 @@ static NTSTATUS thunk32_vkGetDeferredOperationResultKHR(void *args) TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->operation)); result = wine_device_from_handle(params->device)->funcs.p_vkGetDeferredOperationResultKHR(wine_device_from_handle(params->device)->device, params->operation); - return result; } @@ -13191,7 +13145,6 @@ static NTSTATUS thunk64_vkGetDescriptorSetHostMappingVALVE(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSet), params->ppData); wine_device_from_handle(params->device)->funcs.p_vkGetDescriptorSetHostMappingVALVE(wine_device_from_handle(params->device)->device, params->descriptorSet, params->ppData); - return STATUS_SUCCESS; } @@ -13203,7 +13156,6 @@ static NTSTATUS thunk32_vkGetDescriptorSetHostMappingVALVE(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSet), params->ppData); wine_device_from_handle(params->device)->funcs.p_vkGetDescriptorSetHostMappingVALVE(wine_device_from_handle(params->device)->device, params->descriptorSet, params->ppData); - return STATUS_SUCCESS; } @@ -13217,7 +13169,6 @@ static NTSTATUS thunk64_vkGetDescriptorSetLayoutHostMappingInfoVALVE(void *args) TRACE("%p, %p, %p\n", params->device, params->pBindingReference, params->pHostMapping); wine_device_from_handle(params->device)->funcs.p_vkGetDescriptorSetLayoutHostMappingInfoVALVE(wine_device_from_handle(params->device)->device, params->pBindingReference, params->pHostMapping); - return STATUS_SUCCESS; } @@ -13231,7 +13182,6 @@ static NTSTATUS thunk32_vkGetDescriptorSetLayoutHostMappingInfoVALVE(void *args) convert_VkDescriptorSetBindingReferenceVALVE_win_to_host(params->pBindingReference, &pBindingReference_host); wine_device_from_handle(params->device)->funcs.p_vkGetDescriptorSetLayoutHostMappingInfoVALVE(wine_device_from_handle(params->device)->device, &pBindingReference_host, params->pHostMapping); - return STATUS_SUCCESS; } @@ -13245,7 +13195,6 @@ static NTSTATUS thunk64_vkGetDescriptorSetLayoutSupport(void *args) TRACE("%p, %p, %p\n", params->device, params->pCreateInfo, params->pSupport); wine_device_from_handle(params->device)->funcs.p_vkGetDescriptorSetLayoutSupport(wine_device_from_handle(params->device)->device, params->pCreateInfo, params->pSupport); - return STATUS_SUCCESS; } @@ -13257,7 +13206,6 @@ static NTSTATUS thunk32_vkGetDescriptorSetLayoutSupport(void *args) TRACE("%p, %p, %p\n", params->device, params->pCreateInfo, params->pSupport); wine_device_from_handle(params->device)->funcs.p_vkGetDescriptorSetLayoutSupport(wine_device_from_handle(params->device)->device, params->pCreateInfo, params->pSupport); - return STATUS_SUCCESS; } @@ -13271,7 +13219,6 @@ static NTSTATUS thunk64_vkGetDescriptorSetLayoutSupportKHR(void *args) TRACE("%p, %p, %p\n", params->device, params->pCreateInfo, params->pSupport); wine_device_from_handle(params->device)->funcs.p_vkGetDescriptorSetLayoutSupportKHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, params->pSupport); - return STATUS_SUCCESS; } @@ -13283,7 +13230,6 @@ static NTSTATUS thunk32_vkGetDescriptorSetLayoutSupportKHR(void *args) TRACE("%p, %p, %p\n", params->device, params->pCreateInfo, params->pSupport); wine_device_from_handle(params->device)->funcs.p_vkGetDescriptorSetLayoutSupportKHR(wine_device_from_handle(params->device)->device, params->pCreateInfo, params->pSupport); - return STATUS_SUCCESS; } @@ -13297,7 +13243,6 @@ static NTSTATUS thunk64_vkGetDeviceAccelerationStructureCompatibilityKHR(void *a TRACE("%p, %p, %p\n", params->device, params->pVersionInfo, params->pCompatibility); wine_device_from_handle(params->device)->funcs.p_vkGetDeviceAccelerationStructureCompatibilityKHR(wine_device_from_handle(params->device)->device, params->pVersionInfo, params->pCompatibility); - return STATUS_SUCCESS; } @@ -13309,7 +13254,6 @@ static NTSTATUS thunk32_vkGetDeviceAccelerationStructureCompatibilityKHR(void *a TRACE("%p, %p, %p\n", params->device, params->pVersionInfo, params->pCompatibility); wine_device_from_handle(params->device)->funcs.p_vkGetDeviceAccelerationStructureCompatibilityKHR(wine_device_from_handle(params->device)->device, params->pVersionInfo, params->pCompatibility); - return STATUS_SUCCESS; } @@ -13323,7 +13267,6 @@ static NTSTATUS thunk64_vkGetDeviceBufferMemoryRequirements(void *args) TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); wine_device_from_handle(params->device)->funcs.p_vkGetDeviceBufferMemoryRequirements(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); - return STATUS_SUCCESS; } @@ -13339,7 +13282,6 @@ static NTSTATUS thunk32_vkGetDeviceBufferMemoryRequirements(void *args) convert_VkDeviceBufferMemoryRequirements_win_to_host(params->pInfo, &pInfo_host); convert_VkMemoryRequirements2_win_to_host(params->pMemoryRequirements, &pMemoryRequirements_host); wine_device_from_handle(params->device)->funcs.p_vkGetDeviceBufferMemoryRequirements(wine_device_from_handle(params->device)->device, &pInfo_host, &pMemoryRequirements_host); - convert_VkMemoryRequirements2_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); free_VkDeviceBufferMemoryRequirements(&pInfo_host); return STATUS_SUCCESS; @@ -13355,7 +13297,6 @@ static NTSTATUS thunk64_vkGetDeviceBufferMemoryRequirementsKHR(void *args) TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); wine_device_from_handle(params->device)->funcs.p_vkGetDeviceBufferMemoryRequirementsKHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); - return STATUS_SUCCESS; } @@ -13371,7 +13312,6 @@ static NTSTATUS thunk32_vkGetDeviceBufferMemoryRequirementsKHR(void *args) convert_VkDeviceBufferMemoryRequirements_win_to_host(params->pInfo, &pInfo_host); convert_VkMemoryRequirements2_win_to_host(params->pMemoryRequirements, &pMemoryRequirements_host); wine_device_from_handle(params->device)->funcs.p_vkGetDeviceBufferMemoryRequirementsKHR(wine_device_from_handle(params->device)->device, &pInfo_host, &pMemoryRequirements_host); - convert_VkMemoryRequirements2_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); free_VkDeviceBufferMemoryRequirements(&pInfo_host); return STATUS_SUCCESS; @@ -13387,7 +13327,6 @@ static NTSTATUS thunk64_vkGetDeviceGroupPeerMemoryFeatures(void *args) TRACE("%p, %u, %u, %u, %p\n", params->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures); wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupPeerMemoryFeatures(wine_device_from_handle(params->device)->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures); - return STATUS_SUCCESS; } @@ -13399,7 +13338,6 @@ static NTSTATUS thunk32_vkGetDeviceGroupPeerMemoryFeatures(void *args) TRACE("%p, %u, %u, %u, %p\n", params->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures); wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupPeerMemoryFeatures(wine_device_from_handle(params->device)->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures); - return STATUS_SUCCESS; } @@ -13413,7 +13351,6 @@ static NTSTATUS thunk64_vkGetDeviceGroupPeerMemoryFeaturesKHR(void *args) TRACE("%p, %u, %u, %u, %p\n", params->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures); wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupPeerMemoryFeaturesKHR(wine_device_from_handle(params->device)->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures); - return STATUS_SUCCESS; } @@ -13425,7 +13362,6 @@ static NTSTATUS thunk32_vkGetDeviceGroupPeerMemoryFeaturesKHR(void *args) TRACE("%p, %u, %u, %u, %p\n", params->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures); wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupPeerMemoryFeaturesKHR(wine_device_from_handle(params->device)->device, params->heapIndex, params->localDeviceIndex, params->remoteDeviceIndex, params->pPeerMemoryFeatures); - return STATUS_SUCCESS; } @@ -13440,7 +13376,6 @@ static NTSTATUS thunk64_vkGetDeviceGroupPresentCapabilitiesKHR(void *args) TRACE("%p, %p\n", params->device, params->pDeviceGroupPresentCapabilities); result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupPresentCapabilitiesKHR(wine_device_from_handle(params->device)->device, params->pDeviceGroupPresentCapabilities); - return result; } @@ -13453,7 +13388,6 @@ static NTSTATUS thunk32_vkGetDeviceGroupPresentCapabilitiesKHR(void *args) TRACE("%p, %p\n", params->device, params->pDeviceGroupPresentCapabilities); result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupPresentCapabilitiesKHR(wine_device_from_handle(params->device)->device, params->pDeviceGroupPresentCapabilities); - return result; } @@ -13468,7 +13402,6 @@ static NTSTATUS thunk64_vkGetDeviceGroupSurfacePresentModesKHR(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->surface), params->pModes); result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupSurfacePresentModesKHR(wine_device_from_handle(params->device)->device, wine_surface_from_handle(params->surface)->driver_surface, params->pModes); - return result; } @@ -13481,7 +13414,6 @@ static NTSTATUS thunk32_vkGetDeviceGroupSurfacePresentModesKHR(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->surface), params->pModes); result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupSurfacePresentModesKHR(wine_device_from_handle(params->device)->device, wine_surface_from_handle(params->surface)->driver_surface, params->pModes); - return result; } @@ -13495,7 +13427,6 @@ static NTSTATUS thunk64_vkGetDeviceImageMemoryRequirements(void *args) TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); wine_device_from_handle(params->device)->funcs.p_vkGetDeviceImageMemoryRequirements(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); - return STATUS_SUCCESS; } @@ -13509,7 +13440,6 @@ static NTSTATUS thunk32_vkGetDeviceImageMemoryRequirements(void *args) convert_VkMemoryRequirements2_win_to_host(params->pMemoryRequirements, &pMemoryRequirements_host); wine_device_from_handle(params->device)->funcs.p_vkGetDeviceImageMemoryRequirements(wine_device_from_handle(params->device)->device, params->pInfo, &pMemoryRequirements_host); - convert_VkMemoryRequirements2_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); return STATUS_SUCCESS; } @@ -13524,7 +13454,6 @@ static NTSTATUS thunk64_vkGetDeviceImageMemoryRequirementsKHR(void *args) TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); wine_device_from_handle(params->device)->funcs.p_vkGetDeviceImageMemoryRequirementsKHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); - return STATUS_SUCCESS; } @@ -13538,7 +13467,6 @@ static NTSTATUS thunk32_vkGetDeviceImageMemoryRequirementsKHR(void *args) convert_VkMemoryRequirements2_win_to_host(params->pMemoryRequirements, &pMemoryRequirements_host); wine_device_from_handle(params->device)->funcs.p_vkGetDeviceImageMemoryRequirementsKHR(wine_device_from_handle(params->device)->device, params->pInfo, &pMemoryRequirements_host); - convert_VkMemoryRequirements2_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); return STATUS_SUCCESS; } @@ -13553,7 +13481,6 @@ static NTSTATUS thunk64_vkGetDeviceImageSparseMemoryRequirements(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); wine_device_from_handle(params->device)->funcs.p_vkGetDeviceImageSparseMemoryRequirements(wine_device_from_handle(params->device)->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); - return STATUS_SUCCESS; } @@ -13565,7 +13492,6 @@ static NTSTATUS thunk32_vkGetDeviceImageSparseMemoryRequirements(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); wine_device_from_handle(params->device)->funcs.p_vkGetDeviceImageSparseMemoryRequirements(wine_device_from_handle(params->device)->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); - return STATUS_SUCCESS; } @@ -13579,7 +13505,6 @@ static NTSTATUS thunk64_vkGetDeviceImageSparseMemoryRequirementsKHR(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); wine_device_from_handle(params->device)->funcs.p_vkGetDeviceImageSparseMemoryRequirementsKHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); - return STATUS_SUCCESS; } @@ -13591,7 +13516,6 @@ static NTSTATUS thunk32_vkGetDeviceImageSparseMemoryRequirementsKHR(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); wine_device_from_handle(params->device)->funcs.p_vkGetDeviceImageSparseMemoryRequirementsKHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); - return STATUS_SUCCESS; } @@ -13605,7 +13529,6 @@ static NTSTATUS thunk64_vkGetDeviceMemoryCommitment(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->memory), params->pCommittedMemoryInBytes); wine_device_from_handle(params->device)->funcs.p_vkGetDeviceMemoryCommitment(wine_device_from_handle(params->device)->device, params->memory, params->pCommittedMemoryInBytes); - return STATUS_SUCCESS; } @@ -13617,7 +13540,6 @@ static NTSTATUS thunk32_vkGetDeviceMemoryCommitment(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->memory), params->pCommittedMemoryInBytes); wine_device_from_handle(params->device)->funcs.p_vkGetDeviceMemoryCommitment(wine_device_from_handle(params->device)->device, params->memory, params->pCommittedMemoryInBytes); - return STATUS_SUCCESS; } @@ -13631,7 +13553,6 @@ static NTSTATUS thunk64_vkGetDeviceMemoryOpaqueCaptureAddress(void *args) TRACE("%p, %p\n", params->device, params->pInfo); params->result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceMemoryOpaqueCaptureAddress(wine_device_from_handle(params->device)->device, params->pInfo); - return STATUS_SUCCESS; } @@ -13645,7 +13566,6 @@ static NTSTATUS thunk32_vkGetDeviceMemoryOpaqueCaptureAddress(void *args) convert_VkDeviceMemoryOpaqueCaptureAddressInfo_win_to_host(params->pInfo, &pInfo_host); params->result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceMemoryOpaqueCaptureAddress(wine_device_from_handle(params->device)->device, &pInfo_host); - return STATUS_SUCCESS; } @@ -13659,7 +13579,6 @@ static NTSTATUS thunk64_vkGetDeviceMemoryOpaqueCaptureAddressKHR(void *args) TRACE("%p, %p\n", params->device, params->pInfo); params->result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceMemoryOpaqueCaptureAddressKHR(wine_device_from_handle(params->device)->device, params->pInfo); - return STATUS_SUCCESS; } @@ -13673,7 +13592,46 @@ static NTSTATUS thunk32_vkGetDeviceMemoryOpaqueCaptureAddressKHR(void *args) convert_VkDeviceMemoryOpaqueCaptureAddressInfo_win_to_host(params->pInfo, &pInfo_host); params->result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceMemoryOpaqueCaptureAddressKHR(wine_device_from_handle(params->device)->device, &pInfo_host); + return STATUS_SUCCESS; +} +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDeviceQueue(void *args) +{ + struct vkGetDeviceQueue_params *params = args; + wine_vkGetDeviceQueue(params->device, params->queueFamilyIndex, params->queueIndex, params->pQueue); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDeviceQueue(void *args) +{ + struct vkGetDeviceQueue_params *params = args; + wine_vkGetDeviceQueue(params->device, params->queueFamilyIndex, params->queueIndex, params->pQueue); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetDeviceQueue2(void *args) +{ + struct vkGetDeviceQueue2_params *params = args; + wine_vkGetDeviceQueue2(params->device, params->pQueueInfo, params->pQueue); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetDeviceQueue2(void *args) +{ + struct vkGetDeviceQueue2_params *params = args; + wine_vkGetDeviceQueue2(params->device, params->pQueueInfo, params->pQueue); return STATUS_SUCCESS; } @@ -13688,7 +13646,6 @@ static NTSTATUS thunk64_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(void *ar TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->renderpass), params->pMaxWorkgroupSize); result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(wine_device_from_handle(params->device)->device, params->renderpass, params->pMaxWorkgroupSize); - return result; } @@ -13701,7 +13658,6 @@ static NTSTATUS thunk32_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(void *ar TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->renderpass), params->pMaxWorkgroupSize); result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(wine_device_from_handle(params->device)->device, params->renderpass, params->pMaxWorkgroupSize); - return result; } @@ -13716,7 +13672,6 @@ static NTSTATUS thunk64_vkGetDynamicRenderingTilePropertiesQCOM(void *args) TRACE("%p, %p, %p\n", params->device, params->pRenderingInfo, params->pProperties); result = wine_device_from_handle(params->device)->funcs.p_vkGetDynamicRenderingTilePropertiesQCOM(wine_device_from_handle(params->device)->device, params->pRenderingInfo, params->pProperties); - return result; } @@ -13731,7 +13686,6 @@ static NTSTATUS thunk32_vkGetDynamicRenderingTilePropertiesQCOM(void *args) convert_VkRenderingInfo_win_to_host(params->pRenderingInfo, &pRenderingInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkGetDynamicRenderingTilePropertiesQCOM(wine_device_from_handle(params->device)->device, &pRenderingInfo_host, params->pProperties); - free_VkRenderingInfo(&pRenderingInfo_host); return result; } @@ -13747,7 +13701,6 @@ static NTSTATUS thunk64_vkGetEventStatus(void *args) TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->event)); result = wine_device_from_handle(params->device)->funcs.p_vkGetEventStatus(wine_device_from_handle(params->device)->device, params->event); - return result; } @@ -13760,7 +13713,6 @@ static NTSTATUS thunk32_vkGetEventStatus(void *args) TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->event)); result = wine_device_from_handle(params->device)->funcs.p_vkGetEventStatus(wine_device_from_handle(params->device)->device, params->event); - return result; } @@ -13775,7 +13727,6 @@ static NTSTATUS thunk64_vkGetFenceStatus(void *args) TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->fence)); result = wine_device_from_handle(params->device)->funcs.p_vkGetFenceStatus(wine_device_from_handle(params->device)->device, params->fence); - return result; } @@ -13788,7 +13739,6 @@ static NTSTATUS thunk32_vkGetFenceStatus(void *args) TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->fence)); result = wine_device_from_handle(params->device)->funcs.p_vkGetFenceStatus(wine_device_from_handle(params->device)->device, params->fence); - return result; } @@ -13803,7 +13753,6 @@ static NTSTATUS thunk64_vkGetFramebufferTilePropertiesQCOM(void *args) TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->framebuffer), params->pPropertiesCount, params->pProperties); result = wine_device_from_handle(params->device)->funcs.p_vkGetFramebufferTilePropertiesQCOM(wine_device_from_handle(params->device)->device, params->framebuffer, params->pPropertiesCount, params->pProperties); - return result; } @@ -13816,7 +13765,6 @@ static NTSTATUS thunk32_vkGetFramebufferTilePropertiesQCOM(void *args) TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->framebuffer), params->pPropertiesCount, params->pProperties); result = wine_device_from_handle(params->device)->funcs.p_vkGetFramebufferTilePropertiesQCOM(wine_device_from_handle(params->device)->device, params->framebuffer, params->pPropertiesCount, params->pProperties); - return result; } @@ -13830,7 +13778,6 @@ static NTSTATUS thunk64_vkGetGeneratedCommandsMemoryRequirementsNV(void *args) TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); wine_device_from_handle(params->device)->funcs.p_vkGetGeneratedCommandsMemoryRequirementsNV(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); - return STATUS_SUCCESS; } @@ -13846,7 +13793,6 @@ static NTSTATUS thunk32_vkGetGeneratedCommandsMemoryRequirementsNV(void *args) convert_VkGeneratedCommandsMemoryRequirementsInfoNV_win_to_host(params->pInfo, &pInfo_host); convert_VkMemoryRequirements2_win_to_host(params->pMemoryRequirements, &pMemoryRequirements_host); wine_device_from_handle(params->device)->funcs.p_vkGetGeneratedCommandsMemoryRequirementsNV(wine_device_from_handle(params->device)->device, &pInfo_host, &pMemoryRequirements_host); - convert_VkMemoryRequirements2_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); return STATUS_SUCCESS; } @@ -13861,7 +13807,6 @@ static NTSTATUS thunk64_vkGetImageMemoryRequirements(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pMemoryRequirements); wine_device_from_handle(params->device)->funcs.p_vkGetImageMemoryRequirements(wine_device_from_handle(params->device)->device, params->image, params->pMemoryRequirements); - return STATUS_SUCCESS; } @@ -13874,7 +13819,6 @@ static NTSTATUS thunk32_vkGetImageMemoryRequirements(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pMemoryRequirements); wine_device_from_handle(params->device)->funcs.p_vkGetImageMemoryRequirements(wine_device_from_handle(params->device)->device, params->image, &pMemoryRequirements_host); - convert_VkMemoryRequirements_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); return STATUS_SUCCESS; } @@ -13889,7 +13833,6 @@ static NTSTATUS thunk64_vkGetImageMemoryRequirements2(void *args) TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); wine_device_from_handle(params->device)->funcs.p_vkGetImageMemoryRequirements2(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); - return STATUS_SUCCESS; } @@ -13905,7 +13848,6 @@ static NTSTATUS thunk32_vkGetImageMemoryRequirements2(void *args) convert_VkImageMemoryRequirementsInfo2_win_to_host(params->pInfo, &pInfo_host); convert_VkMemoryRequirements2_win_to_host(params->pMemoryRequirements, &pMemoryRequirements_host); wine_device_from_handle(params->device)->funcs.p_vkGetImageMemoryRequirements2(wine_device_from_handle(params->device)->device, &pInfo_host, &pMemoryRequirements_host); - convert_VkMemoryRequirements2_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); return STATUS_SUCCESS; } @@ -13920,7 +13862,6 @@ static NTSTATUS thunk64_vkGetImageMemoryRequirements2KHR(void *args) TRACE("%p, %p, %p\n", params->device, params->pInfo, params->pMemoryRequirements); wine_device_from_handle(params->device)->funcs.p_vkGetImageMemoryRequirements2KHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pMemoryRequirements); - return STATUS_SUCCESS; } @@ -13936,7 +13877,6 @@ static NTSTATUS thunk32_vkGetImageMemoryRequirements2KHR(void *args) convert_VkImageMemoryRequirementsInfo2_win_to_host(params->pInfo, &pInfo_host); convert_VkMemoryRequirements2_win_to_host(params->pMemoryRequirements, &pMemoryRequirements_host); wine_device_from_handle(params->device)->funcs.p_vkGetImageMemoryRequirements2KHR(wine_device_from_handle(params->device)->device, &pInfo_host, &pMemoryRequirements_host); - convert_VkMemoryRequirements2_host_to_win(&pMemoryRequirements_host, params->pMemoryRequirements); return STATUS_SUCCESS; } @@ -13951,7 +13891,6 @@ static NTSTATUS thunk64_vkGetImageSparseMemoryRequirements(void *args) TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); wine_device_from_handle(params->device)->funcs.p_vkGetImageSparseMemoryRequirements(wine_device_from_handle(params->device)->device, params->image, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); - return STATUS_SUCCESS; } @@ -13963,7 +13902,6 @@ static NTSTATUS thunk32_vkGetImageSparseMemoryRequirements(void *args) TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); wine_device_from_handle(params->device)->funcs.p_vkGetImageSparseMemoryRequirements(wine_device_from_handle(params->device)->device, params->image, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); - return STATUS_SUCCESS; } @@ -13977,7 +13915,6 @@ static NTSTATUS thunk64_vkGetImageSparseMemoryRequirements2(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); wine_device_from_handle(params->device)->funcs.p_vkGetImageSparseMemoryRequirements2(wine_device_from_handle(params->device)->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); - return STATUS_SUCCESS; } @@ -13991,7 +13928,6 @@ static NTSTATUS thunk32_vkGetImageSparseMemoryRequirements2(void *args) convert_VkImageSparseMemoryRequirementsInfo2_win_to_host(params->pInfo, &pInfo_host); wine_device_from_handle(params->device)->funcs.p_vkGetImageSparseMemoryRequirements2(wine_device_from_handle(params->device)->device, &pInfo_host, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); - return STATUS_SUCCESS; } @@ -14005,7 +13941,6 @@ static NTSTATUS thunk64_vkGetImageSparseMemoryRequirements2KHR(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); wine_device_from_handle(params->device)->funcs.p_vkGetImageSparseMemoryRequirements2KHR(wine_device_from_handle(params->device)->device, params->pInfo, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); - return STATUS_SUCCESS; } @@ -14019,7 +13954,6 @@ static NTSTATUS thunk32_vkGetImageSparseMemoryRequirements2KHR(void *args) convert_VkImageSparseMemoryRequirementsInfo2_win_to_host(params->pInfo, &pInfo_host); wine_device_from_handle(params->device)->funcs.p_vkGetImageSparseMemoryRequirements2KHR(wine_device_from_handle(params->device)->device, &pInfo_host, params->pSparseMemoryRequirementCount, params->pSparseMemoryRequirements); - return STATUS_SUCCESS; } @@ -14033,7 +13967,6 @@ static NTSTATUS thunk64_vkGetImageSubresourceLayout(void *args) TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pSubresource, params->pLayout); wine_device_from_handle(params->device)->funcs.p_vkGetImageSubresourceLayout(wine_device_from_handle(params->device)->device, params->image, params->pSubresource, params->pLayout); - return STATUS_SUCCESS; } @@ -14046,7 +13979,6 @@ static NTSTATUS thunk32_vkGetImageSubresourceLayout(void *args) TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pSubresource, params->pLayout); wine_device_from_handle(params->device)->funcs.p_vkGetImageSubresourceLayout(wine_device_from_handle(params->device)->device, params->image, params->pSubresource, &pLayout_host); - convert_VkSubresourceLayout_host_to_win(&pLayout_host, params->pLayout); return STATUS_SUCCESS; } @@ -14061,7 +13993,6 @@ static NTSTATUS thunk64_vkGetImageSubresourceLayout2EXT(void *args) TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->image), params->pSubresource, params->pLayout); wine_device_from_handle(params->device)->funcs.p_vkGetImageSubresourceLayout2EXT(wine_device_from_handle(params->device)->device, params->image, params->pSubresource, params->pLayout); - return STATUS_SUCCESS; } @@ -14075,7 +14006,6 @@ static NTSTATUS thunk32_vkGetImageSubresourceLayout2EXT(void *args) convert_VkSubresourceLayout2EXT_win_to_host(params->pLayout, &pLayout_host); wine_device_from_handle(params->device)->funcs.p_vkGetImageSubresourceLayout2EXT(wine_device_from_handle(params->device)->device, params->image, params->pSubresource, &pLayout_host); - convert_VkSubresourceLayout2EXT_host_to_win(&pLayout_host, params->pLayout); return STATUS_SUCCESS; } @@ -14091,7 +14021,6 @@ static NTSTATUS thunk64_vkGetImageViewAddressNVX(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->imageView), params->pProperties); result = wine_device_from_handle(params->device)->funcs.p_vkGetImageViewAddressNVX(wine_device_from_handle(params->device)->device, params->imageView, params->pProperties); - return result; } @@ -14106,7 +14035,6 @@ static NTSTATUS thunk32_vkGetImageViewAddressNVX(void *args) convert_VkImageViewAddressPropertiesNVX_win_to_host(params->pProperties, &pProperties_host); result = wine_device_from_handle(params->device)->funcs.p_vkGetImageViewAddressNVX(wine_device_from_handle(params->device)->device, params->imageView, &pProperties_host); - convert_VkImageViewAddressPropertiesNVX_host_to_win(&pProperties_host, params->pProperties); return result; } @@ -14122,7 +14050,6 @@ static NTSTATUS thunk64_vkGetImageViewHandleNVX(void *args) TRACE("%p, %p\n", params->device, params->pInfo); result = wine_device_from_handle(params->device)->funcs.p_vkGetImageViewHandleNVX(wine_device_from_handle(params->device)->device, params->pInfo); - return result; } @@ -14137,7 +14064,6 @@ static NTSTATUS thunk32_vkGetImageViewHandleNVX(void *args) convert_VkImageViewHandleInfoNVX_win_to_host(params->pInfo, &pInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkGetImageViewHandleNVX(wine_device_from_handle(params->device)->device, &pInfo_host); - return result; } @@ -14152,7 +14078,6 @@ static NTSTATUS thunk64_vkGetMemoryHostPointerPropertiesEXT(void *args) TRACE("%p, %#x, %p, %p\n", params->device, params->handleType, params->pHostPointer, params->pMemoryHostPointerProperties); result = wine_device_from_handle(params->device)->funcs.p_vkGetMemoryHostPointerPropertiesEXT(wine_device_from_handle(params->device)->device, params->handleType, params->pHostPointer, params->pMemoryHostPointerProperties); - return result; } @@ -14165,7 +14090,6 @@ static NTSTATUS thunk32_vkGetMemoryHostPointerPropertiesEXT(void *args) TRACE("%p, %#x, %p, %p\n", params->device, params->handleType, params->pHostPointer, params->pMemoryHostPointerProperties); result = wine_device_from_handle(params->device)->funcs.p_vkGetMemoryHostPointerPropertiesEXT(wine_device_from_handle(params->device)->device, params->handleType, params->pHostPointer, params->pMemoryHostPointerProperties); - return result; } @@ -14180,7 +14104,6 @@ static NTSTATUS thunk64_vkGetPerformanceParameterINTEL(void *args) TRACE("%p, %#x, %p\n", params->device, params->parameter, params->pValue); result = wine_device_from_handle(params->device)->funcs.p_vkGetPerformanceParameterINTEL(wine_device_from_handle(params->device)->device, params->parameter, params->pValue); - return result; } @@ -14192,37 +14115,176 @@ static NTSTATUS thunk32_vkGetPerformanceParameterINTEL(void *args) VkResult result; TRACE("%p, %#x, %p\n", params->device, params->parameter, params->pValue); - result = wine_device_from_handle(params->device)->funcs.p_vkGetPerformanceParameterINTEL(wine_device_from_handle(params->device)->device, params->parameter, params->pValue); + result = wine_device_from_handle(params->device)->funcs.p_vkGetPerformanceParameterINTEL(wine_device_from_handle(params->device)->device, params->parameter, params->pValue); + return result; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(void *args) +{ + struct vkGetPhysicalDeviceCalibrateableTimeDomainsEXT_params *params = args; + VkResult result; + result = wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(params->physicalDevice, params->pTimeDomainCount, params->pTimeDomains); + return result; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(void *args) +{ + struct vkGetPhysicalDeviceCalibrateableTimeDomainsEXT_params *params = args; + VkResult result; + result = wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(params->physicalDevice, params->pTimeDomainCount, params->pTimeDomains); + return result; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(void *args) +{ + struct vkGetPhysicalDeviceCooperativeMatrixPropertiesNV_params *params = args; + VkResult result; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pPropertyCount, params->pProperties); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pPropertyCount, params->pProperties); + return result; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(void *args) +{ + struct vkGetPhysicalDeviceCooperativeMatrixPropertiesNV_params *params = args; + VkResult result; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pPropertyCount, params->pProperties); + + result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pPropertyCount, params->pProperties); + return result; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceExternalBufferProperties(void *args) +{ + struct vkGetPhysicalDeviceExternalBufferProperties_params *params = args; + wine_vkGetPhysicalDeviceExternalBufferProperties(params->physicalDevice, params->pExternalBufferInfo, params->pExternalBufferProperties); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceExternalBufferProperties(void *args) +{ + struct vkGetPhysicalDeviceExternalBufferProperties_params *params = args; + wine_vkGetPhysicalDeviceExternalBufferProperties(params->physicalDevice, params->pExternalBufferInfo, params->pExternalBufferProperties); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceExternalBufferPropertiesKHR(void *args) +{ + struct vkGetPhysicalDeviceExternalBufferPropertiesKHR_params *params = args; + wine_vkGetPhysicalDeviceExternalBufferPropertiesKHR(params->physicalDevice, params->pExternalBufferInfo, params->pExternalBufferProperties); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceExternalBufferPropertiesKHR(void *args) +{ + struct vkGetPhysicalDeviceExternalBufferPropertiesKHR_params *params = args; + wine_vkGetPhysicalDeviceExternalBufferPropertiesKHR(params->physicalDevice, params->pExternalBufferInfo, params->pExternalBufferProperties); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceExternalFenceProperties(void *args) +{ + struct vkGetPhysicalDeviceExternalFenceProperties_params *params = args; + wine_vkGetPhysicalDeviceExternalFenceProperties(params->physicalDevice, params->pExternalFenceInfo, params->pExternalFenceProperties); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceExternalFenceProperties(void *args) +{ + struct vkGetPhysicalDeviceExternalFenceProperties_params *params = args; + wine_vkGetPhysicalDeviceExternalFenceProperties(params->physicalDevice, params->pExternalFenceInfo, params->pExternalFenceProperties); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceExternalFencePropertiesKHR(void *args) +{ + struct vkGetPhysicalDeviceExternalFencePropertiesKHR_params *params = args; + wine_vkGetPhysicalDeviceExternalFencePropertiesKHR(params->physicalDevice, params->pExternalFenceInfo, params->pExternalFenceProperties); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ + +static NTSTATUS thunk32_vkGetPhysicalDeviceExternalFencePropertiesKHR(void *args) +{ + struct vkGetPhysicalDeviceExternalFencePropertiesKHR_params *params = args; + wine_vkGetPhysicalDeviceExternalFencePropertiesKHR(params->physicalDevice, params->pExternalFenceInfo, params->pExternalFenceProperties); + return STATUS_SUCCESS; +} + +#endif /* USE_STRUCT_CONVERSION */ + +#if !defined(USE_STRUCT_CONVERSION) + +static NTSTATUS thunk64_vkGetPhysicalDeviceExternalSemaphoreProperties(void *args) +{ + struct vkGetPhysicalDeviceExternalSemaphoreProperties_params *params = args; + wine_vkGetPhysicalDeviceExternalSemaphoreProperties(params->physicalDevice, params->pExternalSemaphoreInfo, params->pExternalSemaphoreProperties); + return STATUS_SUCCESS; +} + +#else /* USE_STRUCT_CONVERSION */ - return result; +static NTSTATUS thunk32_vkGetPhysicalDeviceExternalSemaphoreProperties(void *args) +{ + struct vkGetPhysicalDeviceExternalSemaphoreProperties_params *params = args; + wine_vkGetPhysicalDeviceExternalSemaphoreProperties(params->physicalDevice, params->pExternalSemaphoreInfo, params->pExternalSemaphoreProperties); + return STATUS_SUCCESS; } #endif /* USE_STRUCT_CONVERSION */ #if !defined(USE_STRUCT_CONVERSION) -static NTSTATUS thunk64_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(void *args) +static NTSTATUS thunk64_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(void *args) { - struct vkGetPhysicalDeviceCooperativeMatrixPropertiesNV_params *params = args; - VkResult result; - TRACE("%p, %p, %p\n", params->physicalDevice, params->pPropertyCount, params->pProperties); - - result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pPropertyCount, params->pProperties); - - return result; + struct vkGetPhysicalDeviceExternalSemaphorePropertiesKHR_params *params = args; + wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(params->physicalDevice, params->pExternalSemaphoreInfo, params->pExternalSemaphoreProperties); + return STATUS_SUCCESS; } #else /* USE_STRUCT_CONVERSION */ -static NTSTATUS thunk32_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(void *args) +static NTSTATUS thunk32_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(void *args) { - struct vkGetPhysicalDeviceCooperativeMatrixPropertiesNV_params *params = args; - VkResult result; - TRACE("%p, %p, %p\n", params->physicalDevice, params->pPropertyCount, params->pProperties); - - result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pPropertyCount, params->pProperties); - - return result; + struct vkGetPhysicalDeviceExternalSemaphorePropertiesKHR_params *params = args; + wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(params->physicalDevice, params->pExternalSemaphoreInfo, params->pExternalSemaphoreProperties); + return STATUS_SUCCESS; } #endif /* USE_STRUCT_CONVERSION */ @@ -14235,7 +14297,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceFeatures(void *args) TRACE("%p, %p\n", params->physicalDevice, params->pFeatures); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFeatures(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFeatures); - return STATUS_SUCCESS; } @@ -14247,7 +14308,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceFeatures(void *args) TRACE("%p, %p\n", params->physicalDevice, params->pFeatures); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFeatures(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFeatures); - return STATUS_SUCCESS; } @@ -14261,7 +14321,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceFeatures2(void *args) TRACE("%p, %p\n", params->physicalDevice, params->pFeatures); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFeatures2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFeatures); - return STATUS_SUCCESS; } @@ -14273,7 +14332,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceFeatures2(void *args) TRACE("%p, %p\n", params->physicalDevice, params->pFeatures); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFeatures2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFeatures); - return STATUS_SUCCESS; } @@ -14287,7 +14345,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceFeatures2KHR(void *args) TRACE("%p, %p\n", params->physicalDevice, params->pFeatures); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFeatures2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFeatures); - return STATUS_SUCCESS; } @@ -14299,7 +14356,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceFeatures2KHR(void *args) TRACE("%p, %p\n", params->physicalDevice, params->pFeatures); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFeatures2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFeatures); - return STATUS_SUCCESS; } @@ -14313,7 +14369,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceFormatProperties(void *args) TRACE("%p, %#x, %p\n", params->physicalDevice, params->format, params->pFormatProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFormatProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->pFormatProperties); - return STATUS_SUCCESS; } @@ -14325,7 +14380,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceFormatProperties(void *args) TRACE("%p, %#x, %p\n", params->physicalDevice, params->format, params->pFormatProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFormatProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->pFormatProperties); - return STATUS_SUCCESS; } @@ -14339,7 +14393,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceFormatProperties2(void *args) TRACE("%p, %#x, %p\n", params->physicalDevice, params->format, params->pFormatProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFormatProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->pFormatProperties); - return STATUS_SUCCESS; } @@ -14351,7 +14404,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceFormatProperties2(void *args) TRACE("%p, %#x, %p\n", params->physicalDevice, params->format, params->pFormatProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFormatProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->pFormatProperties); - return STATUS_SUCCESS; } @@ -14365,7 +14417,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceFormatProperties2KHR(void *args) TRACE("%p, %#x, %p\n", params->physicalDevice, params->format, params->pFormatProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFormatProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->pFormatProperties); - return STATUS_SUCCESS; } @@ -14377,7 +14428,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceFormatProperties2KHR(void *args) TRACE("%p, %#x, %p\n", params->physicalDevice, params->format, params->pFormatProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFormatProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->pFormatProperties); - return STATUS_SUCCESS; } @@ -14392,7 +14442,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceFragmentShadingRatesKHR(void *args) TRACE("%p, %p, %p\n", params->physicalDevice, params->pFragmentShadingRateCount, params->pFragmentShadingRates); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFragmentShadingRatesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFragmentShadingRateCount, params->pFragmentShadingRates); - return result; } @@ -14405,7 +14454,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceFragmentShadingRatesKHR(void *args) TRACE("%p, %p, %p\n", params->physicalDevice, params->pFragmentShadingRateCount, params->pFragmentShadingRates); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceFragmentShadingRatesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFragmentShadingRateCount, params->pFragmentShadingRates); - return result; } @@ -14420,7 +14468,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceImageFormatProperties(void *args) TRACE("%p, %#x, %#x, %#x, %#x, %#x, %p\n", params->physicalDevice, params->format, params->type, params->tiling, params->usage, params->flags, params->pImageFormatProperties); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceImageFormatProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->type, params->tiling, params->usage, params->flags, params->pImageFormatProperties); - return result; } @@ -14434,7 +14481,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceImageFormatProperties(void *args) TRACE("%p, %#x, %#x, %#x, %#x, %#x, %p\n", params->physicalDevice, params->format, params->type, params->tiling, params->usage, params->flags, params->pImageFormatProperties); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceImageFormatProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->type, params->tiling, params->usage, params->flags, &pImageFormatProperties_host); - convert_VkImageFormatProperties_host_to_win(&pImageFormatProperties_host, params->pImageFormatProperties); return result; } @@ -14447,7 +14493,14 @@ VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physic { VkResult result; result = wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceImageFormatProperties2(wine_phys_dev_from_handle(physicalDevice)->phys_dev, pImageFormatInfo, pImageFormatProperties); + return result; +} +static NTSTATUS thunk64_vkGetPhysicalDeviceImageFormatProperties2(void *args) +{ + struct vkGetPhysicalDeviceImageFormatProperties2_params *params = args; + VkResult result; + result = wine_vkGetPhysicalDeviceImageFormatProperties2(params->physicalDevice, params->pImageFormatInfo, params->pImageFormatProperties); return result; } @@ -14459,11 +14512,18 @@ VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physic VkImageFormatProperties2_host pImageFormatProperties_host; convert_VkImageFormatProperties2_win_to_host(pImageFormatProperties, &pImageFormatProperties_host); result = wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceImageFormatProperties2(wine_phys_dev_from_handle(physicalDevice)->phys_dev, pImageFormatInfo, &pImageFormatProperties_host); - convert_VkImageFormatProperties2_host_to_win(&pImageFormatProperties_host, pImageFormatProperties); return result; } +static NTSTATUS thunk32_vkGetPhysicalDeviceImageFormatProperties2(void *args) +{ + struct vkGetPhysicalDeviceImageFormatProperties2_params *params = args; + VkResult result; + result = wine_vkGetPhysicalDeviceImageFormatProperties2(params->physicalDevice, params->pImageFormatInfo, params->pImageFormatProperties); + return result; +} + #endif /* USE_STRUCT_CONVERSION */ #if !defined(USE_STRUCT_CONVERSION) @@ -14472,7 +14532,14 @@ VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice phy { VkResult result; result = wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceImageFormatProperties2KHR(wine_phys_dev_from_handle(physicalDevice)->phys_dev, pImageFormatInfo, pImageFormatProperties); + return result; +} +static NTSTATUS thunk64_vkGetPhysicalDeviceImageFormatProperties2KHR(void *args) +{ + struct vkGetPhysicalDeviceImageFormatProperties2KHR_params *params = args; + VkResult result; + result = wine_vkGetPhysicalDeviceImageFormatProperties2KHR(params->physicalDevice, params->pImageFormatInfo, params->pImageFormatProperties); return result; } @@ -14484,11 +14551,18 @@ VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice phy VkImageFormatProperties2_host pImageFormatProperties_host; convert_VkImageFormatProperties2_win_to_host(pImageFormatProperties, &pImageFormatProperties_host); result = wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceImageFormatProperties2KHR(wine_phys_dev_from_handle(physicalDevice)->phys_dev, pImageFormatInfo, &pImageFormatProperties_host); - convert_VkImageFormatProperties2_host_to_win(&pImageFormatProperties_host, pImageFormatProperties); return result; } +static NTSTATUS thunk32_vkGetPhysicalDeviceImageFormatProperties2KHR(void *args) +{ + struct vkGetPhysicalDeviceImageFormatProperties2KHR_params *params = args; + VkResult result; + result = wine_vkGetPhysicalDeviceImageFormatProperties2KHR(params->physicalDevice, params->pImageFormatInfo, params->pImageFormatProperties); + return result; +} + #endif /* USE_STRUCT_CONVERSION */ #if !defined(USE_STRUCT_CONVERSION) @@ -14499,7 +14573,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceMemoryProperties(void *args) TRACE("%p, %p\n", params->physicalDevice, params->pMemoryProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceMemoryProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pMemoryProperties); - return STATUS_SUCCESS; } @@ -14512,7 +14585,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceMemoryProperties(void *args) TRACE("%p, %p\n", params->physicalDevice, params->pMemoryProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceMemoryProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, &pMemoryProperties_host); - convert_VkPhysicalDeviceMemoryProperties_host_to_win(&pMemoryProperties_host, params->pMemoryProperties); return STATUS_SUCCESS; } @@ -14527,7 +14599,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceMemoryProperties2(void *args) TRACE("%p, %p\n", params->physicalDevice, params->pMemoryProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceMemoryProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pMemoryProperties); - return STATUS_SUCCESS; } @@ -14541,7 +14612,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceMemoryProperties2(void *args) convert_VkPhysicalDeviceMemoryProperties2_win_to_host(params->pMemoryProperties, &pMemoryProperties_host); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceMemoryProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, &pMemoryProperties_host); - convert_VkPhysicalDeviceMemoryProperties2_host_to_win(&pMemoryProperties_host, params->pMemoryProperties); return STATUS_SUCCESS; } @@ -14556,7 +14626,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceMemoryProperties2KHR(void *args) TRACE("%p, %p\n", params->physicalDevice, params->pMemoryProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceMemoryProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pMemoryProperties); - return STATUS_SUCCESS; } @@ -14570,7 +14639,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceMemoryProperties2KHR(void *args) convert_VkPhysicalDeviceMemoryProperties2_win_to_host(params->pMemoryProperties, &pMemoryProperties_host); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceMemoryProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, &pMemoryProperties_host); - convert_VkPhysicalDeviceMemoryProperties2_host_to_win(&pMemoryProperties_host, params->pMemoryProperties); return STATUS_SUCCESS; } @@ -14585,7 +14653,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceMultisamplePropertiesEXT(void *args) TRACE("%p, %#x, %p\n", params->physicalDevice, params->samples, params->pMultisampleProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceMultisamplePropertiesEXT(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->samples, params->pMultisampleProperties); - return STATUS_SUCCESS; } @@ -14597,7 +14664,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceMultisamplePropertiesEXT(void *args) TRACE("%p, %#x, %p\n", params->physicalDevice, params->samples, params->pMultisampleProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceMultisamplePropertiesEXT(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->samples, params->pMultisampleProperties); - return STATUS_SUCCESS; } @@ -14612,7 +14678,6 @@ static NTSTATUS thunk64_vkGetPhysicalDevicePresentRectanglesKHR(void *args) TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pRectCount, params->pRects); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDevicePresentRectanglesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pRectCount, params->pRects); - return result; } @@ -14625,7 +14690,6 @@ static NTSTATUS thunk32_vkGetPhysicalDevicePresentRectanglesKHR(void *args) TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pRectCount, params->pRects); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDevicePresentRectanglesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pRectCount, params->pRects); - return result; } @@ -14639,7 +14703,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceProperties(void *args) TRACE("%p, %p\n", params->physicalDevice, params->pProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pProperties); - return STATUS_SUCCESS; } @@ -14652,7 +14715,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceProperties(void *args) TRACE("%p, %p\n", params->physicalDevice, params->pProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, &pProperties_host); - convert_VkPhysicalDeviceProperties_host_to_win(&pProperties_host, params->pProperties); return STATUS_SUCCESS; } @@ -14667,7 +14729,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceProperties2(void *args) TRACE("%p, %p\n", params->physicalDevice, params->pProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pProperties); - return STATUS_SUCCESS; } @@ -14681,7 +14742,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceProperties2(void *args) convert_VkPhysicalDeviceProperties2_win_to_host(params->pProperties, &pProperties_host); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, &pProperties_host); - convert_VkPhysicalDeviceProperties2_host_to_win(&pProperties_host, params->pProperties); return STATUS_SUCCESS; } @@ -14696,7 +14756,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceProperties2KHR(void *args) TRACE("%p, %p\n", params->physicalDevice, params->pProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pProperties); - return STATUS_SUCCESS; } @@ -14710,7 +14769,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceProperties2KHR(void *args) convert_VkPhysicalDeviceProperties2_win_to_host(params->pProperties, &pProperties_host); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, &pProperties_host); - convert_VkPhysicalDeviceProperties2_host_to_win(&pProperties_host, params->pProperties); return STATUS_SUCCESS; } @@ -14725,7 +14783,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR( TRACE("%p, %p, %p\n", params->physicalDevice, params->pPerformanceQueryCreateInfo, params->pNumPasses); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pPerformanceQueryCreateInfo, params->pNumPasses); - return STATUS_SUCCESS; } @@ -14737,7 +14794,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR( TRACE("%p, %p, %p\n", params->physicalDevice, params->pPerformanceQueryCreateInfo, params->pNumPasses); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pPerformanceQueryCreateInfo, params->pNumPasses); - return STATUS_SUCCESS; } @@ -14751,7 +14807,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceQueueFamilyProperties(void *args) TRACE("%p, %p, %p\n", params->physicalDevice, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); - return STATUS_SUCCESS; } @@ -14763,7 +14818,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceQueueFamilyProperties(void *args) TRACE("%p, %p, %p\n", params->physicalDevice, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); - return STATUS_SUCCESS; } @@ -14777,7 +14831,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceQueueFamilyProperties2(void *args) TRACE("%p, %p, %p\n", params->physicalDevice, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); - return STATUS_SUCCESS; } @@ -14789,7 +14842,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceQueueFamilyProperties2(void *args) TRACE("%p, %p, %p\n", params->physicalDevice, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); - return STATUS_SUCCESS; } @@ -14803,7 +14855,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceQueueFamilyProperties2KHR(void *args) TRACE("%p, %p, %p\n", params->physicalDevice, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); - return STATUS_SUCCESS; } @@ -14815,7 +14866,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceQueueFamilyProperties2KHR(void *args) TRACE("%p, %p, %p\n", params->physicalDevice, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pQueueFamilyPropertyCount, params->pQueueFamilyProperties); - return STATUS_SUCCESS; } @@ -14829,7 +14879,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSparseImageFormatProperties(void *arg TRACE("%p, %#x, %#x, %#x, %#x, %#x, %p, %p\n", params->physicalDevice, params->format, params->type, params->samples, params->usage, params->tiling, params->pPropertyCount, params->pProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSparseImageFormatProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->type, params->samples, params->usage, params->tiling, params->pPropertyCount, params->pProperties); - return STATUS_SUCCESS; } @@ -14841,7 +14890,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSparseImageFormatProperties(void *arg TRACE("%p, %#x, %#x, %#x, %#x, %#x, %p, %p\n", params->physicalDevice, params->format, params->type, params->samples, params->usage, params->tiling, params->pPropertyCount, params->pProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSparseImageFormatProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->format, params->type, params->samples, params->usage, params->tiling, params->pPropertyCount, params->pProperties); - return STATUS_SUCCESS; } @@ -14855,7 +14903,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSparseImageFormatProperties2(void *ar TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pFormatInfo, params->pPropertyCount, params->pProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSparseImageFormatProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFormatInfo, params->pPropertyCount, params->pProperties); - return STATUS_SUCCESS; } @@ -14867,7 +14914,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSparseImageFormatProperties2(void *ar TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pFormatInfo, params->pPropertyCount, params->pProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSparseImageFormatProperties2(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFormatInfo, params->pPropertyCount, params->pProperties); - return STATUS_SUCCESS; } @@ -14881,7 +14927,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSparseImageFormatProperties2KHR(void TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pFormatInfo, params->pPropertyCount, params->pProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSparseImageFormatProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFormatInfo, params->pPropertyCount, params->pProperties); - return STATUS_SUCCESS; } @@ -14893,7 +14938,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSparseImageFormatProperties2KHR(void TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pFormatInfo, params->pPropertyCount, params->pProperties); wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSparseImageFormatProperties2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pFormatInfo, params->pPropertyCount, params->pProperties); - return STATUS_SUCCESS; } @@ -14908,7 +14952,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombi TRACE("%p, %p, %p\n", params->physicalDevice, params->pCombinationCount, params->pCombinations); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pCombinationCount, params->pCombinations); - return result; } @@ -14921,7 +14964,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombi TRACE("%p, %p, %p\n", params->physicalDevice, params->pCombinationCount, params->pCombinations); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pCombinationCount, params->pCombinations); - return result; } @@ -14935,7 +14977,14 @@ VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physi VkPhysicalDeviceSurfaceInfo2KHR pSurfaceInfo_host; convert_VkPhysicalDeviceSurfaceInfo2KHR_win_to_host(pSurfaceInfo, &pSurfaceInfo_host); result = wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilities2KHR(wine_phys_dev_from_handle(physicalDevice)->phys_dev, &pSurfaceInfo_host, pSurfaceCapabilities); + return result; +} +static NTSTATUS thunk64_vkGetPhysicalDeviceSurfaceCapabilities2KHR(void *args) +{ + struct vkGetPhysicalDeviceSurfaceCapabilities2KHR_params *params = args; + VkResult result; + result = wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(params->physicalDevice, params->pSurfaceInfo, params->pSurfaceCapabilities); return result; } @@ -14947,7 +14996,14 @@ VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physi VkPhysicalDeviceSurfaceInfo2KHR_host pSurfaceInfo_host; convert_VkPhysicalDeviceSurfaceInfo2KHR_win_to_host(pSurfaceInfo, &pSurfaceInfo_host); result = wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilities2KHR(wine_phys_dev_from_handle(physicalDevice)->phys_dev, &pSurfaceInfo_host, pSurfaceCapabilities); + return result; +} +static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceCapabilities2KHR(void *args) +{ + struct vkGetPhysicalDeviceSurfaceCapabilities2KHR_params *params = args; + VkResult result; + result = wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(params->physicalDevice, params->pSurfaceInfo, params->pSurfaceCapabilities); return result; } @@ -14959,7 +15015,14 @@ VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physic { VkResult result; result = wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(wine_phys_dev_from_handle(physicalDevice)->phys_dev, wine_surface_from_handle(surface)->driver_surface, pSurfaceCapabilities); + return result; +} +static NTSTATUS thunk64_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(void *args) +{ + struct vkGetPhysicalDeviceSurfaceCapabilitiesKHR_params *params = args; + VkResult result; + result = wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(params->physicalDevice, params->surface, params->pSurfaceCapabilities); return result; } @@ -14969,7 +15032,14 @@ VkResult thunk_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physic { VkResult result; result = wine_phys_dev_from_handle(physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(wine_phys_dev_from_handle(physicalDevice)->phys_dev, wine_surface_from_handle(surface)->driver_surface, pSurfaceCapabilities); + return result; +} +static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(void *args) +{ + struct vkGetPhysicalDeviceSurfaceCapabilitiesKHR_params *params = args; + VkResult result; + result = wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(params->physicalDevice, params->surface, params->pSurfaceCapabilities); return result; } @@ -14986,7 +15056,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSurfaceFormats2KHR(void *args) convert_VkPhysicalDeviceSurfaceInfo2KHR_win_to_host(params->pSurfaceInfo, &pSurfaceInfo_host); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceFormats2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, &pSurfaceInfo_host, params->pSurfaceFormatCount, params->pSurfaceFormats); - return result; } @@ -15001,7 +15070,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceFormats2KHR(void *args) convert_VkPhysicalDeviceSurfaceInfo2KHR_win_to_host(params->pSurfaceInfo, &pSurfaceInfo_host); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceFormats2KHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, &pSurfaceInfo_host, params->pSurfaceFormatCount, params->pSurfaceFormats); - return result; } @@ -15016,7 +15084,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSurfaceFormatsKHR(void *args) TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pSurfaceFormatCount, params->pSurfaceFormats); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceFormatsKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pSurfaceFormatCount, params->pSurfaceFormats); - return result; } @@ -15029,7 +15096,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceFormatsKHR(void *args) TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pSurfaceFormatCount, params->pSurfaceFormats); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceFormatsKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pSurfaceFormatCount, params->pSurfaceFormats); - return result; } @@ -15044,7 +15110,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSurfacePresentModesKHR(void *args) TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pPresentModeCount, params->pPresentModes); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfacePresentModesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pPresentModeCount, params->pPresentModes); - return result; } @@ -15057,7 +15122,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSurfacePresentModesKHR(void *args) TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pPresentModeCount, params->pPresentModes); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfacePresentModesKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, wine_surface_from_handle(params->surface)->driver_surface, params->pPresentModeCount, params->pPresentModes); - return result; } @@ -15072,7 +15136,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSurfaceSupportKHR(void *args) TRACE("%p, %u, 0x%s, %p\n", params->physicalDevice, params->queueFamilyIndex, wine_dbgstr_longlong(params->surface), params->pSupported); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceSupportKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex, wine_surface_from_handle(params->surface)->driver_surface, params->pSupported); - return result; } @@ -15085,7 +15148,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceSupportKHR(void *args) TRACE("%p, %u, 0x%s, %p\n", params->physicalDevice, params->queueFamilyIndex, wine_dbgstr_longlong(params->surface), params->pSupported); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceSupportKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex, wine_surface_from_handle(params->surface)->driver_surface, params->pSupported); - return result; } @@ -15100,7 +15162,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceToolProperties(void *args) TRACE("%p, %p, %p\n", params->physicalDevice, params->pToolCount, params->pToolProperties); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceToolProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pToolCount, params->pToolProperties); - return result; } @@ -15113,7 +15174,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceToolProperties(void *args) TRACE("%p, %p, %p\n", params->physicalDevice, params->pToolCount, params->pToolProperties); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceToolProperties(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pToolCount, params->pToolProperties); - return result; } @@ -15128,7 +15188,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceToolPropertiesEXT(void *args) TRACE("%p, %p, %p\n", params->physicalDevice, params->pToolCount, params->pToolProperties); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceToolPropertiesEXT(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pToolCount, params->pToolProperties); - return result; } @@ -15141,7 +15200,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceToolPropertiesEXT(void *args) TRACE("%p, %p, %p\n", params->physicalDevice, params->pToolCount, params->pToolProperties); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceToolPropertiesEXT(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->pToolCount, params->pToolProperties); - return result; } @@ -15156,7 +15214,6 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceWin32PresentationSupportKHR(void *arg TRACE("%p, %u\n", params->physicalDevice, params->queueFamilyIndex); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceWin32PresentationSupportKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex); - return result; } @@ -15169,7 +15226,6 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceWin32PresentationSupportKHR(void *arg TRACE("%p, %u\n", params->physicalDevice, params->queueFamilyIndex); result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceWin32PresentationSupportKHR(wine_phys_dev_from_handle(params->physicalDevice)->phys_dev, params->queueFamilyIndex); - return result; } @@ -15184,7 +15240,6 @@ static NTSTATUS thunk64_vkGetPipelineCacheData(void *args) TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->pDataSize, params->pData); result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelineCacheData(wine_device_from_handle(params->device)->device, params->pipelineCache, params->pDataSize, params->pData); - return result; } @@ -15197,7 +15252,6 @@ static NTSTATUS thunk32_vkGetPipelineCacheData(void *args) TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->pDataSize, params->pData); result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelineCacheData(wine_device_from_handle(params->device)->device, params->pipelineCache, params->pDataSize, params->pData); - return result; } @@ -15212,7 +15266,6 @@ static NTSTATUS thunk64_vkGetPipelineExecutableInternalRepresentationsKHR(void * TRACE("%p, %p, %p, %p\n", params->device, params->pExecutableInfo, params->pInternalRepresentationCount, params->pInternalRepresentations); result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelineExecutableInternalRepresentationsKHR(wine_device_from_handle(params->device)->device, params->pExecutableInfo, params->pInternalRepresentationCount, params->pInternalRepresentations); - return result; } @@ -15227,7 +15280,6 @@ static NTSTATUS thunk32_vkGetPipelineExecutableInternalRepresentationsKHR(void * convert_VkPipelineExecutableInfoKHR_win_to_host(params->pExecutableInfo, &pExecutableInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelineExecutableInternalRepresentationsKHR(wine_device_from_handle(params->device)->device, &pExecutableInfo_host, params->pInternalRepresentationCount, params->pInternalRepresentations); - return result; } @@ -15242,7 +15294,6 @@ static NTSTATUS thunk64_vkGetPipelineExecutablePropertiesKHR(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pPipelineInfo, params->pExecutableCount, params->pProperties); result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelineExecutablePropertiesKHR(wine_device_from_handle(params->device)->device, params->pPipelineInfo, params->pExecutableCount, params->pProperties); - return result; } @@ -15257,7 +15308,6 @@ static NTSTATUS thunk32_vkGetPipelineExecutablePropertiesKHR(void *args) convert_VkPipelineInfoKHR_win_to_host(params->pPipelineInfo, &pPipelineInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelineExecutablePropertiesKHR(wine_device_from_handle(params->device)->device, &pPipelineInfo_host, params->pExecutableCount, params->pProperties); - return result; } @@ -15272,7 +15322,6 @@ static NTSTATUS thunk64_vkGetPipelineExecutableStatisticsKHR(void *args) TRACE("%p, %p, %p, %p\n", params->device, params->pExecutableInfo, params->pStatisticCount, params->pStatistics); result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelineExecutableStatisticsKHR(wine_device_from_handle(params->device)->device, params->pExecutableInfo, params->pStatisticCount, params->pStatistics); - return result; } @@ -15287,7 +15336,6 @@ static NTSTATUS thunk32_vkGetPipelineExecutableStatisticsKHR(void *args) convert_VkPipelineExecutableInfoKHR_win_to_host(params->pExecutableInfo, &pExecutableInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelineExecutableStatisticsKHR(wine_device_from_handle(params->device)->device, &pExecutableInfo_host, params->pStatisticCount, params->pStatistics); - return result; } @@ -15302,7 +15350,6 @@ static NTSTATUS thunk64_vkGetPipelinePropertiesEXT(void *args) TRACE("%p, %p, %p\n", params->device, params->pPipelineInfo, params->pPipelineProperties); result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelinePropertiesEXT(wine_device_from_handle(params->device)->device, params->pPipelineInfo, params->pPipelineProperties); - return result; } @@ -15317,7 +15364,6 @@ static NTSTATUS thunk32_vkGetPipelinePropertiesEXT(void *args) convert_VkPipelineInfoEXT_win_to_host(params->pPipelineInfo, &pPipelineInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkGetPipelinePropertiesEXT(wine_device_from_handle(params->device)->device, &pPipelineInfo_host, params->pPipelineProperties); - return result; } @@ -15331,7 +15377,6 @@ static NTSTATUS thunk64_vkGetPrivateData(void *args) TRACE("%p, %#x, 0x%s, 0x%s, %p\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), params->pData); wine_device_from_handle(params->device)->funcs.p_vkGetPrivateData(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->pData); - return STATUS_SUCCESS; } @@ -15343,7 +15388,6 @@ static NTSTATUS thunk32_vkGetPrivateData(void *args) TRACE("%p, %#x, 0x%s, 0x%s, %p\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), params->pData); wine_device_from_handle(params->device)->funcs.p_vkGetPrivateData(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->pData); - return STATUS_SUCCESS; } @@ -15357,7 +15401,6 @@ static NTSTATUS thunk64_vkGetPrivateDataEXT(void *args) TRACE("%p, %#x, 0x%s, 0x%s, %p\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), params->pData); wine_device_from_handle(params->device)->funcs.p_vkGetPrivateDataEXT(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->pData); - return STATUS_SUCCESS; } @@ -15369,7 +15412,6 @@ static NTSTATUS thunk32_vkGetPrivateDataEXT(void *args) TRACE("%p, %#x, 0x%s, 0x%s, %p\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), params->pData); wine_device_from_handle(params->device)->funcs.p_vkGetPrivateDataEXT(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->pData); - return STATUS_SUCCESS; } @@ -15384,7 +15426,6 @@ static NTSTATUS thunk64_vkGetQueryPoolResults(void *args) TRACE("%p, 0x%s, %u, %u, 0x%s, %p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount, wine_dbgstr_longlong(params->dataSize), params->pData, wine_dbgstr_longlong(params->stride), params->flags); result = wine_device_from_handle(params->device)->funcs.p_vkGetQueryPoolResults(wine_device_from_handle(params->device)->device, params->queryPool, params->firstQuery, params->queryCount, params->dataSize, params->pData, params->stride, params->flags); - return result; } @@ -15397,7 +15438,6 @@ static NTSTATUS thunk32_vkGetQueryPoolResults(void *args) TRACE("%p, 0x%s, %u, %u, 0x%s, %p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount, wine_dbgstr_longlong(params->dataSize), params->pData, wine_dbgstr_longlong(params->stride), params->flags); result = wine_device_from_handle(params->device)->funcs.p_vkGetQueryPoolResults(wine_device_from_handle(params->device)->device, params->queryPool, params->firstQuery, params->queryCount, params->dataSize, params->pData, params->stride, params->flags); - return result; } @@ -15411,7 +15451,6 @@ static NTSTATUS thunk64_vkGetQueueCheckpointData2NV(void *args) TRACE("%p, %p, %p\n", params->queue, params->pCheckpointDataCount, params->pCheckpointData); wine_queue_from_handle(params->queue)->device->funcs.p_vkGetQueueCheckpointData2NV(wine_queue_from_handle(params->queue)->queue, params->pCheckpointDataCount, params->pCheckpointData); - return STATUS_SUCCESS; } @@ -15423,7 +15462,6 @@ static NTSTATUS thunk32_vkGetQueueCheckpointData2NV(void *args) TRACE("%p, %p, %p\n", params->queue, params->pCheckpointDataCount, params->pCheckpointData); wine_queue_from_handle(params->queue)->device->funcs.p_vkGetQueueCheckpointData2NV(wine_queue_from_handle(params->queue)->queue, params->pCheckpointDataCount, params->pCheckpointData); - return STATUS_SUCCESS; } @@ -15437,7 +15475,6 @@ static NTSTATUS thunk64_vkGetQueueCheckpointDataNV(void *args) TRACE("%p, %p, %p\n", params->queue, params->pCheckpointDataCount, params->pCheckpointData); wine_queue_from_handle(params->queue)->device->funcs.p_vkGetQueueCheckpointDataNV(wine_queue_from_handle(params->queue)->queue, params->pCheckpointDataCount, params->pCheckpointData); - return STATUS_SUCCESS; } @@ -15449,7 +15486,6 @@ static NTSTATUS thunk32_vkGetQueueCheckpointDataNV(void *args) TRACE("%p, %p, %p\n", params->queue, params->pCheckpointDataCount, params->pCheckpointData); wine_queue_from_handle(params->queue)->device->funcs.p_vkGetQueueCheckpointDataNV(wine_queue_from_handle(params->queue)->queue, params->pCheckpointDataCount, params->pCheckpointData); - return STATUS_SUCCESS; } @@ -15464,7 +15500,6 @@ static NTSTATUS thunk64_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(void * TRACE("%p, 0x%s, %u, %u, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->firstGroup, params->groupCount, wine_dbgstr_longlong(params->dataSize), params->pData); result = wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); - return result; } @@ -15477,7 +15512,6 @@ static NTSTATUS thunk32_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(void * TRACE("%p, 0x%s, %u, %u, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->firstGroup, params->groupCount, wine_dbgstr_longlong(params->dataSize), params->pData); result = wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); - return result; } @@ -15492,7 +15526,6 @@ static NTSTATUS thunk64_vkGetRayTracingShaderGroupHandlesKHR(void *args) TRACE("%p, 0x%s, %u, %u, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->firstGroup, params->groupCount, wine_dbgstr_longlong(params->dataSize), params->pData); result = wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupHandlesKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); - return result; } @@ -15505,7 +15538,6 @@ static NTSTATUS thunk32_vkGetRayTracingShaderGroupHandlesKHR(void *args) TRACE("%p, 0x%s, %u, %u, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->firstGroup, params->groupCount, wine_dbgstr_longlong(params->dataSize), params->pData); result = wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupHandlesKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); - return result; } @@ -15520,7 +15552,6 @@ static NTSTATUS thunk64_vkGetRayTracingShaderGroupHandlesNV(void *args) TRACE("%p, 0x%s, %u, %u, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->firstGroup, params->groupCount, wine_dbgstr_longlong(params->dataSize), params->pData); result = wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupHandlesNV(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); - return result; } @@ -15533,7 +15564,6 @@ static NTSTATUS thunk32_vkGetRayTracingShaderGroupHandlesNV(void *args) TRACE("%p, 0x%s, %u, %u, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->firstGroup, params->groupCount, wine_dbgstr_longlong(params->dataSize), params->pData); result = wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupHandlesNV(wine_device_from_handle(params->device)->device, params->pipeline, params->firstGroup, params->groupCount, params->dataSize, params->pData); - return result; } @@ -15548,7 +15578,6 @@ static NTSTATUS thunk64_vkGetRayTracingShaderGroupStackSizeKHR(void *args) TRACE("%p, 0x%s, %u, %#x\n", params->device, wine_dbgstr_longlong(params->pipeline), params->group, params->groupShader); result = wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupStackSizeKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->group, params->groupShader); - return result; } @@ -15561,7 +15590,6 @@ static NTSTATUS thunk32_vkGetRayTracingShaderGroupStackSizeKHR(void *args) TRACE("%p, 0x%s, %u, %#x\n", params->device, wine_dbgstr_longlong(params->pipeline), params->group, params->groupShader); result = wine_device_from_handle(params->device)->funcs.p_vkGetRayTracingShaderGroupStackSizeKHR(wine_device_from_handle(params->device)->device, params->pipeline, params->group, params->groupShader); - return result; } @@ -15575,7 +15603,6 @@ static NTSTATUS thunk64_vkGetRenderAreaGranularity(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->renderPass), params->pGranularity); wine_device_from_handle(params->device)->funcs.p_vkGetRenderAreaGranularity(wine_device_from_handle(params->device)->device, params->renderPass, params->pGranularity); - return STATUS_SUCCESS; } @@ -15587,7 +15614,6 @@ static NTSTATUS thunk32_vkGetRenderAreaGranularity(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->renderPass), params->pGranularity); wine_device_from_handle(params->device)->funcs.p_vkGetRenderAreaGranularity(wine_device_from_handle(params->device)->device, params->renderPass, params->pGranularity); - return STATUS_SUCCESS; } @@ -15602,7 +15628,6 @@ static NTSTATUS thunk64_vkGetSemaphoreCounterValue(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->semaphore), params->pValue); result = wine_device_from_handle(params->device)->funcs.p_vkGetSemaphoreCounterValue(wine_device_from_handle(params->device)->device, params->semaphore, params->pValue); - return result; } @@ -15615,7 +15640,6 @@ static NTSTATUS thunk32_vkGetSemaphoreCounterValue(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->semaphore), params->pValue); result = wine_device_from_handle(params->device)->funcs.p_vkGetSemaphoreCounterValue(wine_device_from_handle(params->device)->device, params->semaphore, params->pValue); - return result; } @@ -15630,7 +15654,6 @@ static NTSTATUS thunk64_vkGetSemaphoreCounterValueKHR(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->semaphore), params->pValue); result = wine_device_from_handle(params->device)->funcs.p_vkGetSemaphoreCounterValueKHR(wine_device_from_handle(params->device)->device, params->semaphore, params->pValue); - return result; } @@ -15643,7 +15666,6 @@ static NTSTATUS thunk32_vkGetSemaphoreCounterValueKHR(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->semaphore), params->pValue); result = wine_device_from_handle(params->device)->funcs.p_vkGetSemaphoreCounterValueKHR(wine_device_from_handle(params->device)->device, params->semaphore, params->pValue); - return result; } @@ -15658,7 +15680,6 @@ static NTSTATUS thunk64_vkGetShaderInfoAMD(void *args) TRACE("%p, 0x%s, %#x, %#x, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->shaderStage, params->infoType, params->pInfoSize, params->pInfo); result = wine_device_from_handle(params->device)->funcs.p_vkGetShaderInfoAMD(wine_device_from_handle(params->device)->device, params->pipeline, params->shaderStage, params->infoType, params->pInfoSize, params->pInfo); - return result; } @@ -15671,7 +15692,6 @@ static NTSTATUS thunk32_vkGetShaderInfoAMD(void *args) TRACE("%p, 0x%s, %#x, %#x, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipeline), params->shaderStage, params->infoType, params->pInfoSize, params->pInfo); result = wine_device_from_handle(params->device)->funcs.p_vkGetShaderInfoAMD(wine_device_from_handle(params->device)->device, params->pipeline, params->shaderStage, params->infoType, params->pInfoSize, params->pInfo); - return result; } @@ -15685,7 +15705,6 @@ static NTSTATUS thunk64_vkGetShaderModuleCreateInfoIdentifierEXT(void *args) TRACE("%p, %p, %p\n", params->device, params->pCreateInfo, params->pIdentifier); wine_device_from_handle(params->device)->funcs.p_vkGetShaderModuleCreateInfoIdentifierEXT(wine_device_from_handle(params->device)->device, params->pCreateInfo, params->pIdentifier); - return STATUS_SUCCESS; } @@ -15697,7 +15716,6 @@ static NTSTATUS thunk32_vkGetShaderModuleCreateInfoIdentifierEXT(void *args) TRACE("%p, %p, %p\n", params->device, params->pCreateInfo, params->pIdentifier); wine_device_from_handle(params->device)->funcs.p_vkGetShaderModuleCreateInfoIdentifierEXT(wine_device_from_handle(params->device)->device, params->pCreateInfo, params->pIdentifier); - return STATUS_SUCCESS; } @@ -15711,7 +15729,6 @@ static NTSTATUS thunk64_vkGetShaderModuleIdentifierEXT(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->shaderModule), params->pIdentifier); wine_device_from_handle(params->device)->funcs.p_vkGetShaderModuleIdentifierEXT(wine_device_from_handle(params->device)->device, params->shaderModule, params->pIdentifier); - return STATUS_SUCCESS; } @@ -15723,7 +15740,6 @@ static NTSTATUS thunk32_vkGetShaderModuleIdentifierEXT(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->shaderModule), params->pIdentifier); wine_device_from_handle(params->device)->funcs.p_vkGetShaderModuleIdentifierEXT(wine_device_from_handle(params->device)->device, params->shaderModule, params->pIdentifier); - return STATUS_SUCCESS; } @@ -15738,7 +15754,6 @@ static NTSTATUS thunk64_vkGetSwapchainImagesKHR(void *args) TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->swapchain), params->pSwapchainImageCount, params->pSwapchainImages); result = wine_device_from_handle(params->device)->funcs.p_vkGetSwapchainImagesKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->pSwapchainImageCount, params->pSwapchainImages); - return result; } @@ -15751,7 +15766,6 @@ static NTSTATUS thunk32_vkGetSwapchainImagesKHR(void *args) TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->swapchain), params->pSwapchainImageCount, params->pSwapchainImages); result = wine_device_from_handle(params->device)->funcs.p_vkGetSwapchainImagesKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->pSwapchainImageCount, params->pSwapchainImages); - return result; } @@ -15766,7 +15780,6 @@ static NTSTATUS thunk64_vkGetValidationCacheDataEXT(void *args) TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->validationCache), params->pDataSize, params->pData); result = wine_device_from_handle(params->device)->funcs.p_vkGetValidationCacheDataEXT(wine_device_from_handle(params->device)->device, params->validationCache, params->pDataSize, params->pData); - return result; } @@ -15779,7 +15792,6 @@ static NTSTATUS thunk32_vkGetValidationCacheDataEXT(void *args) TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->validationCache), params->pDataSize, params->pData); result = wine_device_from_handle(params->device)->funcs.p_vkGetValidationCacheDataEXT(wine_device_from_handle(params->device)->device, params->validationCache, params->pDataSize, params->pData); - return result; } @@ -15794,7 +15806,6 @@ static NTSTATUS thunk64_vkInitializePerformanceApiINTEL(void *args) TRACE("%p, %p\n", params->device, params->pInitializeInfo); result = wine_device_from_handle(params->device)->funcs.p_vkInitializePerformanceApiINTEL(wine_device_from_handle(params->device)->device, params->pInitializeInfo); - return result; } @@ -15807,7 +15818,6 @@ static NTSTATUS thunk32_vkInitializePerformanceApiINTEL(void *args) TRACE("%p, %p\n", params->device, params->pInitializeInfo); result = wine_device_from_handle(params->device)->funcs.p_vkInitializePerformanceApiINTEL(wine_device_from_handle(params->device)->device, params->pInitializeInfo); - return result; } @@ -15822,7 +15832,6 @@ static NTSTATUS thunk64_vkInvalidateMappedMemoryRanges(void *args) TRACE("%p, %u, %p\n", params->device, params->memoryRangeCount, params->pMemoryRanges); result = wine_device_from_handle(params->device)->funcs.p_vkInvalidateMappedMemoryRanges(wine_device_from_handle(params->device)->device, params->memoryRangeCount, params->pMemoryRanges); - return result; } @@ -15837,7 +15846,6 @@ static NTSTATUS thunk32_vkInvalidateMappedMemoryRanges(void *args) pMemoryRanges_host = convert_VkMappedMemoryRange_array_win_to_host(params->pMemoryRanges, params->memoryRangeCount); result = wine_device_from_handle(params->device)->funcs.p_vkInvalidateMappedMemoryRanges(wine_device_from_handle(params->device)->device, params->memoryRangeCount, pMemoryRanges_host); - free_VkMappedMemoryRange_array(pMemoryRanges_host, params->memoryRangeCount); return result; } @@ -15853,7 +15861,6 @@ static NTSTATUS thunk64_vkMapMemory(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, %#x, %p\n", params->device, wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->size), params->flags, params->ppData); result = wine_device_from_handle(params->device)->funcs.p_vkMapMemory(wine_device_from_handle(params->device)->device, params->memory, params->offset, params->size, params->flags, params->ppData); - return result; } @@ -15866,7 +15873,6 @@ static NTSTATUS thunk32_vkMapMemory(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s, %#x, %p\n", params->device, wine_dbgstr_longlong(params->memory), wine_dbgstr_longlong(params->offset), wine_dbgstr_longlong(params->size), params->flags, params->ppData); result = wine_device_from_handle(params->device)->funcs.p_vkMapMemory(wine_device_from_handle(params->device)->device, params->memory, params->offset, params->size, params->flags, params->ppData); - return result; } @@ -15881,7 +15887,6 @@ static NTSTATUS thunk64_vkMergePipelineCaches(void *args) TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->dstCache), params->srcCacheCount, params->pSrcCaches); result = wine_device_from_handle(params->device)->funcs.p_vkMergePipelineCaches(wine_device_from_handle(params->device)->device, params->dstCache, params->srcCacheCount, params->pSrcCaches); - return result; } @@ -15894,7 +15899,6 @@ static NTSTATUS thunk32_vkMergePipelineCaches(void *args) TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->dstCache), params->srcCacheCount, params->pSrcCaches); result = wine_device_from_handle(params->device)->funcs.p_vkMergePipelineCaches(wine_device_from_handle(params->device)->device, params->dstCache, params->srcCacheCount, params->pSrcCaches); - return result; } @@ -15909,7 +15913,6 @@ static NTSTATUS thunk64_vkMergeValidationCachesEXT(void *args) TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->dstCache), params->srcCacheCount, params->pSrcCaches); result = wine_device_from_handle(params->device)->funcs.p_vkMergeValidationCachesEXT(wine_device_from_handle(params->device)->device, params->dstCache, params->srcCacheCount, params->pSrcCaches); - return result; } @@ -15922,7 +15925,6 @@ static NTSTATUS thunk32_vkMergeValidationCachesEXT(void *args) TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->dstCache), params->srcCacheCount, params->pSrcCaches); result = wine_device_from_handle(params->device)->funcs.p_vkMergeValidationCachesEXT(wine_device_from_handle(params->device)->device, params->dstCache, params->srcCacheCount, params->pSrcCaches); - return result; } @@ -15936,7 +15938,6 @@ static NTSTATUS thunk64_vkQueueBeginDebugUtilsLabelEXT(void *args) TRACE("%p, %p\n", params->queue, params->pLabelInfo); wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueBeginDebugUtilsLabelEXT(wine_queue_from_handle(params->queue)->queue, params->pLabelInfo); - return STATUS_SUCCESS; } @@ -15948,7 +15949,6 @@ static NTSTATUS thunk32_vkQueueBeginDebugUtilsLabelEXT(void *args) TRACE("%p, %p\n", params->queue, params->pLabelInfo); wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueBeginDebugUtilsLabelEXT(wine_queue_from_handle(params->queue)->queue, params->pLabelInfo); - return STATUS_SUCCESS; } @@ -15963,7 +15963,6 @@ static NTSTATUS thunk64_vkQueueBindSparse(void *args) TRACE("%p, %u, %p, 0x%s\n", params->queue, params->bindInfoCount, params->pBindInfo, wine_dbgstr_longlong(params->fence)); result = wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueBindSparse(wine_queue_from_handle(params->queue)->queue, params->bindInfoCount, params->pBindInfo, params->fence); - return result; } @@ -15978,7 +15977,6 @@ static NTSTATUS thunk32_vkQueueBindSparse(void *args) pBindInfo_host = convert_VkBindSparseInfo_array_win_to_host(params->pBindInfo, params->bindInfoCount); result = wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueBindSparse(wine_queue_from_handle(params->queue)->queue, params->bindInfoCount, pBindInfo_host, params->fence); - free_VkBindSparseInfo_array(pBindInfo_host, params->bindInfoCount); return result; } @@ -15993,7 +15991,6 @@ static NTSTATUS thunk64_vkQueueEndDebugUtilsLabelEXT(void *args) TRACE("%p\n", params->queue); wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueEndDebugUtilsLabelEXT(wine_queue_from_handle(params->queue)->queue); - return STATUS_SUCCESS; } @@ -16005,7 +16002,6 @@ static NTSTATUS thunk32_vkQueueEndDebugUtilsLabelEXT(void *args) TRACE("%p\n", params->queue); wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueEndDebugUtilsLabelEXT(wine_queue_from_handle(params->queue)->queue); - return STATUS_SUCCESS; } @@ -16019,7 +16015,6 @@ static NTSTATUS thunk64_vkQueueInsertDebugUtilsLabelEXT(void *args) TRACE("%p, %p\n", params->queue, params->pLabelInfo); wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueInsertDebugUtilsLabelEXT(wine_queue_from_handle(params->queue)->queue, params->pLabelInfo); - return STATUS_SUCCESS; } @@ -16031,7 +16026,6 @@ static NTSTATUS thunk32_vkQueueInsertDebugUtilsLabelEXT(void *args) TRACE("%p, %p\n", params->queue, params->pLabelInfo); wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueInsertDebugUtilsLabelEXT(wine_queue_from_handle(params->queue)->queue, params->pLabelInfo); - return STATUS_SUCCESS; } @@ -16046,7 +16040,6 @@ static NTSTATUS thunk64_vkQueuePresentKHR(void *args) TRACE("%p, %p\n", params->queue, params->pPresentInfo); result = wine_queue_from_handle(params->queue)->device->funcs.p_vkQueuePresentKHR(wine_queue_from_handle(params->queue)->queue, params->pPresentInfo); - return result; } @@ -16059,7 +16052,6 @@ static NTSTATUS thunk32_vkQueuePresentKHR(void *args) TRACE("%p, %p\n", params->queue, params->pPresentInfo); result = wine_queue_from_handle(params->queue)->device->funcs.p_vkQueuePresentKHR(wine_queue_from_handle(params->queue)->queue, params->pPresentInfo); - return result; } @@ -16074,7 +16066,6 @@ static NTSTATUS thunk64_vkQueueSetPerformanceConfigurationINTEL(void *args) TRACE("%p, 0x%s\n", params->queue, wine_dbgstr_longlong(params->configuration)); result = wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueSetPerformanceConfigurationINTEL(wine_queue_from_handle(params->queue)->queue, params->configuration); - return result; } @@ -16087,7 +16078,6 @@ static NTSTATUS thunk32_vkQueueSetPerformanceConfigurationINTEL(void *args) TRACE("%p, 0x%s\n", params->queue, wine_dbgstr_longlong(params->configuration)); result = wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueSetPerformanceConfigurationINTEL(wine_queue_from_handle(params->queue)->queue, params->configuration); - return result; } @@ -16104,7 +16094,6 @@ static NTSTATUS thunk64_vkQueueSubmit(void *args) pSubmits_host = convert_VkSubmitInfo_array_win_to_host(params->pSubmits, params->submitCount); result = wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueSubmit(wine_queue_from_handle(params->queue)->queue, params->submitCount, pSubmits_host, params->fence); - free_VkSubmitInfo_array(pSubmits_host, params->submitCount); return result; } @@ -16120,7 +16109,6 @@ static NTSTATUS thunk32_vkQueueSubmit(void *args) pSubmits_host = convert_VkSubmitInfo_array_win_to_host(params->pSubmits, params->submitCount); result = wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueSubmit(wine_queue_from_handle(params->queue)->queue, params->submitCount, pSubmits_host, params->fence); - free_VkSubmitInfo_array(pSubmits_host, params->submitCount); return result; } @@ -16138,7 +16126,6 @@ static NTSTATUS thunk64_vkQueueSubmit2(void *args) pSubmits_host = convert_VkSubmitInfo2_array_win_to_host(params->pSubmits, params->submitCount); result = wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueSubmit2(wine_queue_from_handle(params->queue)->queue, params->submitCount, pSubmits_host, params->fence); - free_VkSubmitInfo2_array(pSubmits_host, params->submitCount); return result; } @@ -16154,7 +16141,6 @@ static NTSTATUS thunk32_vkQueueSubmit2(void *args) pSubmits_host = convert_VkSubmitInfo2_array_win_to_host(params->pSubmits, params->submitCount); result = wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueSubmit2(wine_queue_from_handle(params->queue)->queue, params->submitCount, pSubmits_host, params->fence); - free_VkSubmitInfo2_array(pSubmits_host, params->submitCount); return result; } @@ -16172,7 +16158,6 @@ static NTSTATUS thunk64_vkQueueSubmit2KHR(void *args) pSubmits_host = convert_VkSubmitInfo2_array_win_to_host(params->pSubmits, params->submitCount); result = wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueSubmit2KHR(wine_queue_from_handle(params->queue)->queue, params->submitCount, pSubmits_host, params->fence); - free_VkSubmitInfo2_array(pSubmits_host, params->submitCount); return result; } @@ -16188,7 +16173,6 @@ static NTSTATUS thunk32_vkQueueSubmit2KHR(void *args) pSubmits_host = convert_VkSubmitInfo2_array_win_to_host(params->pSubmits, params->submitCount); result = wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueSubmit2KHR(wine_queue_from_handle(params->queue)->queue, params->submitCount, pSubmits_host, params->fence); - free_VkSubmitInfo2_array(pSubmits_host, params->submitCount); return result; } @@ -16204,7 +16188,6 @@ static NTSTATUS thunk64_vkQueueWaitIdle(void *args) TRACE("%p\n", params->queue); result = wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueWaitIdle(wine_queue_from_handle(params->queue)->queue); - return result; } @@ -16217,7 +16200,6 @@ static NTSTATUS thunk32_vkQueueWaitIdle(void *args) TRACE("%p\n", params->queue); result = wine_queue_from_handle(params->queue)->device->funcs.p_vkQueueWaitIdle(wine_queue_from_handle(params->queue)->queue); - return result; } @@ -16232,7 +16214,6 @@ static NTSTATUS thunk64_vkReleasePerformanceConfigurationINTEL(void *args) TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->configuration)); result = wine_device_from_handle(params->device)->funcs.p_vkReleasePerformanceConfigurationINTEL(wine_device_from_handle(params->device)->device, params->configuration); - return result; } @@ -16245,7 +16226,6 @@ static NTSTATUS thunk32_vkReleasePerformanceConfigurationINTEL(void *args) TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->configuration)); result = wine_device_from_handle(params->device)->funcs.p_vkReleasePerformanceConfigurationINTEL(wine_device_from_handle(params->device)->device, params->configuration); - return result; } @@ -16259,7 +16239,6 @@ static NTSTATUS thunk64_vkReleaseProfilingLockKHR(void *args) TRACE("%p\n", params->device); wine_device_from_handle(params->device)->funcs.p_vkReleaseProfilingLockKHR(wine_device_from_handle(params->device)->device); - return STATUS_SUCCESS; } @@ -16271,7 +16250,6 @@ static NTSTATUS thunk32_vkReleaseProfilingLockKHR(void *args) TRACE("%p\n", params->device); wine_device_from_handle(params->device)->funcs.p_vkReleaseProfilingLockKHR(wine_device_from_handle(params->device)->device); - return STATUS_SUCCESS; } @@ -16286,7 +16264,6 @@ static NTSTATUS thunk64_vkResetCommandBuffer(void *args) TRACE("%p, %#x\n", params->commandBuffer, params->flags); result = wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkResetCommandBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->flags); - return result; } @@ -16299,7 +16276,6 @@ static NTSTATUS thunk32_vkResetCommandBuffer(void *args) TRACE("%p, %#x\n", params->commandBuffer, params->flags); result = wine_cmd_buffer_from_handle(params->commandBuffer)->device->funcs.p_vkResetCommandBuffer(wine_cmd_buffer_from_handle(params->commandBuffer)->command_buffer, params->flags); - return result; } @@ -16314,7 +16290,6 @@ static NTSTATUS thunk64_vkResetCommandPool(void *args) TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->commandPool), params->flags); result = wine_device_from_handle(params->device)->funcs.p_vkResetCommandPool(wine_device_from_handle(params->device)->device, wine_cmd_pool_from_handle(params->commandPool)->command_pool, params->flags); - return result; } @@ -16327,7 +16302,6 @@ static NTSTATUS thunk32_vkResetCommandPool(void *args) TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->commandPool), params->flags); result = wine_device_from_handle(params->device)->funcs.p_vkResetCommandPool(wine_device_from_handle(params->device)->device, wine_cmd_pool_from_handle(params->commandPool)->command_pool, params->flags); - return result; } @@ -16342,7 +16316,6 @@ static NTSTATUS thunk64_vkResetDescriptorPool(void *args) TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->descriptorPool), params->flags); result = wine_device_from_handle(params->device)->funcs.p_vkResetDescriptorPool(wine_device_from_handle(params->device)->device, params->descriptorPool, params->flags); - return result; } @@ -16355,7 +16328,6 @@ static NTSTATUS thunk32_vkResetDescriptorPool(void *args) TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->descriptorPool), params->flags); result = wine_device_from_handle(params->device)->funcs.p_vkResetDescriptorPool(wine_device_from_handle(params->device)->device, params->descriptorPool, params->flags); - return result; } @@ -16370,7 +16342,6 @@ static NTSTATUS thunk64_vkResetEvent(void *args) TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->event)); result = wine_device_from_handle(params->device)->funcs.p_vkResetEvent(wine_device_from_handle(params->device)->device, params->event); - return result; } @@ -16383,7 +16354,6 @@ static NTSTATUS thunk32_vkResetEvent(void *args) TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->event)); result = wine_device_from_handle(params->device)->funcs.p_vkResetEvent(wine_device_from_handle(params->device)->device, params->event); - return result; } @@ -16398,7 +16368,6 @@ static NTSTATUS thunk64_vkResetFences(void *args) TRACE("%p, %u, %p\n", params->device, params->fenceCount, params->pFences); result = wine_device_from_handle(params->device)->funcs.p_vkResetFences(wine_device_from_handle(params->device)->device, params->fenceCount, params->pFences); - return result; } @@ -16411,7 +16380,6 @@ static NTSTATUS thunk32_vkResetFences(void *args) TRACE("%p, %u, %p\n", params->device, params->fenceCount, params->pFences); result = wine_device_from_handle(params->device)->funcs.p_vkResetFences(wine_device_from_handle(params->device)->device, params->fenceCount, params->pFences); - return result; } @@ -16425,7 +16393,6 @@ static NTSTATUS thunk64_vkResetQueryPool(void *args) TRACE("%p, 0x%s, %u, %u\n", params->device, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount); wine_device_from_handle(params->device)->funcs.p_vkResetQueryPool(wine_device_from_handle(params->device)->device, params->queryPool, params->firstQuery, params->queryCount); - return STATUS_SUCCESS; } @@ -16437,7 +16404,6 @@ static NTSTATUS thunk32_vkResetQueryPool(void *args) TRACE("%p, 0x%s, %u, %u\n", params->device, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount); wine_device_from_handle(params->device)->funcs.p_vkResetQueryPool(wine_device_from_handle(params->device)->device, params->queryPool, params->firstQuery, params->queryCount); - return STATUS_SUCCESS; } @@ -16451,7 +16417,6 @@ static NTSTATUS thunk64_vkResetQueryPoolEXT(void *args) TRACE("%p, 0x%s, %u, %u\n", params->device, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount); wine_device_from_handle(params->device)->funcs.p_vkResetQueryPoolEXT(wine_device_from_handle(params->device)->device, params->queryPool, params->firstQuery, params->queryCount); - return STATUS_SUCCESS; } @@ -16463,7 +16428,6 @@ static NTSTATUS thunk32_vkResetQueryPoolEXT(void *args) TRACE("%p, 0x%s, %u, %u\n", params->device, wine_dbgstr_longlong(params->queryPool), params->firstQuery, params->queryCount); wine_device_from_handle(params->device)->funcs.p_vkResetQueryPoolEXT(wine_device_from_handle(params->device)->device, params->queryPool, params->firstQuery, params->queryCount); - return STATUS_SUCCESS; } @@ -16480,7 +16444,6 @@ static NTSTATUS thunk64_vkSetDebugUtilsObjectNameEXT(void *args) convert_VkDebugUtilsObjectNameInfoEXT_win_to_host(params->pNameInfo, &pNameInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkSetDebugUtilsObjectNameEXT(wine_device_from_handle(params->device)->device, &pNameInfo_host); - return result; } @@ -16495,7 +16458,6 @@ static NTSTATUS thunk32_vkSetDebugUtilsObjectNameEXT(void *args) convert_VkDebugUtilsObjectNameInfoEXT_win_to_host(params->pNameInfo, &pNameInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkSetDebugUtilsObjectNameEXT(wine_device_from_handle(params->device)->device, &pNameInfo_host); - return result; } @@ -16512,7 +16474,6 @@ static NTSTATUS thunk64_vkSetDebugUtilsObjectTagEXT(void *args) convert_VkDebugUtilsObjectTagInfoEXT_win_to_host(params->pTagInfo, &pTagInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkSetDebugUtilsObjectTagEXT(wine_device_from_handle(params->device)->device, &pTagInfo_host); - return result; } @@ -16527,7 +16488,6 @@ static NTSTATUS thunk32_vkSetDebugUtilsObjectTagEXT(void *args) convert_VkDebugUtilsObjectTagInfoEXT_win_to_host(params->pTagInfo, &pTagInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkSetDebugUtilsObjectTagEXT(wine_device_from_handle(params->device)->device, &pTagInfo_host); - return result; } @@ -16541,7 +16501,6 @@ static NTSTATUS thunk64_vkSetDeviceMemoryPriorityEXT(void *args) TRACE("%p, 0x%s, %f\n", params->device, wine_dbgstr_longlong(params->memory), params->priority); wine_device_from_handle(params->device)->funcs.p_vkSetDeviceMemoryPriorityEXT(wine_device_from_handle(params->device)->device, params->memory, params->priority); - return STATUS_SUCCESS; } @@ -16553,7 +16512,6 @@ static NTSTATUS thunk32_vkSetDeviceMemoryPriorityEXT(void *args) TRACE("%p, 0x%s, %f\n", params->device, wine_dbgstr_longlong(params->memory), params->priority); wine_device_from_handle(params->device)->funcs.p_vkSetDeviceMemoryPriorityEXT(wine_device_from_handle(params->device)->device, params->memory, params->priority); - return STATUS_SUCCESS; } @@ -16568,7 +16526,6 @@ static NTSTATUS thunk64_vkSetEvent(void *args) TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->event)); result = wine_device_from_handle(params->device)->funcs.p_vkSetEvent(wine_device_from_handle(params->device)->device, params->event); - return result; } @@ -16581,7 +16538,6 @@ static NTSTATUS thunk32_vkSetEvent(void *args) TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->event)); result = wine_device_from_handle(params->device)->funcs.p_vkSetEvent(wine_device_from_handle(params->device)->device, params->event); - return result; } @@ -16596,7 +16552,6 @@ static NTSTATUS thunk64_vkSetPrivateData(void *args) TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), wine_dbgstr_longlong(params->data)); result = wine_device_from_handle(params->device)->funcs.p_vkSetPrivateData(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->data); - return result; } @@ -16609,7 +16564,6 @@ static NTSTATUS thunk32_vkSetPrivateData(void *args) TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), wine_dbgstr_longlong(params->data)); result = wine_device_from_handle(params->device)->funcs.p_vkSetPrivateData(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->data); - return result; } @@ -16624,7 +16578,6 @@ static NTSTATUS thunk64_vkSetPrivateDataEXT(void *args) TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), wine_dbgstr_longlong(params->data)); result = wine_device_from_handle(params->device)->funcs.p_vkSetPrivateDataEXT(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->data); - return result; } @@ -16637,7 +16590,6 @@ static NTSTATUS thunk32_vkSetPrivateDataEXT(void *args) TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", params->device, params->objectType, wine_dbgstr_longlong(params->objectHandle), wine_dbgstr_longlong(params->privateDataSlot), wine_dbgstr_longlong(params->data)); result = wine_device_from_handle(params->device)->funcs.p_vkSetPrivateDataEXT(wine_device_from_handle(params->device)->device, params->objectType, wine_vk_unwrap_handle(params->objectType, params->objectHandle), params->privateDataSlot, params->data); - return result; } @@ -16652,7 +16604,6 @@ static NTSTATUS thunk64_vkSignalSemaphore(void *args) TRACE("%p, %p\n", params->device, params->pSignalInfo); result = wine_device_from_handle(params->device)->funcs.p_vkSignalSemaphore(wine_device_from_handle(params->device)->device, params->pSignalInfo); - return result; } @@ -16667,7 +16618,6 @@ static NTSTATUS thunk32_vkSignalSemaphore(void *args) convert_VkSemaphoreSignalInfo_win_to_host(params->pSignalInfo, &pSignalInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkSignalSemaphore(wine_device_from_handle(params->device)->device, &pSignalInfo_host); - return result; } @@ -16682,7 +16632,6 @@ static NTSTATUS thunk64_vkSignalSemaphoreKHR(void *args) TRACE("%p, %p\n", params->device, params->pSignalInfo); result = wine_device_from_handle(params->device)->funcs.p_vkSignalSemaphoreKHR(wine_device_from_handle(params->device)->device, params->pSignalInfo); - return result; } @@ -16697,7 +16646,6 @@ static NTSTATUS thunk32_vkSignalSemaphoreKHR(void *args) convert_VkSemaphoreSignalInfo_win_to_host(params->pSignalInfo, &pSignalInfo_host); result = wine_device_from_handle(params->device)->funcs.p_vkSignalSemaphoreKHR(wine_device_from_handle(params->device)->device, &pSignalInfo_host); - return result; } @@ -16713,7 +16661,6 @@ static NTSTATUS thunk64_vkSubmitDebugUtilsMessageEXT(void *args) convert_VkDebugUtilsMessengerCallbackDataEXT_win_to_host(params->pCallbackData, &pCallbackData_host); wine_instance_from_handle(params->instance)->funcs.p_vkSubmitDebugUtilsMessageEXT(wine_instance_from_handle(params->instance)->instance, params->messageSeverity, params->messageTypes, &pCallbackData_host); - free_VkDebugUtilsMessengerCallbackDataEXT(&pCallbackData_host); return STATUS_SUCCESS; } @@ -16728,7 +16675,6 @@ static NTSTATUS thunk32_vkSubmitDebugUtilsMessageEXT(void *args) convert_VkDebugUtilsMessengerCallbackDataEXT_win_to_host(params->pCallbackData, &pCallbackData_host); wine_instance_from_handle(params->instance)->funcs.p_vkSubmitDebugUtilsMessageEXT(wine_instance_from_handle(params->instance)->instance, params->messageSeverity, params->messageTypes, &pCallbackData_host); - free_VkDebugUtilsMessengerCallbackDataEXT(&pCallbackData_host); return STATUS_SUCCESS; } @@ -16743,7 +16689,6 @@ static NTSTATUS thunk64_vkTrimCommandPool(void *args) TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->commandPool), params->flags); wine_device_from_handle(params->device)->funcs.p_vkTrimCommandPool(wine_device_from_handle(params->device)->device, wine_cmd_pool_from_handle(params->commandPool)->command_pool, params->flags); - return STATUS_SUCCESS; } @@ -16755,7 +16700,6 @@ static NTSTATUS thunk32_vkTrimCommandPool(void *args) TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->commandPool), params->flags); wine_device_from_handle(params->device)->funcs.p_vkTrimCommandPool(wine_device_from_handle(params->device)->device, wine_cmd_pool_from_handle(params->commandPool)->command_pool, params->flags); - return STATUS_SUCCESS; } @@ -16769,7 +16713,6 @@ static NTSTATUS thunk64_vkTrimCommandPoolKHR(void *args) TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->commandPool), params->flags); wine_device_from_handle(params->device)->funcs.p_vkTrimCommandPoolKHR(wine_device_from_handle(params->device)->device, wine_cmd_pool_from_handle(params->commandPool)->command_pool, params->flags); - return STATUS_SUCCESS; } @@ -16781,7 +16724,6 @@ static NTSTATUS thunk32_vkTrimCommandPoolKHR(void *args) TRACE("%p, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->commandPool), params->flags); wine_device_from_handle(params->device)->funcs.p_vkTrimCommandPoolKHR(wine_device_from_handle(params->device)->device, wine_cmd_pool_from_handle(params->commandPool)->command_pool, params->flags); - return STATUS_SUCCESS; } @@ -16795,7 +16737,6 @@ static NTSTATUS thunk64_vkUninitializePerformanceApiINTEL(void *args) TRACE("%p\n", params->device); wine_device_from_handle(params->device)->funcs.p_vkUninitializePerformanceApiINTEL(wine_device_from_handle(params->device)->device); - return STATUS_SUCCESS; } @@ -16807,7 +16748,6 @@ static NTSTATUS thunk32_vkUninitializePerformanceApiINTEL(void *args) TRACE("%p\n", params->device); wine_device_from_handle(params->device)->funcs.p_vkUninitializePerformanceApiINTEL(wine_device_from_handle(params->device)->device); - return STATUS_SUCCESS; } @@ -16821,7 +16761,6 @@ static NTSTATUS thunk64_vkUnmapMemory(void *args) TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->memory)); wine_device_from_handle(params->device)->funcs.p_vkUnmapMemory(wine_device_from_handle(params->device)->device, params->memory); - return STATUS_SUCCESS; } @@ -16833,7 +16772,6 @@ static NTSTATUS thunk32_vkUnmapMemory(void *args) TRACE("%p, 0x%s\n", params->device, wine_dbgstr_longlong(params->memory)); wine_device_from_handle(params->device)->funcs.p_vkUnmapMemory(wine_device_from_handle(params->device)->device, params->memory); - return STATUS_SUCCESS; } @@ -16847,7 +16785,6 @@ static NTSTATUS thunk64_vkUpdateDescriptorSetWithTemplate(void *args) TRACE("%p, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSet), wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pData); wine_device_from_handle(params->device)->funcs.p_vkUpdateDescriptorSetWithTemplate(wine_device_from_handle(params->device)->device, params->descriptorSet, params->descriptorUpdateTemplate, params->pData); - return STATUS_SUCCESS; } @@ -16859,7 +16796,6 @@ static NTSTATUS thunk32_vkUpdateDescriptorSetWithTemplate(void *args) TRACE("%p, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSet), wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pData); wine_device_from_handle(params->device)->funcs.p_vkUpdateDescriptorSetWithTemplate(wine_device_from_handle(params->device)->device, params->descriptorSet, params->descriptorUpdateTemplate, params->pData); - return STATUS_SUCCESS; } @@ -16873,7 +16809,6 @@ static NTSTATUS thunk64_vkUpdateDescriptorSetWithTemplateKHR(void *args) TRACE("%p, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSet), wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pData); wine_device_from_handle(params->device)->funcs.p_vkUpdateDescriptorSetWithTemplateKHR(wine_device_from_handle(params->device)->device, params->descriptorSet, params->descriptorUpdateTemplate, params->pData); - return STATUS_SUCCESS; } @@ -16885,7 +16820,6 @@ static NTSTATUS thunk32_vkUpdateDescriptorSetWithTemplateKHR(void *args) TRACE("%p, 0x%s, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->descriptorSet), wine_dbgstr_longlong(params->descriptorUpdateTemplate), params->pData); wine_device_from_handle(params->device)->funcs.p_vkUpdateDescriptorSetWithTemplateKHR(wine_device_from_handle(params->device)->device, params->descriptorSet, params->descriptorUpdateTemplate, params->pData); - return STATUS_SUCCESS; } @@ -16899,7 +16833,6 @@ static NTSTATUS thunk64_vkUpdateDescriptorSets(void *args) TRACE("%p, %u, %p, %u, %p\n", params->device, params->descriptorWriteCount, params->pDescriptorWrites, params->descriptorCopyCount, params->pDescriptorCopies); wine_device_from_handle(params->device)->funcs.p_vkUpdateDescriptorSets(wine_device_from_handle(params->device)->device, params->descriptorWriteCount, params->pDescriptorWrites, params->descriptorCopyCount, params->pDescriptorCopies); - return STATUS_SUCCESS; } @@ -16915,7 +16848,6 @@ static NTSTATUS thunk32_vkUpdateDescriptorSets(void *args) pDescriptorWrites_host = convert_VkWriteDescriptorSet_array_win_to_host(params->pDescriptorWrites, params->descriptorWriteCount); pDescriptorCopies_host = convert_VkCopyDescriptorSet_array_win_to_host(params->pDescriptorCopies, params->descriptorCopyCount); wine_device_from_handle(params->device)->funcs.p_vkUpdateDescriptorSets(wine_device_from_handle(params->device)->device, params->descriptorWriteCount, pDescriptorWrites_host, params->descriptorCopyCount, pDescriptorCopies_host); - free_VkWriteDescriptorSet_array(pDescriptorWrites_host, params->descriptorWriteCount); free_VkCopyDescriptorSet_array(pDescriptorCopies_host, params->descriptorCopyCount); return STATUS_SUCCESS; @@ -16932,7 +16864,6 @@ static NTSTATUS thunk64_vkWaitForFences(void *args) TRACE("%p, %u, %p, %u, 0x%s\n", params->device, params->fenceCount, params->pFences, params->waitAll, wine_dbgstr_longlong(params->timeout)); result = wine_device_from_handle(params->device)->funcs.p_vkWaitForFences(wine_device_from_handle(params->device)->device, params->fenceCount, params->pFences, params->waitAll, params->timeout); - return result; } @@ -16945,7 +16876,6 @@ static NTSTATUS thunk32_vkWaitForFences(void *args) TRACE("%p, %u, %p, %u, 0x%s\n", params->device, params->fenceCount, params->pFences, params->waitAll, wine_dbgstr_longlong(params->timeout)); result = wine_device_from_handle(params->device)->funcs.p_vkWaitForFences(wine_device_from_handle(params->device)->device, params->fenceCount, params->pFences, params->waitAll, params->timeout); - return result; } @@ -16960,7 +16890,6 @@ static NTSTATUS thunk64_vkWaitForPresentKHR(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s\n", params->device, wine_dbgstr_longlong(params->swapchain), wine_dbgstr_longlong(params->presentId), wine_dbgstr_longlong(params->timeout)); result = wine_device_from_handle(params->device)->funcs.p_vkWaitForPresentKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->presentId, params->timeout); - return result; } @@ -16973,7 +16902,6 @@ static NTSTATUS thunk32_vkWaitForPresentKHR(void *args) TRACE("%p, 0x%s, 0x%s, 0x%s\n", params->device, wine_dbgstr_longlong(params->swapchain), wine_dbgstr_longlong(params->presentId), wine_dbgstr_longlong(params->timeout)); result = wine_device_from_handle(params->device)->funcs.p_vkWaitForPresentKHR(wine_device_from_handle(params->device)->device, params->swapchain, params->presentId, params->timeout); - return result; } @@ -16988,7 +16916,6 @@ static NTSTATUS thunk64_vkWaitSemaphores(void *args) TRACE("%p, %p, 0x%s\n", params->device, params->pWaitInfo, wine_dbgstr_longlong(params->timeout)); result = wine_device_from_handle(params->device)->funcs.p_vkWaitSemaphores(wine_device_from_handle(params->device)->device, params->pWaitInfo, params->timeout); - return result; } @@ -17001,7 +16928,6 @@ static NTSTATUS thunk32_vkWaitSemaphores(void *args) TRACE("%p, %p, 0x%s\n", params->device, params->pWaitInfo, wine_dbgstr_longlong(params->timeout)); result = wine_device_from_handle(params->device)->funcs.p_vkWaitSemaphores(wine_device_from_handle(params->device)->device, params->pWaitInfo, params->timeout); - return result; } @@ -17016,7 +16942,6 @@ static NTSTATUS thunk64_vkWaitSemaphoresKHR(void *args) TRACE("%p, %p, 0x%s\n", params->device, params->pWaitInfo, wine_dbgstr_longlong(params->timeout)); result = wine_device_from_handle(params->device)->funcs.p_vkWaitSemaphoresKHR(wine_device_from_handle(params->device)->device, params->pWaitInfo, params->timeout); - return result; } @@ -17029,7 +16954,6 @@ static NTSTATUS thunk32_vkWaitSemaphoresKHR(void *args) TRACE("%p, %p, 0x%s\n", params->device, params->pWaitInfo, wine_dbgstr_longlong(params->timeout)); result = wine_device_from_handle(params->device)->funcs.p_vkWaitSemaphoresKHR(wine_device_from_handle(params->device)->device, params->pWaitInfo, params->timeout); - return result; } @@ -17044,7 +16968,6 @@ static NTSTATUS thunk64_vkWriteAccelerationStructuresPropertiesKHR(void *args) TRACE("%p, %u, %p, %#x, 0x%s, %p, 0x%s\n", params->device, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, wine_dbgstr_longlong(params->dataSize), params->pData, wine_dbgstr_longlong(params->stride)); result = wine_device_from_handle(params->device)->funcs.p_vkWriteAccelerationStructuresPropertiesKHR(wine_device_from_handle(params->device)->device, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, params->dataSize, params->pData, params->stride); - return result; } @@ -17057,7 +16980,6 @@ static NTSTATUS thunk32_vkWriteAccelerationStructuresPropertiesKHR(void *args) TRACE("%p, %u, %p, %#x, 0x%s, %p, 0x%s\n", params->device, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, wine_dbgstr_longlong(params->dataSize), params->pData, wine_dbgstr_longlong(params->stride)); result = wine_device_from_handle(params->device)->funcs.p_vkWriteAccelerationStructuresPropertiesKHR(wine_device_from_handle(params->device)->device, params->accelerationStructureCount, params->pAccelerationStructures, params->queryType, params->dataSize, params->pData, params->stride); - return result; } @@ -17382,7 +17304,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = thunk64_vkAcquireNextImageKHR, thunk64_vkAcquirePerformanceConfigurationINTEL, thunk64_vkAcquireProfilingLockKHR, - wine_vkAllocateCommandBuffers, + thunk64_vkAllocateCommandBuffers, thunk64_vkAllocateDescriptorSets, thunk64_vkAllocateMemory, thunk64_vkBeginCommandBuffer, @@ -17582,33 +17504,33 @@ const unixlib_entry_t __wine_unix_call_funcs[] = thunk64_vkCreateAccelerationStructureNV, thunk64_vkCreateBuffer, thunk64_vkCreateBufferView, - wine_vkCreateCommandPool, - wine_vkCreateComputePipelines, + thunk64_vkCreateCommandPool, + thunk64_vkCreateComputePipelines, thunk64_vkCreateCuFunctionNVX, thunk64_vkCreateCuModuleNVX, - wine_vkCreateDebugReportCallbackEXT, - wine_vkCreateDebugUtilsMessengerEXT, + thunk64_vkCreateDebugReportCallbackEXT, + thunk64_vkCreateDebugUtilsMessengerEXT, thunk64_vkCreateDeferredOperationKHR, thunk64_vkCreateDescriptorPool, thunk64_vkCreateDescriptorSetLayout, thunk64_vkCreateDescriptorUpdateTemplate, thunk64_vkCreateDescriptorUpdateTemplateKHR, - wine_vkCreateDevice, + thunk64_vkCreateDevice, thunk64_vkCreateEvent, thunk64_vkCreateFence, thunk64_vkCreateFramebuffer, - wine_vkCreateGraphicsPipelines, + thunk64_vkCreateGraphicsPipelines, thunk64_vkCreateImage, thunk64_vkCreateImageView, thunk64_vkCreateIndirectCommandsLayoutNV, - wine_vkCreateInstance, + thunk64_vkCreateInstance, thunk64_vkCreatePipelineCache, thunk64_vkCreatePipelineLayout, thunk64_vkCreatePrivateDataSlot, thunk64_vkCreatePrivateDataSlotEXT, thunk64_vkCreateQueryPool, - wine_vkCreateRayTracingPipelinesKHR, - wine_vkCreateRayTracingPipelinesNV, + thunk64_vkCreateRayTracingPipelinesKHR, + thunk64_vkCreateRayTracingPipelinesNV, thunk64_vkCreateRenderPass, thunk64_vkCreateRenderPass2, thunk64_vkCreateRenderPass2KHR, @@ -17619,7 +17541,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = thunk64_vkCreateShaderModule, thunk64_vkCreateSwapchainKHR, thunk64_vkCreateValidationCacheEXT, - wine_vkCreateWin32SurfaceKHR, + thunk64_vkCreateWin32SurfaceKHR, thunk64_vkDebugMarkerSetObjectNameEXT, thunk64_vkDebugMarkerSetObjectTagEXT, thunk64_vkDebugReportMessageEXT, @@ -17628,24 +17550,24 @@ const unixlib_entry_t __wine_unix_call_funcs[] = thunk64_vkDestroyAccelerationStructureNV, thunk64_vkDestroyBuffer, thunk64_vkDestroyBufferView, - wine_vkDestroyCommandPool, + thunk64_vkDestroyCommandPool, thunk64_vkDestroyCuFunctionNVX, thunk64_vkDestroyCuModuleNVX, - wine_vkDestroyDebugReportCallbackEXT, - wine_vkDestroyDebugUtilsMessengerEXT, + thunk64_vkDestroyDebugReportCallbackEXT, + thunk64_vkDestroyDebugUtilsMessengerEXT, thunk64_vkDestroyDeferredOperationKHR, thunk64_vkDestroyDescriptorPool, thunk64_vkDestroyDescriptorSetLayout, thunk64_vkDestroyDescriptorUpdateTemplate, thunk64_vkDestroyDescriptorUpdateTemplateKHR, - wine_vkDestroyDevice, + thunk64_vkDestroyDevice, thunk64_vkDestroyEvent, thunk64_vkDestroyFence, thunk64_vkDestroyFramebuffer, thunk64_vkDestroyImage, thunk64_vkDestroyImageView, thunk64_vkDestroyIndirectCommandsLayoutNV, - wine_vkDestroyInstance, + thunk64_vkDestroyInstance, thunk64_vkDestroyPipeline, thunk64_vkDestroyPipelineCache, thunk64_vkDestroyPipelineLayout, @@ -17658,21 +17580,21 @@ const unixlib_entry_t __wine_unix_call_funcs[] = thunk64_vkDestroySamplerYcbcrConversionKHR, thunk64_vkDestroySemaphore, thunk64_vkDestroyShaderModule, - wine_vkDestroySurfaceKHR, + thunk64_vkDestroySurfaceKHR, thunk64_vkDestroySwapchainKHR, thunk64_vkDestroyValidationCacheEXT, thunk64_vkDeviceWaitIdle, thunk64_vkEndCommandBuffer, - wine_vkEnumerateDeviceExtensionProperties, - wine_vkEnumerateDeviceLayerProperties, - wine_vkEnumerateInstanceExtensionProperties, - wine_vkEnumerateInstanceVersion, - wine_vkEnumeratePhysicalDeviceGroups, - wine_vkEnumeratePhysicalDeviceGroupsKHR, + thunk64_vkEnumerateDeviceExtensionProperties, + thunk64_vkEnumerateDeviceLayerProperties, + thunk64_vkEnumerateInstanceExtensionProperties, + thunk64_vkEnumerateInstanceVersion, + thunk64_vkEnumeratePhysicalDeviceGroups, + thunk64_vkEnumeratePhysicalDeviceGroupsKHR, thunk64_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR, - wine_vkEnumeratePhysicalDevices, + thunk64_vkEnumeratePhysicalDevices, thunk64_vkFlushMappedMemoryRanges, - wine_vkFreeCommandBuffers, + thunk64_vkFreeCommandBuffers, thunk64_vkFreeDescriptorSets, thunk64_vkFreeMemory, thunk64_vkGetAccelerationStructureBuildSizesKHR, @@ -17687,7 +17609,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = thunk64_vkGetBufferMemoryRequirements2KHR, thunk64_vkGetBufferOpaqueCaptureAddress, thunk64_vkGetBufferOpaqueCaptureAddressKHR, - wine_vkGetCalibratedTimestampsEXT, + thunk64_vkGetCalibratedTimestampsEXT, thunk64_vkGetDeferredOperationMaxConcurrencyKHR, thunk64_vkGetDeferredOperationResultKHR, thunk64_vkGetDescriptorSetHostMappingVALVE, @@ -17708,8 +17630,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = thunk64_vkGetDeviceMemoryCommitment, thunk64_vkGetDeviceMemoryOpaqueCaptureAddress, thunk64_vkGetDeviceMemoryOpaqueCaptureAddressKHR, - wine_vkGetDeviceQueue, - wine_vkGetDeviceQueue2, + thunk64_vkGetDeviceQueue, + thunk64_vkGetDeviceQueue2, thunk64_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI, thunk64_vkGetDynamicRenderingTilePropertiesQCOM, thunk64_vkGetEventStatus, @@ -17728,14 +17650,14 @@ const unixlib_entry_t __wine_unix_call_funcs[] = thunk64_vkGetImageViewHandleNVX, thunk64_vkGetMemoryHostPointerPropertiesEXT, thunk64_vkGetPerformanceParameterINTEL, - wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT, + thunk64_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT, thunk64_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV, - wine_vkGetPhysicalDeviceExternalBufferProperties, - wine_vkGetPhysicalDeviceExternalBufferPropertiesKHR, - wine_vkGetPhysicalDeviceExternalFenceProperties, - wine_vkGetPhysicalDeviceExternalFencePropertiesKHR, - wine_vkGetPhysicalDeviceExternalSemaphoreProperties, - wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR, + thunk64_vkGetPhysicalDeviceExternalBufferProperties, + thunk64_vkGetPhysicalDeviceExternalBufferPropertiesKHR, + thunk64_vkGetPhysicalDeviceExternalFenceProperties, + thunk64_vkGetPhysicalDeviceExternalFencePropertiesKHR, + thunk64_vkGetPhysicalDeviceExternalSemaphoreProperties, + thunk64_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR, thunk64_vkGetPhysicalDeviceFeatures, thunk64_vkGetPhysicalDeviceFeatures2, thunk64_vkGetPhysicalDeviceFeatures2KHR, @@ -17744,8 +17666,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = thunk64_vkGetPhysicalDeviceFormatProperties2KHR, thunk64_vkGetPhysicalDeviceFragmentShadingRatesKHR, thunk64_vkGetPhysicalDeviceImageFormatProperties, - wine_vkGetPhysicalDeviceImageFormatProperties2, - wine_vkGetPhysicalDeviceImageFormatProperties2KHR, + thunk64_vkGetPhysicalDeviceImageFormatProperties2, + thunk64_vkGetPhysicalDeviceImageFormatProperties2KHR, thunk64_vkGetPhysicalDeviceMemoryProperties, thunk64_vkGetPhysicalDeviceMemoryProperties2, thunk64_vkGetPhysicalDeviceMemoryProperties2KHR, @@ -17762,8 +17684,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = thunk64_vkGetPhysicalDeviceSparseImageFormatProperties2, thunk64_vkGetPhysicalDeviceSparseImageFormatProperties2KHR, thunk64_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV, - wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR, - wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR, + thunk64_vkGetPhysicalDeviceSurfaceCapabilities2KHR, + thunk64_vkGetPhysicalDeviceSurfaceCapabilitiesKHR, thunk64_vkGetPhysicalDeviceSurfaceFormats2KHR, thunk64_vkGetPhysicalDeviceSurfaceFormatsKHR, thunk64_vkGetPhysicalDeviceSurfacePresentModesKHR, @@ -17852,7 +17774,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = thunk32_vkAcquireNextImageKHR, thunk32_vkAcquirePerformanceConfigurationINTEL, thunk32_vkAcquireProfilingLockKHR, - wine_vkAllocateCommandBuffers, + thunk32_vkAllocateCommandBuffers, thunk32_vkAllocateDescriptorSets, thunk32_vkAllocateMemory, thunk32_vkBeginCommandBuffer, @@ -18052,33 +17974,33 @@ const unixlib_entry_t __wine_unix_call_funcs[] = thunk32_vkCreateAccelerationStructureNV, thunk32_vkCreateBuffer, thunk32_vkCreateBufferView, - wine_vkCreateCommandPool, - wine_vkCreateComputePipelines, + thunk32_vkCreateCommandPool, + thunk32_vkCreateComputePipelines, thunk32_vkCreateCuFunctionNVX, thunk32_vkCreateCuModuleNVX, - wine_vkCreateDebugReportCallbackEXT, - wine_vkCreateDebugUtilsMessengerEXT, + thunk32_vkCreateDebugReportCallbackEXT, + thunk32_vkCreateDebugUtilsMessengerEXT, thunk32_vkCreateDeferredOperationKHR, thunk32_vkCreateDescriptorPool, thunk32_vkCreateDescriptorSetLayout, thunk32_vkCreateDescriptorUpdateTemplate, thunk32_vkCreateDescriptorUpdateTemplateKHR, - wine_vkCreateDevice, + thunk32_vkCreateDevice, thunk32_vkCreateEvent, thunk32_vkCreateFence, thunk32_vkCreateFramebuffer, - wine_vkCreateGraphicsPipelines, + thunk32_vkCreateGraphicsPipelines, thunk32_vkCreateImage, thunk32_vkCreateImageView, thunk32_vkCreateIndirectCommandsLayoutNV, - wine_vkCreateInstance, + thunk32_vkCreateInstance, thunk32_vkCreatePipelineCache, thunk32_vkCreatePipelineLayout, thunk32_vkCreatePrivateDataSlot, thunk32_vkCreatePrivateDataSlotEXT, thunk32_vkCreateQueryPool, - wine_vkCreateRayTracingPipelinesKHR, - wine_vkCreateRayTracingPipelinesNV, + thunk32_vkCreateRayTracingPipelinesKHR, + thunk32_vkCreateRayTracingPipelinesNV, thunk32_vkCreateRenderPass, thunk32_vkCreateRenderPass2, thunk32_vkCreateRenderPass2KHR, @@ -18089,7 +18011,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = thunk32_vkCreateShaderModule, thunk32_vkCreateSwapchainKHR, thunk32_vkCreateValidationCacheEXT, - wine_vkCreateWin32SurfaceKHR, + thunk32_vkCreateWin32SurfaceKHR, thunk32_vkDebugMarkerSetObjectNameEXT, thunk32_vkDebugMarkerSetObjectTagEXT, thunk32_vkDebugReportMessageEXT, @@ -18098,24 +18020,24 @@ const unixlib_entry_t __wine_unix_call_funcs[] = thunk32_vkDestroyAccelerationStructureNV, thunk32_vkDestroyBuffer, thunk32_vkDestroyBufferView, - wine_vkDestroyCommandPool, + thunk32_vkDestroyCommandPool, thunk32_vkDestroyCuFunctionNVX, thunk32_vkDestroyCuModuleNVX, - wine_vkDestroyDebugReportCallbackEXT, - wine_vkDestroyDebugUtilsMessengerEXT, + thunk32_vkDestroyDebugReportCallbackEXT, + thunk32_vkDestroyDebugUtilsMessengerEXT, thunk32_vkDestroyDeferredOperationKHR, thunk32_vkDestroyDescriptorPool, thunk32_vkDestroyDescriptorSetLayout, thunk32_vkDestroyDescriptorUpdateTemplate, thunk32_vkDestroyDescriptorUpdateTemplateKHR, - wine_vkDestroyDevice, + thunk32_vkDestroyDevice, thunk32_vkDestroyEvent, thunk32_vkDestroyFence, thunk32_vkDestroyFramebuffer, thunk32_vkDestroyImage, thunk32_vkDestroyImageView, thunk32_vkDestroyIndirectCommandsLayoutNV, - wine_vkDestroyInstance, + thunk32_vkDestroyInstance, thunk32_vkDestroyPipeline, thunk32_vkDestroyPipelineCache, thunk32_vkDestroyPipelineLayout, @@ -18128,21 +18050,21 @@ const unixlib_entry_t __wine_unix_call_funcs[] = thunk32_vkDestroySamplerYcbcrConversionKHR, thunk32_vkDestroySemaphore, thunk32_vkDestroyShaderModule, - wine_vkDestroySurfaceKHR, + thunk32_vkDestroySurfaceKHR, thunk32_vkDestroySwapchainKHR, thunk32_vkDestroyValidationCacheEXT, thunk32_vkDeviceWaitIdle, thunk32_vkEndCommandBuffer, - wine_vkEnumerateDeviceExtensionProperties, - wine_vkEnumerateDeviceLayerProperties, - wine_vkEnumerateInstanceExtensionProperties, - wine_vkEnumerateInstanceVersion, - wine_vkEnumeratePhysicalDeviceGroups, - wine_vkEnumeratePhysicalDeviceGroupsKHR, + thunk32_vkEnumerateDeviceExtensionProperties, + thunk32_vkEnumerateDeviceLayerProperties, + thunk32_vkEnumerateInstanceExtensionProperties, + thunk32_vkEnumerateInstanceVersion, + thunk32_vkEnumeratePhysicalDeviceGroups, + thunk32_vkEnumeratePhysicalDeviceGroupsKHR, thunk32_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR, - wine_vkEnumeratePhysicalDevices, + thunk32_vkEnumeratePhysicalDevices, thunk32_vkFlushMappedMemoryRanges, - wine_vkFreeCommandBuffers, + thunk32_vkFreeCommandBuffers, thunk32_vkFreeDescriptorSets, thunk32_vkFreeMemory, thunk32_vkGetAccelerationStructureBuildSizesKHR, @@ -18157,7 +18079,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = thunk32_vkGetBufferMemoryRequirements2KHR, thunk32_vkGetBufferOpaqueCaptureAddress, thunk32_vkGetBufferOpaqueCaptureAddressKHR, - wine_vkGetCalibratedTimestampsEXT, + thunk32_vkGetCalibratedTimestampsEXT, thunk32_vkGetDeferredOperationMaxConcurrencyKHR, thunk32_vkGetDeferredOperationResultKHR, thunk32_vkGetDescriptorSetHostMappingVALVE, @@ -18178,8 +18100,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = thunk32_vkGetDeviceMemoryCommitment, thunk32_vkGetDeviceMemoryOpaqueCaptureAddress, thunk32_vkGetDeviceMemoryOpaqueCaptureAddressKHR, - wine_vkGetDeviceQueue, - wine_vkGetDeviceQueue2, + thunk32_vkGetDeviceQueue, + thunk32_vkGetDeviceQueue2, thunk32_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI, thunk32_vkGetDynamicRenderingTilePropertiesQCOM, thunk32_vkGetEventStatus, @@ -18198,14 +18120,14 @@ const unixlib_entry_t __wine_unix_call_funcs[] = thunk32_vkGetImageViewHandleNVX, thunk32_vkGetMemoryHostPointerPropertiesEXT, thunk32_vkGetPerformanceParameterINTEL, - wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT, + thunk32_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT, thunk32_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV, - wine_vkGetPhysicalDeviceExternalBufferProperties, - wine_vkGetPhysicalDeviceExternalBufferPropertiesKHR, - wine_vkGetPhysicalDeviceExternalFenceProperties, - wine_vkGetPhysicalDeviceExternalFencePropertiesKHR, - wine_vkGetPhysicalDeviceExternalSemaphoreProperties, - wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR, + thunk32_vkGetPhysicalDeviceExternalBufferProperties, + thunk32_vkGetPhysicalDeviceExternalBufferPropertiesKHR, + thunk32_vkGetPhysicalDeviceExternalFenceProperties, + thunk32_vkGetPhysicalDeviceExternalFencePropertiesKHR, + thunk32_vkGetPhysicalDeviceExternalSemaphoreProperties, + thunk32_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR, thunk32_vkGetPhysicalDeviceFeatures, thunk32_vkGetPhysicalDeviceFeatures2, thunk32_vkGetPhysicalDeviceFeatures2KHR, @@ -18214,8 +18136,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = thunk32_vkGetPhysicalDeviceFormatProperties2KHR, thunk32_vkGetPhysicalDeviceFragmentShadingRatesKHR, thunk32_vkGetPhysicalDeviceImageFormatProperties, - wine_vkGetPhysicalDeviceImageFormatProperties2, - wine_vkGetPhysicalDeviceImageFormatProperties2KHR, + thunk32_vkGetPhysicalDeviceImageFormatProperties2, + thunk32_vkGetPhysicalDeviceImageFormatProperties2KHR, thunk32_vkGetPhysicalDeviceMemoryProperties, thunk32_vkGetPhysicalDeviceMemoryProperties2, thunk32_vkGetPhysicalDeviceMemoryProperties2KHR, @@ -18232,8 +18154,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = thunk32_vkGetPhysicalDeviceSparseImageFormatProperties2, thunk32_vkGetPhysicalDeviceSparseImageFormatProperties2KHR, thunk32_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV, - wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR, - wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR, + thunk32_vkGetPhysicalDeviceSurfaceCapabilities2KHR, + thunk32_vkGetPhysicalDeviceSurfaceCapabilitiesKHR, thunk32_vkGetPhysicalDeviceSurfaceFormats2KHR, thunk32_vkGetPhysicalDeviceSurfaceFormatsKHR, thunk32_vkGetPhysicalDeviceSurfacePresentModesKHR, diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 13c4b72d13f..843eacffa90 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -15,48 +15,48 @@ #define WINE_VK_VERSION VK_API_VERSION_1_3 /* Functions for which we have custom implementations outside of the thunks. */ -NTSTATUS wine_vkAllocateCommandBuffers(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkCreateCommandPool(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkCreateComputePipelines(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkCreateDebugReportCallbackEXT(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkCreateDebugUtilsMessengerEXT(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkCreateDevice(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkCreateGraphicsPipelines(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkCreateInstance(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkCreateRayTracingPipelinesKHR(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkCreateRayTracingPipelinesNV(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkCreateWin32SurfaceKHR(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkDestroyCommandPool(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkDestroyDebugReportCallbackEXT(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkDestroyDebugUtilsMessengerEXT(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkDestroyDevice(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkDestroyInstance(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkDestroySurfaceKHR(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkEnumerateDeviceExtensionProperties(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkEnumerateDeviceLayerProperties(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkEnumerateInstanceExtensionProperties(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkEnumerateInstanceLayerProperties(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkEnumerateInstanceVersion(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkEnumeratePhysicalDeviceGroups(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkEnumeratePhysicalDeviceGroupsKHR(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkEnumeratePhysicalDevices(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkFreeCommandBuffers(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkGetCalibratedTimestampsEXT(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkGetDeviceProcAddr(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkGetDeviceQueue(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkGetDeviceQueue2(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkGetInstanceProcAddr(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkGetPhysicalDeviceExternalBufferProperties(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkGetPhysicalDeviceExternalBufferPropertiesKHR(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkGetPhysicalDeviceExternalFenceProperties(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkGetPhysicalDeviceExternalFencePropertiesKHR(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkGetPhysicalDeviceExternalSemaphoreProperties(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkGetPhysicalDeviceImageFormatProperties2(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkGetPhysicalDeviceImageFormatProperties2KHR(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(void *args) DECLSPEC_HIDDEN; -NTSTATUS wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(void *args) DECLSPEC_HIDDEN; +VkResult wine_vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo *pAllocateInfo, VkCommandBuffer *pCommandBuffers) DECLSPEC_HIDDEN; +VkResult wine_vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkCommandPool *pCommandPool, void *client_ptr) DECLSPEC_HIDDEN; +VkResult wine_vkCreateComputePipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkComputePipelineCreateInfo *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) DECLSPEC_HIDDEN; +VkResult wine_vkCreateDebugReportCallbackEXT(VkInstance instance, const VkDebugReportCallbackCreateInfoEXT *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDebugReportCallbackEXT *pCallback) DECLSPEC_HIDDEN; +VkResult wine_vkCreateDebugUtilsMessengerEXT(VkInstance instance, const VkDebugUtilsMessengerCreateInfoEXT *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDebugUtilsMessengerEXT *pMessenger) DECLSPEC_HIDDEN; +VkResult wine_vkCreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDevice *pDevice, void *client_ptr) DECLSPEC_HIDDEN; +VkResult wine_vkCreateGraphicsPipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkGraphicsPipelineCreateInfo *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) DECLSPEC_HIDDEN; +VkResult wine_vkCreateInstance(const VkInstanceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkInstance *pInstance, void *client_ptr) DECLSPEC_HIDDEN; +VkResult wine_vkCreateRayTracingPipelinesKHR(VkDevice device, VkDeferredOperationKHR deferredOperation, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkRayTracingPipelineCreateInfoKHR *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) DECLSPEC_HIDDEN; +VkResult wine_vkCreateRayTracingPipelinesNV(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkRayTracingPipelineCreateInfoNV *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) DECLSPEC_HIDDEN; +VkResult wine_vkCreateWin32SurfaceKHR(VkInstance instance, const VkWin32SurfaceCreateInfoKHR *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkSurfaceKHR *pSurface) DECLSPEC_HIDDEN; +void wine_vkDestroyCommandPool(VkDevice device, VkCommandPool commandPool, const VkAllocationCallbacks *pAllocator) DECLSPEC_HIDDEN; +void wine_vkDestroyDebugReportCallbackEXT(VkInstance instance, VkDebugReportCallbackEXT callback, const VkAllocationCallbacks *pAllocator) DECLSPEC_HIDDEN; +void wine_vkDestroyDebugUtilsMessengerEXT(VkInstance instance, VkDebugUtilsMessengerEXT messenger, const VkAllocationCallbacks *pAllocator) DECLSPEC_HIDDEN; +void wine_vkDestroyDevice(VkDevice device, const VkAllocationCallbacks *pAllocator) DECLSPEC_HIDDEN; +void wine_vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *pAllocator) DECLSPEC_HIDDEN; +void wine_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, const VkAllocationCallbacks *pAllocator) DECLSPEC_HIDDEN; +VkResult wine_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, const char *pLayerName, uint32_t *pPropertyCount, VkExtensionProperties *pProperties) DECLSPEC_HIDDEN; +VkResult wine_vkEnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice, uint32_t *pPropertyCount, VkLayerProperties *pProperties) DECLSPEC_HIDDEN; +VkResult wine_vkEnumerateInstanceExtensionProperties(const char *pLayerName, uint32_t *pPropertyCount, VkExtensionProperties *pProperties) DECLSPEC_HIDDEN; +VkResult wine_vkEnumerateInstanceLayerProperties(uint32_t *pPropertyCount, VkLayerProperties *pProperties) DECLSPEC_HIDDEN; +VkResult wine_vkEnumerateInstanceVersion(uint32_t *pApiVersion) DECLSPEC_HIDDEN; +VkResult wine_vkEnumeratePhysicalDeviceGroups(VkInstance instance, uint32_t *pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties *pPhysicalDeviceGroupProperties) DECLSPEC_HIDDEN; +VkResult wine_vkEnumeratePhysicalDeviceGroupsKHR(VkInstance instance, uint32_t *pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties *pPhysicalDeviceGroupProperties) DECLSPEC_HIDDEN; +VkResult wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *pPhysicalDeviceCount, VkPhysicalDevice *pPhysicalDevices) DECLSPEC_HIDDEN; +void wine_vkFreeCommandBuffers(VkDevice device, VkCommandPool commandPool, uint32_t commandBufferCount, const VkCommandBuffer *pCommandBuffers) DECLSPEC_HIDDEN; +VkResult wine_vkGetCalibratedTimestampsEXT(VkDevice device, uint32_t timestampCount, const VkCalibratedTimestampInfoEXT *pTimestampInfos, uint64_t *pTimestamps, uint64_t *pMaxDeviation) DECLSPEC_HIDDEN; +PFN_vkVoidFunction wine_vkGetDeviceProcAddr(VkDevice device, const char *pName) DECLSPEC_HIDDEN; +void wine_vkGetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue *pQueue) DECLSPEC_HIDDEN; +void wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *pQueueInfo, VkQueue *pQueue) DECLSPEC_HIDDEN; +PFN_vkVoidFunction wine_vkGetInstanceProcAddr(VkInstance instance, const char *pName) DECLSPEC_HIDDEN; +VkResult wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDevice physicalDevice, uint32_t *pTimeDomainCount, VkTimeDomainEXT *pTimeDomains) DECLSPEC_HIDDEN; +void wine_vkGetPhysicalDeviceExternalBufferProperties(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalBufferInfo *pExternalBufferInfo, VkExternalBufferProperties *pExternalBufferProperties) DECLSPEC_HIDDEN; +void wine_vkGetPhysicalDeviceExternalBufferPropertiesKHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalBufferInfo *pExternalBufferInfo, VkExternalBufferProperties *pExternalBufferProperties) DECLSPEC_HIDDEN; +void wine_vkGetPhysicalDeviceExternalFenceProperties(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalFenceInfo *pExternalFenceInfo, VkExternalFenceProperties *pExternalFenceProperties) DECLSPEC_HIDDEN; +void wine_vkGetPhysicalDeviceExternalFencePropertiesKHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalFenceInfo *pExternalFenceInfo, VkExternalFenceProperties *pExternalFenceProperties) DECLSPEC_HIDDEN; +void wine_vkGetPhysicalDeviceExternalSemaphoreProperties(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalSemaphoreInfo *pExternalSemaphoreInfo, VkExternalSemaphoreProperties *pExternalSemaphoreProperties) DECLSPEC_HIDDEN; +void wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalSemaphoreInfo *pExternalSemaphoreInfo, VkExternalSemaphoreProperties *pExternalSemaphoreProperties) DECLSPEC_HIDDEN; +VkResult wine_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; +VkResult wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; +VkResult wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities) DECLSPEC_HIDDEN; +VkResult wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities) DECLSPEC_HIDDEN; /* Private thunks */ VkResult thunk_vkCreateComputePipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkComputePipelineCreateInfo *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) DECLSPEC_HIDDEN; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/923
From: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan.c | 66 -------------- dlls/winevulkan/vulkan_thunks.c | 156 ++++++++++++++++++++++++++++++++ 3 files changed, 157 insertions(+), 67 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index a67cfbc88bb..fd61130cab1 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -797,7 +797,7 @@ class VkFunction(object): else: body += " {0} {1}_host;\n".format(p.type, p.name) - if self.thunk_type == ThunkType.PUBLIC: + if params_prefix: body += " {0}\n".format(self.trace(params_prefix=params_prefix)) # Call any win_to_host conversion calls. diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index c12bce4614d..b14de9ca0e9 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -654,8 +654,6 @@ VkResult wine_vkAllocateCommandBuffers(VkDevice handle, const VkCommandBufferAll VkResult res = VK_SUCCESS; unsigned int i; - TRACE("%p, %p, %p\n", device, allocate_info, buffers); - pool = wine_cmd_pool_from_handle(allocate_info->commandPool); for (i = 0; i < allocate_info->commandBufferCount; i++) @@ -712,8 +710,6 @@ VkResult wine_vkCreateDevice(VkPhysicalDevice phys_dev_handle, const VkDeviceCre unsigned int i; VkResult res; - TRACE("%p, %p, %p, %p\n", phys_dev_handle, create_info, allocator, ret_device); - if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); @@ -883,8 +879,6 @@ void wine_vkDestroyDevice(VkDevice handle, const VkAllocationCallbacks *allocato { struct wine_device *device = wine_device_from_handle(handle); - TRACE("%p %p\n", device, allocator); - if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); @@ -895,8 +889,6 @@ void wine_vkDestroyInstance(VkInstance handle, const VkAllocationCallbacks *allo { struct wine_instance *instance = wine_instance_from_handle(handle); - TRACE("%p, %p\n", instance, allocator); - if (allocator) FIXME("Support allocation allocators\n"); @@ -908,8 +900,6 @@ VkResult wine_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice phys_dev_han { struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(phys_dev_handle); - TRACE("%p, %p, %p, %p\n", phys_dev, layer_name, count, properties); - /* This shouldn't get called with layer_name set, the ICD loader prevents it. */ if (layer_name) { @@ -990,8 +980,6 @@ VkResult wine_vkEnumerateInstanceExtensionProperties(const char *name, uint32_t VkResult wine_vkEnumerateDeviceLayerProperties(VkPhysicalDevice phys_dev, uint32_t *count, VkLayerProperties *properties) { - TRACE("%p, %p, %p\n", phys_dev, count, properties); - *count = 0; return VK_SUCCESS; } @@ -1025,8 +1013,6 @@ VkResult wine_vkEnumeratePhysicalDevices(VkInstance handle, uint32_t *count, VkP struct wine_instance *instance = wine_instance_from_handle(handle); unsigned int i; - TRACE("%p %p %p\n", instance, count, devices); - if (!devices) { *count = instance->phys_dev_count; @@ -1049,8 +1035,6 @@ void wine_vkFreeCommandBuffers(VkDevice handle, VkCommandPool command_pool, uint struct wine_device *device = wine_device_from_handle(handle); struct wine_cmd_pool *pool = wine_cmd_pool_from_handle(command_pool); - TRACE("%p, 0x%s, %u, %p\n", device, wine_dbgstr_longlong(command_pool), count, buffers); - wine_vk_free_command_buffers(device, pool, count, buffers); } @@ -1078,8 +1062,6 @@ void wine_vkGetDeviceQueue(VkDevice device, uint32_t family_index, uint32_t queu { VkDeviceQueueInfo2 queue_info; - TRACE("%p, %u, %u, %p\n", device, family_index, queue_index, queue); - queue_info.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_INFO_2; queue_info.pNext = NULL; queue_info.flags = 0; @@ -1093,8 +1075,6 @@ void wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *info, VkQ { const VkBaseInStructure *chain; - TRACE("%p, %p, %p\n", device, info, queue); - if ((chain = info->pNext)) FIXME("Ignoring a linked structure of type %u.\n", chain->sType); @@ -1110,8 +1090,6 @@ VkResult wine_vkCreateCommandPool(VkDevice device_handle, const VkCommandPoolCre struct wine_cmd_pool *object; VkResult res; - TRACE("%p, %p, %p, %p\n", device, info, allocator, command_pool); - if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); @@ -1142,8 +1120,6 @@ void wine_vkDestroyCommandPool(VkDevice device_handle, VkCommandPool handle, struct wine_device *device = wine_device_from_handle(device_handle); struct wine_cmd_pool *pool = wine_cmd_pool_from_handle(handle); - TRACE("%p, 0x%s, %p\n", device, wine_dbgstr_longlong(handle), allocator); - if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); @@ -1185,7 +1161,6 @@ VkResult wine_vkEnumeratePhysicalDeviceGroups(VkInstance handle, uint32_t *count { struct wine_instance *instance = wine_instance_from_handle(handle); - TRACE("%p, %p, %p\n", instance, count, properties); return wine_vk_enumerate_physical_device_groups(instance, instance->funcs.p_vkEnumeratePhysicalDeviceGroups, count, properties); } @@ -1195,7 +1170,6 @@ VkResult wine_vkEnumeratePhysicalDeviceGroupsKHR(VkInstance handle, uint32_t *co { struct wine_instance *instance = wine_instance_from_handle(handle); - TRACE("%p, %p, %p\n", instance, count, properties); return wine_vk_enumerate_physical_device_groups(instance, instance->funcs.p_vkEnumeratePhysicalDeviceGroupsKHR, count, properties); } @@ -1204,7 +1178,6 @@ void wine_vkGetPhysicalDeviceExternalFenceProperties(VkPhysicalDevice phys_dev, const VkPhysicalDeviceExternalFenceInfo *fence_info, VkExternalFenceProperties *properties) { - TRACE("%p, %p, %p\n", phys_dev, fence_info, properties); properties->exportFromImportedHandleTypes = 0; properties->compatibleHandleTypes = 0; properties->externalFenceFeatures = 0; @@ -1214,7 +1187,6 @@ void wine_vkGetPhysicalDeviceExternalFencePropertiesKHR(VkPhysicalDevice phys_de const VkPhysicalDeviceExternalFenceInfo *fence_info, VkExternalFenceProperties *properties) { - TRACE("%p, %p, %p\n", phys_dev, fence_info, properties); properties->exportFromImportedHandleTypes = 0; properties->compatibleHandleTypes = 0; properties->externalFenceFeatures = 0; @@ -1224,7 +1196,6 @@ void wine_vkGetPhysicalDeviceExternalBufferProperties(VkPhysicalDevice phys_dev, const VkPhysicalDeviceExternalBufferInfo *buffer_info, VkExternalBufferProperties *properties) { - TRACE("%p, %p, %p\n", phys_dev, buffer_info, properties); memset(&properties->externalMemoryProperties, 0, sizeof(properties->externalMemoryProperties)); } @@ -1232,7 +1203,6 @@ void wine_vkGetPhysicalDeviceExternalBufferPropertiesKHR(VkPhysicalDevice phys_d const VkPhysicalDeviceExternalBufferInfo *buffer_info, VkExternalBufferProperties *properties) { - TRACE("%p, %p, %p\n", phys_dev, buffer_info, properties); memset(&properties->externalMemoryProperties, 0, sizeof(properties->externalMemoryProperties)); } @@ -1243,8 +1213,6 @@ VkResult wine_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice phys_de VkExternalImageFormatProperties *external_image_properties; VkResult res; - TRACE("%p, %p, %p\n", phys_dev, format_info, properties); - res = thunk_vkGetPhysicalDeviceImageFormatProperties2(phys_dev, format_info, properties); if ((external_image_properties = wine_vk_find_struct(properties, EXTERNAL_IMAGE_FORMAT_PROPERTIES))) @@ -1265,8 +1233,6 @@ VkResult wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice phys VkExternalImageFormatProperties *external_image_properties; VkResult res; - TRACE("%p, %p, %p\n", phys_dev, format_info, properties); - res = thunk_vkGetPhysicalDeviceImageFormatProperties2KHR(phys_dev, format_info, properties); if ((external_image_properties = wine_vk_find_struct(properties, EXTERNAL_IMAGE_FORMAT_PROPERTIES))) @@ -1372,8 +1338,6 @@ VkResult wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDevice ha unsigned int i; VkResult res; - TRACE("%p, %p, %p\n", phys_dev, time_domain_count, time_domains); - /* Find out the time domains supported on the host */ res = phys_dev->instance->funcs.p_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(phys_dev->phys_dev, &host_time_domain_count, NULL); if (res != VK_SUCCESS) @@ -1436,7 +1400,6 @@ void wine_vkGetPhysicalDeviceExternalSemaphoreProperties(VkPhysicalDevice phys_d const VkPhysicalDeviceExternalSemaphoreInfo *info, VkExternalSemaphoreProperties *properties) { - TRACE("%p, %p, %p\n", phys_dev, info, properties); properties->exportFromImportedHandleTypes = 0; properties->compatibleHandleTypes = 0; properties->externalSemaphoreFeatures = 0; @@ -1446,7 +1409,6 @@ void wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(VkPhysicalDevice phy const VkPhysicalDeviceExternalSemaphoreInfo *info, VkExternalSemaphoreProperties *properties) { - TRACE("%p, %p, %p\n", phys_dev, info, properties); properties->exportFromImportedHandleTypes = 0; properties->compatibleHandleTypes = 0; properties->externalSemaphoreFeatures = 0; @@ -1459,8 +1421,6 @@ VkResult wine_vkCreateWin32SurfaceKHR(VkInstance handle, const VkWin32SurfaceCre struct wine_surface *object; VkResult res; - TRACE("%p, %p, %p, %p\n", instance, createInfo, allocator, surface); - if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); @@ -1492,8 +1452,6 @@ void wine_vkDestroySurfaceKHR(VkInstance handle, VkSurfaceKHR surface, struct wine_instance *instance = wine_instance_from_handle(handle); struct wine_surface *object = wine_surface_from_handle(surface); - TRACE("%p, 0x%s, %p\n", instance, wine_dbgstr_longlong(surface), allocator); - if (!object) return; @@ -1524,8 +1482,6 @@ VkResult wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice handle, struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(handle); VkResult res; - TRACE("%p, 0x%s, %p\n", phys_dev, wine_dbgstr_longlong(surface), capabilities); - res = thunk_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(phys_dev->handle, surface, capabilities); if (res == VK_SUCCESS) @@ -1541,8 +1497,6 @@ VkResult wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice handle struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(handle); VkResult res; - TRACE("%p, %p, %p\n", phys_dev, surface_info, capabilities); - res = thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(phys_dev->handle, surface_info, capabilities); if (res == VK_SUCCESS) @@ -1561,8 +1515,6 @@ VkResult wine_vkCreateDebugUtilsMessengerEXT(VkInstance handle, struct wine_debug_utils_messenger *object; VkResult res; - TRACE("%p, %p, %p, %p\n", instance, create_info, allocator, messenger); - if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); @@ -1598,8 +1550,6 @@ void wine_vkDestroyDebugUtilsMessengerEXT(VkInstance handle, VkDebugUtilsMesseng struct wine_instance *instance = wine_instance_from_handle(handle); struct wine_debug_utils_messenger *object; - TRACE("%p, 0x%s, %p\n", instance, wine_dbgstr_longlong(messenger), allocator); - object = wine_debug_utils_messenger_from_handle(messenger); if (!object) @@ -1621,8 +1571,6 @@ VkResult wine_vkCreateDebugReportCallbackEXT(VkInstance handle, struct wine_debug_report_callback *object; VkResult res; - TRACE("%p, %p, %p, %p\n", instance, create_info, allocator, callback); - if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); @@ -1658,8 +1606,6 @@ void wine_vkDestroyDebugReportCallbackEXT(VkInstance handle, VkDebugReportCallba struct wine_instance *instance = wine_instance_from_handle(handle); struct wine_debug_report_callback *object; - TRACE("%p, 0x%s, %p\n", instance, wine_dbgstr_longlong(callback), allocator); - object = wine_debug_report_callback_from_handle(callback); if (!object) @@ -1713,9 +1659,6 @@ VkResult wine_vkCreateComputePipelines(VkDevice device, VkPipelineCache pipeline VkResult res; uint32_t i; - TRACE("%p, 0x%s, %u, %p, %p, %p\n", device, wine_dbgstr_longlong(pipeline_cache), - count, create_infos, allocator, pipelines); - res = thunk_vkCreateComputePipelines(device, pipeline_cache, count, create_infos, allocator, pipelines); @@ -1732,9 +1675,6 @@ VkResult wine_vkCreateGraphicsPipelines(VkDevice device, VkPipelineCache pipelin VkResult res; uint32_t i; - TRACE("%p, 0x%s, %u, %p, %p, %p\n", device, wine_dbgstr_longlong(pipeline_cache), - count, create_infos, allocator, pipelines); - res = thunk_vkCreateGraphicsPipelines(device, pipeline_cache, count, create_infos, allocator, pipelines); @@ -1752,9 +1692,6 @@ VkResult wine_vkCreateRayTracingPipelinesKHR(VkDevice device, VkDeferredOperatio VkResult res; uint32_t i; - TRACE("%p, 0x%s, 0x%s, %u, %p, %p, %p\n", device, wine_dbgstr_longlong(deferred_operation), - wine_dbgstr_longlong(pipeline_cache), count, create_infos, allocator, pipelines); - res = thunk_vkCreateRayTracingPipelinesKHR(device, deferred_operation, pipeline_cache, count, create_infos, allocator, pipelines); @@ -1771,9 +1708,6 @@ VkResult wine_vkCreateRayTracingPipelinesNV(VkDevice device, VkPipelineCache pip VkResult res; uint32_t i; - TRACE("%p, 0x%s, %u, %p, %p, %p\n", device, wine_dbgstr_longlong(pipeline_cache), - count, create_infos, allocator, pipelines); - res = thunk_vkCreateRayTracingPipelinesNV(device, pipeline_cache, count, create_infos, allocator, pipelines); diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 54bdb35b65e..b7c2d5d2625 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -5392,6 +5392,8 @@ static NTSTATUS thunk64_vkAllocateCommandBuffers(void *args) { struct vkAllocateCommandBuffers_params *params = args; VkResult result; + TRACE("%p, %p, %p\n", params->device, params->pAllocateInfo, params->pCommandBuffers); + result = wine_vkAllocateCommandBuffers(params->device, params->pAllocateInfo, params->pCommandBuffers); return result; } @@ -5402,6 +5404,8 @@ static NTSTATUS thunk32_vkAllocateCommandBuffers(void *args) { struct vkAllocateCommandBuffers_params *params = args; VkResult result; + TRACE("%p, %p, %p\n", params->device, params->pAllocateInfo, params->pCommandBuffers); + result = wine_vkAllocateCommandBuffers(params->device, params->pAllocateInfo, params->pCommandBuffers); return result; } @@ -10408,6 +10412,8 @@ static NTSTATUS thunk64_vkCreateCommandPool(void *args) { struct vkCreateCommandPool_params *params = args; VkResult result; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pCommandPool); + result = wine_vkCreateCommandPool(params->device, params->pCreateInfo, params->pAllocator, params->pCommandPool, params->client_ptr); return result; } @@ -10418,6 +10424,8 @@ static NTSTATUS thunk32_vkCreateCommandPool(void *args) { struct vkCreateCommandPool_params *params = args; VkResult result; + TRACE("%p, %p, %p, %p\n", params->device, params->pCreateInfo, params->pAllocator, params->pCommandPool); + result = wine_vkCreateCommandPool(params->device, params->pCreateInfo, params->pAllocator, params->pCommandPool, params->client_ptr); return result; } @@ -10437,6 +10445,8 @@ static NTSTATUS thunk64_vkCreateComputePipelines(void *args) { struct vkCreateComputePipelines_params *params = args; VkResult result; + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + result = wine_vkCreateComputePipelines(params->device, params->pipelineCache, params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); return result; } @@ -10457,6 +10467,8 @@ static NTSTATUS thunk32_vkCreateComputePipelines(void *args) { struct vkCreateComputePipelines_params *params = args; VkResult result; + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + result = wine_vkCreateComputePipelines(params->device, params->pipelineCache, params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); return result; } @@ -10523,6 +10535,8 @@ static NTSTATUS thunk64_vkCreateDebugReportCallbackEXT(void *args) { struct vkCreateDebugReportCallbackEXT_params *params = args; VkResult result; + TRACE("%p, %p, %p, %p\n", params->instance, params->pCreateInfo, params->pAllocator, params->pCallback); + result = wine_vkCreateDebugReportCallbackEXT(params->instance, params->pCreateInfo, params->pAllocator, params->pCallback); return result; } @@ -10533,6 +10547,8 @@ static NTSTATUS thunk32_vkCreateDebugReportCallbackEXT(void *args) { struct vkCreateDebugReportCallbackEXT_params *params = args; VkResult result; + TRACE("%p, %p, %p, %p\n", params->instance, params->pCreateInfo, params->pAllocator, params->pCallback); + result = wine_vkCreateDebugReportCallbackEXT(params->instance, params->pCreateInfo, params->pAllocator, params->pCallback); return result; } @@ -10545,6 +10561,8 @@ static NTSTATUS thunk64_vkCreateDebugUtilsMessengerEXT(void *args) { struct vkCreateDebugUtilsMessengerEXT_params *params = args; VkResult result; + TRACE("%p, %p, %p, %p\n", params->instance, params->pCreateInfo, params->pAllocator, params->pMessenger); + result = wine_vkCreateDebugUtilsMessengerEXT(params->instance, params->pCreateInfo, params->pAllocator, params->pMessenger); return result; } @@ -10555,6 +10573,8 @@ static NTSTATUS thunk32_vkCreateDebugUtilsMessengerEXT(void *args) { struct vkCreateDebugUtilsMessengerEXT_params *params = args; VkResult result; + TRACE("%p, %p, %p, %p\n", params->instance, params->pCreateInfo, params->pAllocator, params->pMessenger); + result = wine_vkCreateDebugUtilsMessengerEXT(params->instance, params->pCreateInfo, params->pAllocator, params->pMessenger); return result; } @@ -10701,6 +10721,8 @@ static NTSTATUS thunk64_vkCreateDevice(void *args) { struct vkCreateDevice_params *params = args; VkResult result; + TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pCreateInfo, params->pAllocator, params->pDevice); + result = wine_vkCreateDevice(params->physicalDevice, params->pCreateInfo, params->pAllocator, params->pDevice, params->client_ptr); return result; } @@ -10711,6 +10733,8 @@ static NTSTATUS thunk32_vkCreateDevice(void *args) { struct vkCreateDevice_params *params = args; VkResult result; + TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pCreateInfo, params->pAllocator, params->pDevice); + result = wine_vkCreateDevice(params->physicalDevice, params->pCreateInfo, params->pAllocator, params->pDevice, params->client_ptr); return result; } @@ -10810,6 +10834,8 @@ static NTSTATUS thunk64_vkCreateGraphicsPipelines(void *args) { struct vkCreateGraphicsPipelines_params *params = args; VkResult result; + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + result = wine_vkCreateGraphicsPipelines(params->device, params->pipelineCache, params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); return result; } @@ -10830,6 +10856,8 @@ static NTSTATUS thunk32_vkCreateGraphicsPipelines(void *args) { struct vkCreateGraphicsPipelines_params *params = args; VkResult result; + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + result = wine_vkCreateGraphicsPipelines(params->device, params->pipelineCache, params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); return result; } @@ -10925,6 +10953,8 @@ static NTSTATUS thunk64_vkCreateInstance(void *args) { struct vkCreateInstance_params *params = args; VkResult result; + TRACE("%p, %p, %p\n", params->pCreateInfo, params->pAllocator, params->pInstance); + result = wine_vkCreateInstance(params->pCreateInfo, params->pAllocator, params->pInstance, params->client_ptr); return result; } @@ -10935,6 +10965,8 @@ static NTSTATUS thunk32_vkCreateInstance(void *args) { struct vkCreateInstance_params *params = args; VkResult result; + TRACE("%p, %p, %p\n", params->pCreateInfo, params->pAllocator, params->pInstance); + result = wine_vkCreateInstance(params->pCreateInfo, params->pAllocator, params->pInstance, params->client_ptr); return result; } @@ -11084,6 +11116,8 @@ static NTSTATUS thunk64_vkCreateRayTracingPipelinesKHR(void *args) { struct vkCreateRayTracingPipelinesKHR_params *params = args; VkResult result; + TRACE("%p, 0x%s, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), wine_dbgstr_longlong(params->pipelineCache), params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + result = wine_vkCreateRayTracingPipelinesKHR(params->device, params->deferredOperation, params->pipelineCache, params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); return result; } @@ -11104,6 +11138,8 @@ static NTSTATUS thunk32_vkCreateRayTracingPipelinesKHR(void *args) { struct vkCreateRayTracingPipelinesKHR_params *params = args; VkResult result; + TRACE("%p, 0x%s, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->deferredOperation), wine_dbgstr_longlong(params->pipelineCache), params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + result = wine_vkCreateRayTracingPipelinesKHR(params->device, params->deferredOperation, params->pipelineCache, params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); return result; } @@ -11123,6 +11159,8 @@ static NTSTATUS thunk64_vkCreateRayTracingPipelinesNV(void *args) { struct vkCreateRayTracingPipelinesNV_params *params = args; VkResult result; + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + result = wine_vkCreateRayTracingPipelinesNV(params->device, params->pipelineCache, params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); return result; } @@ -11143,6 +11181,8 @@ static NTSTATUS thunk32_vkCreateRayTracingPipelinesNV(void *args) { struct vkCreateRayTracingPipelinesNV_params *params = args; VkResult result; + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + result = wine_vkCreateRayTracingPipelinesNV(params->device, params->pipelineCache, params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); return result; } @@ -11419,6 +11459,8 @@ static NTSTATUS thunk64_vkCreateWin32SurfaceKHR(void *args) { struct vkCreateWin32SurfaceKHR_params *params = args; VkResult result; + TRACE("%p, %p, %p, %p\n", params->instance, params->pCreateInfo, params->pAllocator, params->pSurface); + result = wine_vkCreateWin32SurfaceKHR(params->instance, params->pCreateInfo, params->pAllocator, params->pSurface); return result; } @@ -11429,6 +11471,8 @@ static NTSTATUS thunk32_vkCreateWin32SurfaceKHR(void *args) { struct vkCreateWin32SurfaceKHR_params *params = args; VkResult result; + TRACE("%p, %p, %p, %p\n", params->instance, params->pCreateInfo, params->pAllocator, params->pSurface); + result = wine_vkCreateWin32SurfaceKHR(params->instance, params->pCreateInfo, params->pAllocator, params->pSurface); return result; } @@ -11646,6 +11690,8 @@ static NTSTATUS thunk32_vkDestroyBufferView(void *args) static NTSTATUS thunk64_vkDestroyCommandPool(void *args) { struct vkDestroyCommandPool_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->commandPool), params->pAllocator); + wine_vkDestroyCommandPool(params->device, params->commandPool, params->pAllocator); return STATUS_SUCCESS; } @@ -11655,6 +11701,8 @@ static NTSTATUS thunk64_vkDestroyCommandPool(void *args) static NTSTATUS thunk32_vkDestroyCommandPool(void *args) { struct vkDestroyCommandPool_params *params = args; + TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->commandPool), params->pAllocator); + wine_vkDestroyCommandPool(params->device, params->commandPool, params->pAllocator); return STATUS_SUCCESS; } @@ -11714,6 +11762,8 @@ static NTSTATUS thunk32_vkDestroyCuModuleNVX(void *args) static NTSTATUS thunk64_vkDestroyDebugReportCallbackEXT(void *args) { struct vkDestroyDebugReportCallbackEXT_params *params = args; + TRACE("%p, 0x%s, %p\n", params->instance, wine_dbgstr_longlong(params->callback), params->pAllocator); + wine_vkDestroyDebugReportCallbackEXT(params->instance, params->callback, params->pAllocator); return STATUS_SUCCESS; } @@ -11723,6 +11773,8 @@ static NTSTATUS thunk64_vkDestroyDebugReportCallbackEXT(void *args) static NTSTATUS thunk32_vkDestroyDebugReportCallbackEXT(void *args) { struct vkDestroyDebugReportCallbackEXT_params *params = args; + TRACE("%p, 0x%s, %p\n", params->instance, wine_dbgstr_longlong(params->callback), params->pAllocator); + wine_vkDestroyDebugReportCallbackEXT(params->instance, params->callback, params->pAllocator); return STATUS_SUCCESS; } @@ -11734,6 +11786,8 @@ static NTSTATUS thunk32_vkDestroyDebugReportCallbackEXT(void *args) static NTSTATUS thunk64_vkDestroyDebugUtilsMessengerEXT(void *args) { struct vkDestroyDebugUtilsMessengerEXT_params *params = args; + TRACE("%p, 0x%s, %p\n", params->instance, wine_dbgstr_longlong(params->messenger), params->pAllocator); + wine_vkDestroyDebugUtilsMessengerEXT(params->instance, params->messenger, params->pAllocator); return STATUS_SUCCESS; } @@ -11743,6 +11797,8 @@ static NTSTATUS thunk64_vkDestroyDebugUtilsMessengerEXT(void *args) static NTSTATUS thunk32_vkDestroyDebugUtilsMessengerEXT(void *args) { struct vkDestroyDebugUtilsMessengerEXT_params *params = args; + TRACE("%p, 0x%s, %p\n", params->instance, wine_dbgstr_longlong(params->messenger), params->pAllocator); + wine_vkDestroyDebugUtilsMessengerEXT(params->instance, params->messenger, params->pAllocator); return STATUS_SUCCESS; } @@ -11874,6 +11930,8 @@ static NTSTATUS thunk32_vkDestroyDescriptorUpdateTemplateKHR(void *args) static NTSTATUS thunk64_vkDestroyDevice(void *args) { struct vkDestroyDevice_params *params = args; + TRACE("%p, %p\n", params->device, params->pAllocator); + wine_vkDestroyDevice(params->device, params->pAllocator); return STATUS_SUCCESS; } @@ -11883,6 +11941,8 @@ static NTSTATUS thunk64_vkDestroyDevice(void *args) static NTSTATUS thunk32_vkDestroyDevice(void *args) { struct vkDestroyDevice_params *params = args; + TRACE("%p, %p\n", params->device, params->pAllocator); + wine_vkDestroyDevice(params->device, params->pAllocator); return STATUS_SUCCESS; } @@ -12038,6 +12098,8 @@ static NTSTATUS thunk32_vkDestroyIndirectCommandsLayoutNV(void *args) static NTSTATUS thunk64_vkDestroyInstance(void *args) { struct vkDestroyInstance_params *params = args; + TRACE("%p, %p\n", params->instance, params->pAllocator); + wine_vkDestroyInstance(params->instance, params->pAllocator); return STATUS_SUCCESS; } @@ -12047,6 +12109,8 @@ static NTSTATUS thunk64_vkDestroyInstance(void *args) static NTSTATUS thunk32_vkDestroyInstance(void *args) { struct vkDestroyInstance_params *params = args; + TRACE("%p, %p\n", params->instance, params->pAllocator); + wine_vkDestroyInstance(params->instance, params->pAllocator); return STATUS_SUCCESS; } @@ -12346,6 +12410,8 @@ static NTSTATUS thunk32_vkDestroyShaderModule(void *args) static NTSTATUS thunk64_vkDestroySurfaceKHR(void *args) { struct vkDestroySurfaceKHR_params *params = args; + TRACE("%p, 0x%s, %p\n", params->instance, wine_dbgstr_longlong(params->surface), params->pAllocator); + wine_vkDestroySurfaceKHR(params->instance, params->surface, params->pAllocator); return STATUS_SUCCESS; } @@ -12355,6 +12421,8 @@ static NTSTATUS thunk64_vkDestroySurfaceKHR(void *args) static NTSTATUS thunk32_vkDestroySurfaceKHR(void *args) { struct vkDestroySurfaceKHR_params *params = args; + TRACE("%p, 0x%s, %p\n", params->instance, wine_dbgstr_longlong(params->surface), params->pAllocator); + wine_vkDestroySurfaceKHR(params->instance, params->surface, params->pAllocator); return STATUS_SUCCESS; } @@ -12467,6 +12535,8 @@ static NTSTATUS thunk64_vkEnumerateDeviceExtensionProperties(void *args) { struct vkEnumerateDeviceExtensionProperties_params *params = args; VkResult result; + TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pLayerName, params->pPropertyCount, params->pProperties); + result = wine_vkEnumerateDeviceExtensionProperties(params->physicalDevice, params->pLayerName, params->pPropertyCount, params->pProperties); return result; } @@ -12477,6 +12547,8 @@ static NTSTATUS thunk32_vkEnumerateDeviceExtensionProperties(void *args) { struct vkEnumerateDeviceExtensionProperties_params *params = args; VkResult result; + TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pLayerName, params->pPropertyCount, params->pProperties); + result = wine_vkEnumerateDeviceExtensionProperties(params->physicalDevice, params->pLayerName, params->pPropertyCount, params->pProperties); return result; } @@ -12489,6 +12561,8 @@ static NTSTATUS thunk64_vkEnumerateDeviceLayerProperties(void *args) { struct vkEnumerateDeviceLayerProperties_params *params = args; VkResult result; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pPropertyCount, params->pProperties); + result = wine_vkEnumerateDeviceLayerProperties(params->physicalDevice, params->pPropertyCount, params->pProperties); return result; } @@ -12499,6 +12573,8 @@ static NTSTATUS thunk32_vkEnumerateDeviceLayerProperties(void *args) { struct vkEnumerateDeviceLayerProperties_params *params = args; VkResult result; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pPropertyCount, params->pProperties); + result = wine_vkEnumerateDeviceLayerProperties(params->physicalDevice, params->pPropertyCount, params->pProperties); return result; } @@ -12511,6 +12587,8 @@ static NTSTATUS thunk64_vkEnumerateInstanceExtensionProperties(void *args) { struct vkEnumerateInstanceExtensionProperties_params *params = args; VkResult result; + TRACE("%p, %p, %p\n", params->pLayerName, params->pPropertyCount, params->pProperties); + result = wine_vkEnumerateInstanceExtensionProperties(params->pLayerName, params->pPropertyCount, params->pProperties); return result; } @@ -12521,6 +12599,8 @@ static NTSTATUS thunk32_vkEnumerateInstanceExtensionProperties(void *args) { struct vkEnumerateInstanceExtensionProperties_params *params = args; VkResult result; + TRACE("%p, %p, %p\n", params->pLayerName, params->pPropertyCount, params->pProperties); + result = wine_vkEnumerateInstanceExtensionProperties(params->pLayerName, params->pPropertyCount, params->pProperties); return result; } @@ -12533,6 +12613,8 @@ static NTSTATUS thunk64_vkEnumerateInstanceVersion(void *args) { struct vkEnumerateInstanceVersion_params *params = args; VkResult result; + TRACE("%p\n", params->pApiVersion); + result = wine_vkEnumerateInstanceVersion(params->pApiVersion); return result; } @@ -12543,6 +12625,8 @@ static NTSTATUS thunk32_vkEnumerateInstanceVersion(void *args) { struct vkEnumerateInstanceVersion_params *params = args; VkResult result; + TRACE("%p\n", params->pApiVersion); + result = wine_vkEnumerateInstanceVersion(params->pApiVersion); return result; } @@ -12555,6 +12639,8 @@ static NTSTATUS thunk64_vkEnumeratePhysicalDeviceGroups(void *args) { struct vkEnumeratePhysicalDeviceGroups_params *params = args; VkResult result; + TRACE("%p, %p, %p\n", params->instance, params->pPhysicalDeviceGroupCount, params->pPhysicalDeviceGroupProperties); + result = wine_vkEnumeratePhysicalDeviceGroups(params->instance, params->pPhysicalDeviceGroupCount, params->pPhysicalDeviceGroupProperties); return result; } @@ -12565,6 +12651,8 @@ static NTSTATUS thunk32_vkEnumeratePhysicalDeviceGroups(void *args) { struct vkEnumeratePhysicalDeviceGroups_params *params = args; VkResult result; + TRACE("%p, %p, %p\n", params->instance, params->pPhysicalDeviceGroupCount, params->pPhysicalDeviceGroupProperties); + result = wine_vkEnumeratePhysicalDeviceGroups(params->instance, params->pPhysicalDeviceGroupCount, params->pPhysicalDeviceGroupProperties); return result; } @@ -12577,6 +12665,8 @@ static NTSTATUS thunk64_vkEnumeratePhysicalDeviceGroupsKHR(void *args) { struct vkEnumeratePhysicalDeviceGroupsKHR_params *params = args; VkResult result; + TRACE("%p, %p, %p\n", params->instance, params->pPhysicalDeviceGroupCount, params->pPhysicalDeviceGroupProperties); + result = wine_vkEnumeratePhysicalDeviceGroupsKHR(params->instance, params->pPhysicalDeviceGroupCount, params->pPhysicalDeviceGroupProperties); return result; } @@ -12587,6 +12677,8 @@ static NTSTATUS thunk32_vkEnumeratePhysicalDeviceGroupsKHR(void *args) { struct vkEnumeratePhysicalDeviceGroupsKHR_params *params = args; VkResult result; + TRACE("%p, %p, %p\n", params->instance, params->pPhysicalDeviceGroupCount, params->pPhysicalDeviceGroupProperties); + result = wine_vkEnumeratePhysicalDeviceGroupsKHR(params->instance, params->pPhysicalDeviceGroupCount, params->pPhysicalDeviceGroupProperties); return result; } @@ -12625,6 +12717,8 @@ static NTSTATUS thunk64_vkEnumeratePhysicalDevices(void *args) { struct vkEnumeratePhysicalDevices_params *params = args; VkResult result; + TRACE("%p, %p, %p\n", params->instance, params->pPhysicalDeviceCount, params->pPhysicalDevices); + result = wine_vkEnumeratePhysicalDevices(params->instance, params->pPhysicalDeviceCount, params->pPhysicalDevices); return result; } @@ -12635,6 +12729,8 @@ static NTSTATUS thunk32_vkEnumeratePhysicalDevices(void *args) { struct vkEnumeratePhysicalDevices_params *params = args; VkResult result; + TRACE("%p, %p, %p\n", params->instance, params->pPhysicalDeviceCount, params->pPhysicalDevices); + result = wine_vkEnumeratePhysicalDevices(params->instance, params->pPhysicalDeviceCount, params->pPhysicalDevices); return result; } @@ -12675,6 +12771,8 @@ static NTSTATUS thunk32_vkFlushMappedMemoryRanges(void *args) static NTSTATUS thunk64_vkFreeCommandBuffers(void *args) { struct vkFreeCommandBuffers_params *params = args; + TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->commandPool), params->commandBufferCount, params->pCommandBuffers); + wine_vkFreeCommandBuffers(params->device, params->commandPool, params->commandBufferCount, params->pCommandBuffers); return STATUS_SUCCESS; } @@ -12684,6 +12782,8 @@ static NTSTATUS thunk64_vkFreeCommandBuffers(void *args) static NTSTATUS thunk32_vkFreeCommandBuffers(void *args) { struct vkFreeCommandBuffers_params *params = args; + TRACE("%p, 0x%s, %u, %p\n", params->device, wine_dbgstr_longlong(params->commandPool), params->commandBufferCount, params->pCommandBuffers); + wine_vkFreeCommandBuffers(params->device, params->commandPool, params->commandBufferCount, params->pCommandBuffers); return STATUS_SUCCESS; } @@ -13069,6 +13169,8 @@ static NTSTATUS thunk64_vkGetCalibratedTimestampsEXT(void *args) { struct vkGetCalibratedTimestampsEXT_params *params = args; VkResult result; + TRACE("%p, %u, %p, %p, %p\n", params->device, params->timestampCount, params->pTimestampInfos, params->pTimestamps, params->pMaxDeviation); + result = wine_vkGetCalibratedTimestampsEXT(params->device, params->timestampCount, params->pTimestampInfos, params->pTimestamps, params->pMaxDeviation); return result; } @@ -13079,6 +13181,8 @@ static NTSTATUS thunk32_vkGetCalibratedTimestampsEXT(void *args) { struct vkGetCalibratedTimestampsEXT_params *params = args; VkResult result; + TRACE("%p, %u, %p, %p, %p\n", params->device, params->timestampCount, params->pTimestampInfos, params->pTimestamps, params->pMaxDeviation); + result = wine_vkGetCalibratedTimestampsEXT(params->device, params->timestampCount, params->pTimestampInfos, params->pTimestamps, params->pMaxDeviation); return result; } @@ -13602,6 +13706,8 @@ static NTSTATUS thunk32_vkGetDeviceMemoryOpaqueCaptureAddressKHR(void *args) static NTSTATUS thunk64_vkGetDeviceQueue(void *args) { struct vkGetDeviceQueue_params *params = args; + TRACE("%p, %u, %u, %p\n", params->device, params->queueFamilyIndex, params->queueIndex, params->pQueue); + wine_vkGetDeviceQueue(params->device, params->queueFamilyIndex, params->queueIndex, params->pQueue); return STATUS_SUCCESS; } @@ -13611,6 +13717,8 @@ static NTSTATUS thunk64_vkGetDeviceQueue(void *args) static NTSTATUS thunk32_vkGetDeviceQueue(void *args) { struct vkGetDeviceQueue_params *params = args; + TRACE("%p, %u, %u, %p\n", params->device, params->queueFamilyIndex, params->queueIndex, params->pQueue); + wine_vkGetDeviceQueue(params->device, params->queueFamilyIndex, params->queueIndex, params->pQueue); return STATUS_SUCCESS; } @@ -13622,6 +13730,8 @@ static NTSTATUS thunk32_vkGetDeviceQueue(void *args) static NTSTATUS thunk64_vkGetDeviceQueue2(void *args) { struct vkGetDeviceQueue2_params *params = args; + TRACE("%p, %p, %p\n", params->device, params->pQueueInfo, params->pQueue); + wine_vkGetDeviceQueue2(params->device, params->pQueueInfo, params->pQueue); return STATUS_SUCCESS; } @@ -13631,6 +13741,8 @@ static NTSTATUS thunk64_vkGetDeviceQueue2(void *args) static NTSTATUS thunk32_vkGetDeviceQueue2(void *args) { struct vkGetDeviceQueue2_params *params = args; + TRACE("%p, %p, %p\n", params->device, params->pQueueInfo, params->pQueue); + wine_vkGetDeviceQueue2(params->device, params->pQueueInfo, params->pQueue); return STATUS_SUCCESS; } @@ -14127,6 +14239,8 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(void *arg { struct vkGetPhysicalDeviceCalibrateableTimeDomainsEXT_params *params = args; VkResult result; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pTimeDomainCount, params->pTimeDomains); + result = wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(params->physicalDevice, params->pTimeDomainCount, params->pTimeDomains); return result; } @@ -14137,6 +14251,8 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(void *arg { struct vkGetPhysicalDeviceCalibrateableTimeDomainsEXT_params *params = args; VkResult result; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pTimeDomainCount, params->pTimeDomains); + result = wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(params->physicalDevice, params->pTimeDomainCount, params->pTimeDomains); return result; } @@ -14174,6 +14290,8 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(void *a static NTSTATUS thunk64_vkGetPhysicalDeviceExternalBufferProperties(void *args) { struct vkGetPhysicalDeviceExternalBufferProperties_params *params = args; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pExternalBufferInfo, params->pExternalBufferProperties); + wine_vkGetPhysicalDeviceExternalBufferProperties(params->physicalDevice, params->pExternalBufferInfo, params->pExternalBufferProperties); return STATUS_SUCCESS; } @@ -14183,6 +14301,8 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceExternalBufferProperties(void *args) static NTSTATUS thunk32_vkGetPhysicalDeviceExternalBufferProperties(void *args) { struct vkGetPhysicalDeviceExternalBufferProperties_params *params = args; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pExternalBufferInfo, params->pExternalBufferProperties); + wine_vkGetPhysicalDeviceExternalBufferProperties(params->physicalDevice, params->pExternalBufferInfo, params->pExternalBufferProperties); return STATUS_SUCCESS; } @@ -14194,6 +14314,8 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceExternalBufferProperties(void *args) static NTSTATUS thunk64_vkGetPhysicalDeviceExternalBufferPropertiesKHR(void *args) { struct vkGetPhysicalDeviceExternalBufferPropertiesKHR_params *params = args; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pExternalBufferInfo, params->pExternalBufferProperties); + wine_vkGetPhysicalDeviceExternalBufferPropertiesKHR(params->physicalDevice, params->pExternalBufferInfo, params->pExternalBufferProperties); return STATUS_SUCCESS; } @@ -14203,6 +14325,8 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceExternalBufferPropertiesKHR(void *arg static NTSTATUS thunk32_vkGetPhysicalDeviceExternalBufferPropertiesKHR(void *args) { struct vkGetPhysicalDeviceExternalBufferPropertiesKHR_params *params = args; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pExternalBufferInfo, params->pExternalBufferProperties); + wine_vkGetPhysicalDeviceExternalBufferPropertiesKHR(params->physicalDevice, params->pExternalBufferInfo, params->pExternalBufferProperties); return STATUS_SUCCESS; } @@ -14214,6 +14338,8 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceExternalBufferPropertiesKHR(void *arg static NTSTATUS thunk64_vkGetPhysicalDeviceExternalFenceProperties(void *args) { struct vkGetPhysicalDeviceExternalFenceProperties_params *params = args; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pExternalFenceInfo, params->pExternalFenceProperties); + wine_vkGetPhysicalDeviceExternalFenceProperties(params->physicalDevice, params->pExternalFenceInfo, params->pExternalFenceProperties); return STATUS_SUCCESS; } @@ -14223,6 +14349,8 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceExternalFenceProperties(void *args) static NTSTATUS thunk32_vkGetPhysicalDeviceExternalFenceProperties(void *args) { struct vkGetPhysicalDeviceExternalFenceProperties_params *params = args; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pExternalFenceInfo, params->pExternalFenceProperties); + wine_vkGetPhysicalDeviceExternalFenceProperties(params->physicalDevice, params->pExternalFenceInfo, params->pExternalFenceProperties); return STATUS_SUCCESS; } @@ -14234,6 +14362,8 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceExternalFenceProperties(void *args) static NTSTATUS thunk64_vkGetPhysicalDeviceExternalFencePropertiesKHR(void *args) { struct vkGetPhysicalDeviceExternalFencePropertiesKHR_params *params = args; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pExternalFenceInfo, params->pExternalFenceProperties); + wine_vkGetPhysicalDeviceExternalFencePropertiesKHR(params->physicalDevice, params->pExternalFenceInfo, params->pExternalFenceProperties); return STATUS_SUCCESS; } @@ -14243,6 +14373,8 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceExternalFencePropertiesKHR(void *args static NTSTATUS thunk32_vkGetPhysicalDeviceExternalFencePropertiesKHR(void *args) { struct vkGetPhysicalDeviceExternalFencePropertiesKHR_params *params = args; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pExternalFenceInfo, params->pExternalFenceProperties); + wine_vkGetPhysicalDeviceExternalFencePropertiesKHR(params->physicalDevice, params->pExternalFenceInfo, params->pExternalFenceProperties); return STATUS_SUCCESS; } @@ -14254,6 +14386,8 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceExternalFencePropertiesKHR(void *args static NTSTATUS thunk64_vkGetPhysicalDeviceExternalSemaphoreProperties(void *args) { struct vkGetPhysicalDeviceExternalSemaphoreProperties_params *params = args; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pExternalSemaphoreInfo, params->pExternalSemaphoreProperties); + wine_vkGetPhysicalDeviceExternalSemaphoreProperties(params->physicalDevice, params->pExternalSemaphoreInfo, params->pExternalSemaphoreProperties); return STATUS_SUCCESS; } @@ -14263,6 +14397,8 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceExternalSemaphoreProperties(void *arg static NTSTATUS thunk32_vkGetPhysicalDeviceExternalSemaphoreProperties(void *args) { struct vkGetPhysicalDeviceExternalSemaphoreProperties_params *params = args; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pExternalSemaphoreInfo, params->pExternalSemaphoreProperties); + wine_vkGetPhysicalDeviceExternalSemaphoreProperties(params->physicalDevice, params->pExternalSemaphoreInfo, params->pExternalSemaphoreProperties); return STATUS_SUCCESS; } @@ -14274,6 +14410,8 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceExternalSemaphoreProperties(void *arg static NTSTATUS thunk64_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(void *args) { struct vkGetPhysicalDeviceExternalSemaphorePropertiesKHR_params *params = args; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pExternalSemaphoreInfo, params->pExternalSemaphoreProperties); + wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(params->physicalDevice, params->pExternalSemaphoreInfo, params->pExternalSemaphoreProperties); return STATUS_SUCCESS; } @@ -14283,6 +14421,8 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(void * static NTSTATUS thunk32_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(void *args) { struct vkGetPhysicalDeviceExternalSemaphorePropertiesKHR_params *params = args; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pExternalSemaphoreInfo, params->pExternalSemaphoreProperties); + wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(params->physicalDevice, params->pExternalSemaphoreInfo, params->pExternalSemaphoreProperties); return STATUS_SUCCESS; } @@ -14500,6 +14640,8 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceImageFormatProperties2(void *args) { struct vkGetPhysicalDeviceImageFormatProperties2_params *params = args; VkResult result; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pImageFormatInfo, params->pImageFormatProperties); + result = wine_vkGetPhysicalDeviceImageFormatProperties2(params->physicalDevice, params->pImageFormatInfo, params->pImageFormatProperties); return result; } @@ -14520,6 +14662,8 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceImageFormatProperties2(void *args) { struct vkGetPhysicalDeviceImageFormatProperties2_params *params = args; VkResult result; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pImageFormatInfo, params->pImageFormatProperties); + result = wine_vkGetPhysicalDeviceImageFormatProperties2(params->physicalDevice, params->pImageFormatInfo, params->pImageFormatProperties); return result; } @@ -14539,6 +14683,8 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceImageFormatProperties2KHR(void *args) { struct vkGetPhysicalDeviceImageFormatProperties2KHR_params *params = args; VkResult result; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pImageFormatInfo, params->pImageFormatProperties); + result = wine_vkGetPhysicalDeviceImageFormatProperties2KHR(params->physicalDevice, params->pImageFormatInfo, params->pImageFormatProperties); return result; } @@ -14559,6 +14705,8 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceImageFormatProperties2KHR(void *args) { struct vkGetPhysicalDeviceImageFormatProperties2KHR_params *params = args; VkResult result; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pImageFormatInfo, params->pImageFormatProperties); + result = wine_vkGetPhysicalDeviceImageFormatProperties2KHR(params->physicalDevice, params->pImageFormatInfo, params->pImageFormatProperties); return result; } @@ -14984,6 +15132,8 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSurfaceCapabilities2KHR(void *args) { struct vkGetPhysicalDeviceSurfaceCapabilities2KHR_params *params = args; VkResult result; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pSurfaceInfo, params->pSurfaceCapabilities); + result = wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(params->physicalDevice, params->pSurfaceInfo, params->pSurfaceCapabilities); return result; } @@ -15003,6 +15153,8 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceCapabilities2KHR(void *args) { struct vkGetPhysicalDeviceSurfaceCapabilities2KHR_params *params = args; VkResult result; + TRACE("%p, %p, %p\n", params->physicalDevice, params->pSurfaceInfo, params->pSurfaceCapabilities); + result = wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(params->physicalDevice, params->pSurfaceInfo, params->pSurfaceCapabilities); return result; } @@ -15022,6 +15174,8 @@ static NTSTATUS thunk64_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(void *args) { struct vkGetPhysicalDeviceSurfaceCapabilitiesKHR_params *params = args; VkResult result; + TRACE("%p, 0x%s, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pSurfaceCapabilities); + result = wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(params->physicalDevice, params->surface, params->pSurfaceCapabilities); return result; } @@ -15039,6 +15193,8 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(void *args) { struct vkGetPhysicalDeviceSurfaceCapabilitiesKHR_params *params = args; VkResult result; + TRACE("%p, 0x%s, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pSurfaceCapabilities); + result = wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(params->physicalDevice, params->surface, params->pSurfaceCapabilities); return result; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/923
participants (2)
-
Jacek Caban -
Jacek Caban (＠jacek)