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

spirv: Pull constant source fixup to the existing loop

Browse source 
Backport-to: 26.0
Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
(cherry picked from commit b0c3b20bff)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40359>
This commit is contained in:
Caio Oliveira 2026-02-28 11:56:05 -08:00 • committed by Eric Engestrom
parent 0775d0f1b5
commit 4588b025c8
2 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -3024,7 +3024,7 @@
"description": "spirv: Pull constant source fixup to the existing loop",
"nominated": true,
"nomination_type": 4,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

36
src/compiler/spirv/spirv_to_nir.c
View file

@ -2936,26 +2936,28 @@ vtn_handle_constant(struct vtn_builder *b, SpvOp opcode,
else if (glsl_type_is_e5m2(org_src_type))
src[j][c].f32 = _mesa_e5m2_to_float(src[j][c].u8);
}
}
/* fix up fixed size sources */
switch (op) {
case nir_op_ishl:
case nir_op_ishr:
case nir_op_ushr: {
if (bit_size == 32)
break;
for (unsigned i = 0; i < num_components; ++i) {
switch (bit_size) {
case 64: src[1][i].u32 = src[1][i].u64; break;
case 16: src[1][i].u32 = src[1][i].u16; break;
case 8: src[1][i].u32 = src[1][i].u8; break;
/* Fix up source to respect NIR expected sizes. */
switch (op) {
case nir_op_ishl:
case nir_op_ishr:
case nir_op_ushr: {
/* Shift amount in NIR ops must be 32-bit. */
vtn_assert(!swap);
const unsigned shift_idx = 1;
const unsigned shift_bit_size = glsl_get_bit_size(src_val->type->type);
if (i != shift_idx || shift_bit_size == 32)
break;
for (unsigned c = 0; c < src_comps; c++) {
nir_const_value *shift = &src[shift_idx][c];
*shift = nir_const_value_for_uint(
nir_const_value_as_uint(*shift, shift_bit_size), 32);
}
break;
}
default:
break;
}
break;
}
default:
break;
}
nir_const_value *srcs[3] = {