fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-06 14:20:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nir/format_convert: Promote input to 32-bit before packing integers

Browse source 
If we don't do that and the source is not 32-bit we end up with a
bit_size mismatch when doing the ior operation.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29333>
This commit is contained in:
Boris Brezillon 2024-08-13 15:20:04 +02:00 • committed by Marge Bot
parent 2b2b66f497
commit ff2ebdc4d6
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/compiler/nir/nir_format_convert.c
View file

@ -102,6 +102,8 @@ nir_format_pack_uint_unmasked(nir_builder *b, nir_def *color,
assert(num_components >= 1 && num_components <= 4);
nir_def *packed = nir_imm_int(b, 0);
unsigned offset = 0;
color = nir_u2u32(b, color);
for (unsigned i = 0; i < num_components; i++) {
if (bits[i] == 0)
continue;
@ -120,6 +122,8 @@ nir_format_pack_uint_unmasked_ssa(nir_builder *b, nir_def *color,
{
nir_def *packed = nir_imm_int(b, 0);
nir_def *offset = nir_imm_int(b, 0);
color = nir_u2u32(b, color);
for (unsigned i = 0; i < bits->num_components; i++) {
packed = nir_ior(b, packed, nir_ishl(b, nir_channel(b, color, i), offset));
offset = nir_iadd(b, offset, nir_channel(b, bits, i));