Module: Mesa Branch: main Commit: a255f6f823017aed7505bb508366a81432ed0ba3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a255f6f823017aed7505bb508366a81432ed0ba3
Author: Samuel Pitoiset <[email protected]> Date: Wed Jan 5 19:01:30 2022 +0100 radv: do not use the common entrypoint for the Metro Exodus layer This is incorrect, it will calls the function recursively. It seems there is random build failures with common runtime code and MSVC but that's a different issue. Closes: #5815 Fixes: 46c59e8fd69 ("radv: Remove dependencies on vk_common entrypoints.") Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Bas Nieuwenhuizen <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14374> --- src/amd/vulkan/layers/radv_metro_exodus.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/amd/vulkan/layers/radv_metro_exodus.c b/src/amd/vulkan/layers/radv_metro_exodus.c index 304ab2875b1..b67c74d1619 100644 --- a/src/amd/vulkan/layers/radv_metro_exodus.c +++ b/src/amd/vulkan/layers/radv_metro_exodus.c @@ -22,17 +22,16 @@ */ #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 device->dispatch_table.GetSemaphoreCounterValue(_device, _semaphore, pValue); + return vk_common_GetSemaphoreCounterValue(_device, _semaphore, pValue); }
