KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10220>
This commit is contained in:
Michel Dänzer 2021-04-13 17:04:02 +02:00 committed by Marge Bot
parent cf727e6ba4
commit 7e5911846e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/lima/ir/pp/nir.c
View File

@ -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);
}
}