Mesa (master): radv: Explicitly cast TIMESTAMP_NOT_READY value to uin32_t where needed.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue Jun 2 21:44:39 UTC 2020


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

Author: Oschowa <oschowa at web.de>
Date:   Wed May 27 12:09:20 2020 +0200

radv: Explicitly cast TIMESTAMP_NOT_READY value to uin32_t where needed.

Fixes a clang warning.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5228>

---

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

diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c
index ea2128fc4c0..839adf7b23a 100644
--- a/src/amd/vulkan/radv_query.c
+++ b/src/amd/vulkan/radv_query.c
@@ -1677,7 +1677,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
@@ -1712,7 +1712,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);
 



More information about the mesa-commit mailing list