From 7e5911846e497c373d1f68749f057d6e1fe34831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Tue, 13 Apr 2021 17:04:02 +0200 Subject: [PATCH] lima/ppir: Cast pointer to uintptr_t instead of uint64_t Avoids warnings on armhf: ./src/gallium/drivers/lima/ir/pp/nir.c: In function 'ppir_get_block': ../src/gallium/drivers/lima/ir/pp/nir.c:554:66: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] ppir_block *block = _mesa_hash_table_u64_search(comp->blocks, (uint64_t)nblock); ^ ../src/gallium/drivers/lima/ir/pp/nir.c: In function 'ppir_compile_nir': ../src/gallium/drivers/lima/ir/pp/nir.c:899:52: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] _mesa_hash_table_u64_insert(comp->blocks, (uint64_t)nblock, block); ^ Reviewed-by: Eric Anholt Part-of: --- src/gallium/drivers/lima/ir/pp/nir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/lima/ir/pp/nir.c b/src/gallium/drivers/lima/ir/pp/nir.c index 8790ec49142..a06a3286668 100644 --- a/src/gallium/drivers/lima/ir/pp/nir.c +++ b/src/gallium/drivers/lima/ir/pp/nir.c @@ -551,7 +551,7 @@ static bool ppir_emit_tex(ppir_block *block, nir_instr *ni) static ppir_block *ppir_get_block(ppir_compiler *comp, nir_block *nblock) { - ppir_block *block = _mesa_hash_table_u64_search(comp->blocks, (uint64_t)nblock); + ppir_block *block = _mesa_hash_table_u64_search(comp->blocks, (uintptr_t)nblock); return block; } @@ -896,7 +896,7 @@ bool ppir_compile_nir(struct lima_fs_compiled_shader *prog, struct nir_shader *n if (!block) return false; block->index = nblock->index; - _mesa_hash_table_u64_insert(comp->blocks, (uint64_t)nblock, block); + _mesa_hash_table_u64_insert(comp->blocks, (uintptr_t)nblock, block); } }