From: Andres Rodriguez Date: Sat, 27 Jul 2019 13:44:44 +0000 (-0400) Subject: radv: fix queries with WAIT_BIT returning VK_NOT_READY X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2b71b4e79374ee0243de2d83409adab05ee71c69;p=mesa.git radv: fix queries with WAIT_BIT returning VK_NOT_READY When vkGetQueryPoolResults() is called with VK_QUERY_RESULT_WAIT_BIT set, the driver is supposed to wait for the query to become available before returning. Currently, radv returns once the query is indeed ready, but it returns VK_NOT_READY. It also fails to populate the results. The problem is a missing volatile in the secondary check for query availability. This patch removes the secondary check altogether since it is redundant with the preceding loop. This bug was found with an unreleased version of SteamVR. Reviewed-by: Bas Nieuwenhuizen --- diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c index 3add078e978..1bdcc998c65 100644 --- a/src/amd/vulkan/radv_query.c +++ b/src/amd/vulkan/radv_query.c @@ -1129,7 +1129,7 @@ VkResult radv_GetQueryPoolResults( if (flags & VK_QUERY_RESULT_WAIT_BIT) { while (*(volatile uint64_t *)src == TIMESTAMP_NOT_READY) ; - available = *(uint64_t *)src != TIMESTAMP_NOT_READY; + available = true; } if (!available && !(flags & VK_QUERY_RESULT_PARTIAL_BIT))