Mesa (master): radv: Fix warning in 32-bit build.

[GitLab Mirror]

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

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Mon Sep 30 23:20:05 2019 +0200

radv: Fix warning in 32-bit build.

uintptr_t is 32 bits in a 32-bits build, resulting in shifting out
of bounds.

Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

---

 src/amd/vulkan/radv_cmd_buffer.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index f93195be4c0..1e5e2834135 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -556,8 +556,9 @@ radv_save_pipeline(struct radv_cmd_buffer *cmd_buffer,
 		assert(!"invalid ring type");
 	}
 
-	data[0] = (uintptr_t)pipeline;
-	data[1] = (uintptr_t)pipeline >> 32;
+	uint64_t pipeline_address = (uintptr_t)pipeline;
+	data[0] = pipeline_address;
+	data[1] = pipeline_address >> 32;
 
 	radv_emit_write_data_packet(cmd_buffer, va, 2, data);
 }