diff --git a/.pick_status.json b/.pick_status.json index 995e64c112b..e760d36558c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -643,7 +643,7 @@ "description": "radeonsi: treat nir_intrinsic_load_constant as a VMEM operation", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "8288882965bf1c5f0ca5d9f29c1b759bee2bc718" }, diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c index 5c972a368a3..557a5e02fd3 100644 --- a/src/gallium/drivers/radeonsi/si_shader_nir.c +++ b/src/gallium/drivers/radeonsi/si_shader_nir.c @@ -243,6 +243,9 @@ static void scan_instruction(const struct nir_shader *nir, struct si_shader_info if (!nir_src_is_const(intr->src[1])) info->uses_vmem_return_type_other = true; break; + case nir_intrinsic_load_constant: + info->uses_vmem_return_type_other = true; + break; case nir_intrinsic_load_barycentric_at_sample: /* This loads sample positions. */ case nir_intrinsic_load_tess_level_outer: /* TES input read from memory */