From 6f7b55de037c8f04d1bca34adbc6922fdda11bad Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Mon, 26 Oct 2015 19:48:03 +0800 Subject: MR 461: Documented updated vkQueueSubmit and remove wait + signal semaphore operations on queues. (WIP) https://gitlab.khronos.org/vulkan/vulkan/merge_requests/461 --- loader/gpa_helper.h | 4 ---- loader/table_ops.h | 6 ------ loader/trampoline.c | 18 ------------------ 3 files changed, 28 deletions(-) (limited to 'loader') diff --git a/loader/gpa_helper.h b/loader/gpa_helper.h index 8404e129..c9673f0c 100644 --- a/loader/gpa_helper.h +++ b/loader/gpa_helper.h @@ -119,10 +119,6 @@ static inline void* globalGetProcAddr(const char *name) return (void*) vkCreateSemaphore; if (!strcmp(name, "DestroySemaphore")) return (void*) vkDestroySemaphore; - if (!strcmp(name, "QueueSignalSemaphore")) - return (void*) vkQueueSignalSemaphore; - if (!strcmp(name, "QueueWaitSemaphore")) - return (void*) vkQueueWaitSemaphore; if (!strcmp(name, "CreateEvent")) return (void*) vkCreateEvent; if (!strcmp(name, "DestroyEvent")) diff --git a/loader/table_ops.h b/loader/table_ops.h index 7ff49a20..6f135c7c 100644 --- a/loader/table_ops.h +++ b/loader/table_ops.h @@ -65,8 +65,6 @@ static inline void loader_init_device_dispatch_table(VkLayerDispatchTable *table table->WaitForFences = (PFN_vkWaitForFences) gpa(dev, "vkWaitForFences"); table->CreateSemaphore = (PFN_vkCreateSemaphore) gpa(dev, "vkCreateSemaphore"); table->DestroySemaphore = (PFN_vkDestroySemaphore) gpa(dev, "vkDestroySemaphore"); - table->QueueSignalSemaphore = (PFN_vkQueueSignalSemaphore) gpa(dev, "vkQueueSignalSemaphore"); - table->QueueWaitSemaphore = (PFN_vkQueueWaitSemaphore) gpa(dev, "vkQueueWaitSemaphore"); table->CreateEvent = (PFN_vkCreateEvent) gpa(dev, "vkCreateEvent"); table->DestroyEvent = (PFN_vkDestroyEvent) gpa(dev, "vkDestroyEvent"); table->GetEventStatus = (PFN_vkGetEventStatus) gpa(dev, "vkGetEventStatus"); @@ -243,10 +241,6 @@ static inline void *loader_lookup_device_dispatch_table( return (void *) table->CreateSemaphore; if (!strcmp(name, "DestroySemaphore")) return (void *) table->DestroySemaphore; - if (!strcmp(name, "QueueSignalSemaphore")) - return (void *) table->QueueSignalSemaphore; - if (!strcmp(name, "QueueWaitSemaphore")) - return (void *) table->QueueWaitSemaphore; if (!strcmp(name, "CreateEvent")) return (void *) table->CreateEvent; if (!strcmp(name, "DestroyEvent")) diff --git a/loader/trampoline.c b/loader/trampoline.c index d9708d92..53a1a685 100644 --- a/loader/trampoline.c +++ b/loader/trampoline.c @@ -576,24 +576,6 @@ LOADER_EXPORT void VKAPI vkDestroySemaphore(VkDevice device, VkSemaphore semapho disp->DestroySemaphore(device, semaphore); } -LOADER_EXPORT VkResult VKAPI vkQueueSignalSemaphore(VkQueue queue, VkSemaphore semaphore) -{ - const VkLayerDispatchTable *disp; - - disp = loader_get_dispatch(queue); - - return disp->QueueSignalSemaphore(queue, semaphore); -} - -LOADER_EXPORT VkResult VKAPI vkQueueWaitSemaphore(VkQueue queue, VkSemaphore semaphore) -{ - const VkLayerDispatchTable *disp; - - disp = loader_get_dispatch(queue); - - return disp->QueueWaitSemaphore(queue, semaphore); -} - LOADER_EXPORT VkResult VKAPI vkCreateEvent(VkDevice device, const VkEventCreateInfo* pCreateInfo, VkEvent* pEvent) { const VkLayerDispatchTable *disp; -- cgit v1.2.3