From 9443087ef371fe30748542e69a59576b02b08e9b Mon Sep 17 00:00:00 2001 From: jsg Date: Thu, 27 Aug 2020 04:29:06 +0000 Subject: [PATCH] radv: Explicitly cast TIMESTAMP_NOT_READY value to uin32_t where needed. From Oschowa c310677a7563b1e2d97f8216be1d60cb21204eae in mainline mesa reduces clang warnings --- lib/mesa/src/amd/vulkan/radv_query.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/mesa/src/amd/vulkan/radv_query.c b/lib/mesa/src/amd/vulkan/radv_query.c index 07a1c3871..34c398dc7 100644 --- a/lib/mesa/src/amd/vulkan/radv_query.c +++ b/lib/mesa/src/amd/vulkan/radv_query.c @@ -1673,7 +1673,7 @@ void radv_CmdResetQueryPool( RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); RADV_FROM_HANDLE(radv_query_pool, pool, queryPool); uint32_t value = pool->type == VK_QUERY_TYPE_TIMESTAMP - ? TIMESTAMP_NOT_READY : 0; + ? (uint32_t)TIMESTAMP_NOT_READY : 0; uint32_t flush_bits = 0; /* Make sure to sync all previous work if the given command buffer has @@ -1708,7 +1708,7 @@ void radv_ResetQueryPool( RADV_FROM_HANDLE(radv_query_pool, pool, queryPool); uint32_t value = pool->type == VK_QUERY_TYPE_TIMESTAMP - ? TIMESTAMP_NOT_READY : 0; + ? (uint32_t)TIMESTAMP_NOT_READY : 0; uint32_t *data = (uint32_t*)(pool->ptr + firstQuery * pool->stride); uint32_t *data_end = (uint32_t*)(pool->ptr + (firstQuery + queryCount) * pool->stride);