[PATCH v3 3/3] winevulkan: Use automatically-generated thunk for vkQueueSubmit.
Derek Lesho
dlesho at codeweavers.com
Thu May 13 11:18:46 CDT 2021
Signed-off-by: Derek Lesho <dlesho at codeweavers.com>
---
dlls/winevulkan/make_vulkan | 1 -
dlls/winevulkan/vulkan.c | 55 -------------------------------------
2 files changed, 56 deletions(-)
diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan
index 3f2f4a20748..cc79b0a58cd 100755
--- a/dlls/winevulkan/make_vulkan
+++ b/dlls/winevulkan/make_vulkan
@@ -192,7 +192,6 @@ FUNCTION_OVERRIDES = {
"vkGetDeviceProcAddr" : {"dispatch" : False, "driver" : True, "thunk" : ThunkType.NONE, "loader_thunk" : ThunkType.NONE},
"vkGetDeviceQueue" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE},
"vkGetDeviceQueue2" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE},
- "vkQueueSubmit" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE},
# VK_KHR_surface
"vkDestroySurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.NONE},
diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index 8f6c0ba9a2c..9f181d92bc5 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -1067,61 +1067,6 @@ void WINAPI wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *in
*queue = wine_vk_device_find_queue(device, info);
}
-VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t count,
- const VkSubmitInfo *submits, VkFence fence)
-{
- VkSubmitInfo *submits_host;
- VkResult res;
- VkCommandBuffer *command_buffers;
- unsigned int i, j, num_command_buffers;
-
- TRACE("%p %u %p 0x%s\n", queue, count, submits, wine_dbgstr_longlong(fence));
-
- if (count == 0)
- {
- return queue->device->funcs.p_vkQueueSubmit(queue->queue, 0, NULL, fence);
- }
-
- submits_host = calloc(count, sizeof(*submits_host));
- if (!submits_host)
- {
- ERR("Unable to allocate memory for submit buffers!\n");
- return VK_ERROR_OUT_OF_HOST_MEMORY;
- }
-
- for (i = 0; i < count; i++)
- {
- memcpy(&submits_host[i], &submits[i], sizeof(*submits_host));
-
- num_command_buffers = submits[i].commandBufferCount;
- command_buffers = calloc(num_command_buffers, sizeof(*command_buffers));
- if (!command_buffers)
- {
- ERR("Unable to allocate memory for command buffers!\n");
- res = VK_ERROR_OUT_OF_HOST_MEMORY;
- goto done;
- }
-
- for (j = 0; j < num_command_buffers; j++)
- {
- command_buffers[j] = submits[i].pCommandBuffers[j]->command_buffer;
- }
- submits_host[i].pCommandBuffers = command_buffers;
- }
-
- res = queue->device->funcs.p_vkQueueSubmit(queue->queue, count, submits_host, fence);
-
-done:
- for (i = 0; i < count; i++)
- {
- free((void *)submits_host[i].pCommandBuffers);
- }
- free(submits_host);
-
- TRACE("Returning %d\n", res);
- return res;
-}
-
VkResult WINAPI wine_vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateInfo *info,
const VkAllocationCallbacks *allocator, VkCommandPool *command_pool)
{
--
2.31.1
More information about the wine-devel
mailing list