fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-19 06:18:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

pan/bi: Fix swizzle handling in bi_copy_src()

Browse source 
The number of src swizzle to initialize depends on the number of source
properties (size and number of components) not the destination ones.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7472>
This commit is contained in:
Boris Brezillon 2020-11-05 15:13:28 +01:00
parent 2522f509a3
commit 87e2169cb9
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/panfrost/bifrost/bifrost_compile.c
View file

@ -977,7 +977,7 @@ bi_cond_for_nir(nir_op op, bool soft)
static void
bi_copy_src(bi_instruction *alu, nir_alu_instr *instr, unsigned i, unsigned to,
unsigned *constants_left, unsigned *constant_shift, unsigned comps)
unsigned *constants_left, unsigned *constant_shift)
{
unsigned bits = nir_src_bit_size(instr->src[i].src);
unsigned dest_bits = nir_dest_bit_size(instr->dest.dest);
@ -1011,8 +1011,9 @@ bi_copy_src(bi_instruction *alu, nir_alu_instr *instr, unsigned i, unsigned to,
* to fill undersized */
unsigned vec = alu->type == BI_COMBINE ? 1 :
MAX2(1, 32 / dest_bits);
MAX2(1, 32 / bits);
unsigned comps = nir_ssa_alu_instr_src_components(instr, i);
for (unsigned j = 0; j < vec; ++j)
alu->swizzle[to][j] = instr->src[i].swizzle[MIN2(j, comps - 1)];
}
@ -1054,8 +1055,8 @@ bi_fuse_cond(bi_instruction *csel, nir_alu_src cond,
/* We found one, let's fuse it in */
csel->cond = bcond;
bi_copy_src(csel, alu, 0, 0, constants_left, constant_shift, comps);
bi_copy_src(csel, alu, 1, 1, constants_left, constant_shift, comps);
bi_copy_src(csel, alu, 0, 0, constants_left, constant_shift);
bi_copy_src(csel, alu, 1, 1, constants_left, constant_shift);
}
static void
@ -1115,7 +1116,7 @@ emit_alu(bi_context *ctx, nir_alu_instr *instr)
if (i && alu.type == BI_CSEL)
f++;
bi_copy_src(&alu, instr, i, i + f, &constants_left, &constant_shift, comps);
bi_copy_src(&alu, instr, i, i + f, &constants_left, &constant_shift);
}
/* Op-specific fixup */