Mesa (master): radv: Set query availability bit even if we don't wait.

[Bas Nieuwenhuizen]

Module: Mesa
Branch: master
Commit: 2dacb727c2b8365dcf41f32ca864c83d778f3b83
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2dacb727c2b8365dcf41f32ca864c83d778f3b83

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Tue Apr 11 23:54:58 2017 +0200

radv: Set query availability bit even if we don't wait.

Signed-off-by: Bas Nieuwenhuizen <basni at google.com>
Fixes: 8475a14302e ("radv: Implement pipeline statistics queries.")
Reviewed-by: Fredrik Höglund <fredrik at kde.org>

---

 src/amd/vulkan/radv_query.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c
index 07cb640414..9f54287c36 100644
--- a/src/amd/vulkan/radv_query.c
+++ b/src/amd/vulkan/radv_query.c
@@ -850,9 +850,10 @@ VkResult radv_GetQueryPoolResults(
 		char *src = pool->ptr + query * pool->stride;
 		uint32_t available;
 
-		if ((flags & VK_QUERY_RESULT_WAIT_BIT) && pool->type != VK_QUERY_TYPE_OCCLUSION) {
-			while(!*(volatile uint32_t*)(pool->ptr + pool->availability_offset + 4 * query))
-				;
+		if (pool->type != VK_QUERY_TYPE_OCCLUSION) {
+			if (flags & VK_QUERY_RESULT_WAIT_BIT)
+				while(!*(volatile uint32_t*)(pool->ptr + pool->availability_offset + 4 * query))
+					;
 			available = *(uint32_t*)(pool->ptr + pool->availability_offset + 4 * query);
 		}