diff options
author | Liam <byteslice@airmail.cc> | 2022-12-02 22:47:33 +0100 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2022-12-04 16:55:13 +0100 |
commit | a948ab3e4846df49a8087d856c27a323800300c3 (patch) | |
tree | 697d3572c886356e6a140c8fea261a73c738df51 /src/video_core/vulkan_common/vulkan_wrapper.h | |
parent | Merge pull request #9375 from jbeich/xbyak-no-install (diff) | |
download | yuzu-a948ab3e4846df49a8087d856c27a323800300c3.tar yuzu-a948ab3e4846df49a8087d856c27a323800300c3.tar.gz yuzu-a948ab3e4846df49a8087d856c27a323800300c3.tar.bz2 yuzu-a948ab3e4846df49a8087d856c27a323800300c3.tar.lz yuzu-a948ab3e4846df49a8087d856c27a323800300c3.tar.xz yuzu-a948ab3e4846df49a8087d856c27a323800300c3.tar.zst yuzu-a948ab3e4846df49a8087d856c27a323800300c3.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/vulkan_common/vulkan_wrapper.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/vulkan_common/vulkan_wrapper.h b/src/video_core/vulkan_common/vulkan_wrapper.h index 1b3f493bd..fb6c59f60 100644 --- a/src/video_core/vulkan_common/vulkan_wrapper.h +++ b/src/video_core/vulkan_common/vulkan_wrapper.h @@ -297,7 +297,7 @@ struct DeviceDispatch : InstanceDispatch { PFN_vkGetPipelineExecutablePropertiesKHR vkGetPipelineExecutablePropertiesKHR{}; PFN_vkGetPipelineExecutableStatisticsKHR vkGetPipelineExecutableStatisticsKHR{}; PFN_vkGetQueryPoolResults vkGetQueryPoolResults{}; - PFN_vkGetSemaphoreCounterValueKHR vkGetSemaphoreCounterValueKHR{}; + PFN_vkGetSemaphoreCounterValue vkGetSemaphoreCounterValue{}; PFN_vkMapMemory vkMapMemory{}; PFN_vkQueueSubmit vkQueueSubmit{}; PFN_vkResetFences vkResetFences{}; @@ -308,7 +308,7 @@ struct DeviceDispatch : InstanceDispatch { PFN_vkUpdateDescriptorSetWithTemplateKHR vkUpdateDescriptorSetWithTemplateKHR{}; PFN_vkUpdateDescriptorSets vkUpdateDescriptorSets{}; PFN_vkWaitForFences vkWaitForFences{}; - PFN_vkWaitSemaphoresKHR vkWaitSemaphoresKHR{}; + PFN_vkWaitSemaphores vkWaitSemaphores{}; }; /// Loads instance agnostic function pointers. @@ -766,7 +766,7 @@ public: [[nodiscard]] u64 GetCounter() const { u64 value; - Check(dld->vkGetSemaphoreCounterValueKHR(owner, handle, &value)); + Check(dld->vkGetSemaphoreCounterValue(owner, handle, &value)); return value; } @@ -778,15 +778,15 @@ public: * @return True on successful wait, false on timeout */ bool Wait(u64 value, u64 timeout = std::numeric_limits<u64>::max()) const { - const VkSemaphoreWaitInfoKHR wait_info{ - .sType = VK_STRUCTURE_TYPE_SEMAPHORE_WAIT_INFO_KHR, + const VkSemaphoreWaitInfo wait_info{ + .sType = VK_STRUCTURE_TYPE_SEMAPHORE_WAIT_INFO, .pNext = nullptr, .flags = 0, .semaphoreCount = 1, .pSemaphores = &handle, .pValues = &value, }; - const VkResult result = dld->vkWaitSemaphoresKHR(owner, &wait_info, timeout); + const VkResult result = dld->vkWaitSemaphores(owner, &wait_info, timeout); switch (result) { case VK_SUCCESS: return true; |