Module: Mesa Branch: main Commit: 46c59e8fd69b1537421794c997407e4d1d795be6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=46c59e8fd69b1537421794c997407e4d1d795be6
Author: Bas Nieuwenhuizen <[email protected]> Date: Fri Dec 31 17:27:18 2021 +0100 radv: Remove dependencies on vk_common entrypoints. Fixes: 91fe0b5629d ("radv: Delete lots of sync code.") Reviewed-by: Jesse Natalie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14366> --- src/amd/vulkan/layers/radv_metro_exodus.c | 5 +++-- src/amd/vulkan/radv_android.c | 21 ++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/amd/vulkan/layers/radv_metro_exodus.c b/src/amd/vulkan/layers/radv_metro_exodus.c index b67c74d1619..304ab2875b1 100644 --- a/src/amd/vulkan/layers/radv_metro_exodus.c +++ b/src/amd/vulkan/layers/radv_metro_exodus.c @@ -22,16 +22,17 @@ */ #include "radv_private.h" -#include "vk_common_entrypoints.h" VKAPI_ATTR VkResult VKAPI_CALL metro_exodus_GetSemaphoreCounterValue(VkDevice _device, VkSemaphore _semaphore, uint64_t *pValue) { + VK_FROM_HANDLE(vk_device, device, _device); + /* See https://gitlab.freedesktop.org/mesa/mesa/-/issues/5119. */ if (_semaphore == VK_NULL_HANDLE) { fprintf(stderr, "RADV: Ignoring vkGetSemaphoreCounterValue() with NULL semaphore (game bug)!\n"); return VK_SUCCESS; } - return vk_common_GetSemaphoreCounterValue(_device, _semaphore, pValue); + return device->dispatch_table.GetSemaphoreCounterValue(_device, _semaphore, pValue); } diff --git a/src/amd/vulkan/radv_android.c b/src/amd/vulkan/radv_android.c index 1857d72ae2b..6ea51ffbe8e 100644 --- a/src/amd/vulkan/radv_android.c +++ b/src/amd/vulkan/radv_android.c @@ -37,7 +37,6 @@ #include "util/os_file.h" #include "radv_private.h" -#include "vk_common_entrypoints.h" #include "vk_util.h" #ifdef ANDROID @@ -427,7 +426,7 @@ radv_AcquireImageANDROID(VkDevice device_h, VkImage image_h, int nativeFenceFd, .handleType = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT, .fd = semaphore_fd, }; - result = vk_common_ImportSemaphoreFdKHR(device_h, &info); + result = device->vk.dispatch_table.ImportSemaphoreFdKHR(device_h, &info); if (result == VK_SUCCESS) semaphore_fd = -1; /* RADV took ownership */ } @@ -440,7 +439,7 @@ radv_AcquireImageANDROID(VkDevice device_h, VkImage image_h, int nativeFenceFd, .handleType = VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT, .fd = fence_fd, }; - result = vk_common_ImportFenceFdKHR(device_h, &info); + result = device->vk.dispatch_table.ImportFenceFdKHR(device_h, &info); if (result == VK_SUCCESS) fence_fd = -1; /* RADV took ownership */ } @@ -471,14 +470,14 @@ radv_QueueSignalReleaseImageANDROID(VkQueue _queue, uint32_t waitSemaphoreCount, for (uint32_t i = 0; i < waitSemaphoreCount; ++i) { int tmp_fd; - result = - vk_common_GetSemaphoreFdKHR(radv_device_to_handle(queue->device), - &(VkSemaphoreGetFdInfoKHR){ - .sType = VK_STRUCTURE_TYPE_SEMAPHORE_GET_FD_INFO_KHR, - .handleType = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT, - .semaphore = pWaitSemaphores[i], - }, - &tmp_fd); + result = queue->device->vk.dispatch_table.GetSemaphoreFdKHR( + radv_device_to_handle(queue->device), + &(VkSemaphoreGetFdInfoKHR){ + .sType = VK_STRUCTURE_TYPE_SEMAPHORE_GET_FD_INFO_KHR, + .handleType = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT, + .semaphore = pWaitSemaphores[i], + }, + &tmp_fd); if (result != VK_SUCCESS) { if (fd >= 0) close(fd);
