From a56aa9547ba9d34aef8814e20503a366e9319630 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Mon, 18 May 2026 14:17:01 -0700 Subject: [PATCH] jay: Call constant folding before collecting FS outputs Fixes "multiple stores to the same location" assertions in tests like dEQP-VK.pipeline.monolithic.color_write_enable_maxa.cwe_after_bind.attachments3_more0 In that case, the stores were actually to different locations, but some constant additions hadn't been folded into the location field yet. Part-of: --- src/intel/compiler/jay/jay_nir.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/intel/compiler/jay/jay_nir.c b/src/intel/compiler/jay/jay_nir.c index c490f77ee1b..e271630f568 100644 --- a/src/intel/compiler/jay/jay_nir.c +++ b/src/intel/compiler/jay/jay_nir.c @@ -332,6 +332,7 @@ jay_process_nir(const struct intel_device_info *devinfo, NIR_PASS(_, nir, nir_shader_intrinsics_pass, lower_frag_coord, nir_metadata_control_flow, NULL); NIR_PASS(_, nir, nir_opt_barycentric, true); + NIR_PASS(_, nir, nir_opt_constant_folding); lower_fragment_outputs(nir_shader_get_entrypoint(nir), devinfo, key->fs.nr_color_regions, simd_width);