From 8cb254e0b8eaaca3ed13ea37e3bf8527efe51e63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sat, 18 May 2024 20:25:04 -0400 Subject: [PATCH] radeonsi: call nir_lower_int64 later to fix ACO failure with Tomb Raider Reviewed-by: Qiang Yu Part-of: --- src/gallium/drivers/radeonsi/si_shader.c | 1 + src/gallium/drivers/radeonsi/si_shader_nir.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 93ffe1edcff..982884e217f 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -2484,6 +2484,7 @@ struct nir_shader *si_get_nir_shader(struct si_shader *shader, progress = true; } + NIR_PASS(progress, nir, nir_lower_int64); NIR_PASS(progress, nir, nir_opt_idiv_const, 8); NIR_PASS(progress, nir, nir_lower_idiv, &(nir_lower_idiv_options){ diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c index 3d70756a601..3480b765a42 100644 --- a/src/gallium/drivers/radeonsi/si_shader_nir.c +++ b/src/gallium/drivers/radeonsi/si_shader_nir.c @@ -280,8 +280,6 @@ static void si_lower_nir(struct si_screen *sscreen, struct nir_shader *nir) * - ensure constant offsets for texture instructions are folded * and copy-propagated */ - NIR_PASS_V(nir, nir_lower_int64); - const struct nir_lower_tex_options lower_tex_options = { .lower_txp = ~0u, .lower_txf_offset = true,