From ff34135d0570120fde867cada798a82e86e27a87 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Thu, 23 Apr 2026 23:38:03 -0700 Subject: [PATCH] iris: Call elk_nir_lower_fs_outputs for Gen8 RT reads, not brw This older code really only exists for Gen8 and elk. On brw platforms, we moved to handling this in brw_nir_lower_fs_load_output, and don't need to lower FS outputs before iris_setup_binding_tables. Call the right compiler's lowering so that things continue working on elk once we change brw_lower_fs_outputs in the next commit. Reviewed-by: Alyssa Rosenzweig Part-of: --- src/gallium/drivers/iris/iris_program.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c index 743d92843f7..46386f0359c 100644 --- a/src/gallium/drivers/iris/iris_program.c +++ b/src/gallium/drivers/iris/iris_program.c @@ -2772,12 +2772,14 @@ iris_compile_fs(struct iris_screen *screen, if (key->force_dual_color_blend) iris_force_dual_color_blend(nir); +#ifdef INTEL_USE_ELK /* Lower output variables to load_output intrinsics before setting up * binding tables, so iris_setup_binding_table can map any load_output * intrinsics to IRIS_SURFACE_GROUP_RENDER_TARGET_READ on Gfx8 for * non-coherent framebuffer fetches. */ - brw_nir_lower_fs_outputs(nir); + elk_nir_lower_fs_outputs(nir); +#endif int null_rts = brw_nir_fs_needs_null_rt(devinfo, nir, key->alpha_to_coverage) ? 1 : 0;