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

pan/bi: Fix incorrect compilation of fsat(reg.yx)

Browse source 
Future changes to nir_lower_blend cause fsat(reg.yx) instructions to be
generated, which correspond to "FCLAMP.v2f16 x.h10" pseudoinstructions. These
get their swizzles lowered, but we forgot to clear the swizzle out, so we end up
with extra swap (cancelling out the intended swizzle).

Fix the lowering logic.

Fixes: ac636f5adb ("pan/bi: Use FCLAMP pseudo op for clamp prop")
Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20683>
(cherry picked from commit ed46c617b0)
This commit is contained in:
Alyssa Rosenzweig 2023-01-12 16:50:31 -05:00 • committed by Eric Engestrom
parent 116b1de2aa
commit aec46cecfa
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -4819,7 +4819,7 @@
"description": "pan/bi: Fix incorrect compilation of fsat(reg.yx)",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "ac636f5adb57704696c781a17f11609fad9035ec"
},

4
src/panfrost/bifrost/bi_lower_swizzle.c
View file

@ -134,8 +134,10 @@ lower_swizzle(bi_context *ctx, bi_instr *ins, unsigned src)
bi_index dest = ins->dest[0];
bi_index tmp = bi_temp(ctx);
bi_index swizzled_src = bi_replace_index(ins->src[0], tmp);
ins->src[0].swizzle = BI_SWIZZLE_H01;
ins->dest[0] = tmp;
bi_swz_v2i16_to(&b, dest, bi_replace_index(ins->src[0], tmp));
bi_swz_v2i16_to(&b, dest, swizzled_src);
return;
}