From 5e698f8369706acf36e6f2c298296a517732ab99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Ondra=C4=8Dka?= Date: Thu, 7 May 2026 13:12:47 +0200 Subject: [PATCH] r300: drop TEX2/TXB2/TXL2 dead path from ntr Part-of: --- src/gallium/drivers/r300/compiler/nir_to_rc.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/gallium/drivers/r300/compiler/nir_to_rc.c b/src/gallium/drivers/r300/compiler/nir_to_rc.c index 581aec94e71..2efb5604902 100644 --- a/src/gallium/drivers/r300/compiler/nir_to_rc.c +++ b/src/gallium/drivers/r300/compiler/nir_to_rc.c @@ -1245,14 +1245,10 @@ ntr_emit_texture(struct ntr_compile *c, nir_tex_instr *instr) ntr_push_tex_arg(c, instr, nir_tex_src_backend1, &s); ntr_push_tex_arg(c, instr, nir_tex_src_backend2, &s); - if (s.i > 1) { - if (tex_opcode == TGSI_OPCODE_TEX) - tex_opcode = TGSI_OPCODE_TEX2; - if (tex_opcode == TGSI_OPCODE_TXB) - tex_opcode = TGSI_OPCODE_TXB2; - if (tex_opcode == TGSI_OPCODE_TXL) - tex_opcode = TGSI_OPCODE_TXL2; - } + /* The RC backend doesn't have TEX2/TXB2/TXL2-style opcodes; the + * shadow comparator that would need a second backend slot is + * already lowered before nir_to_rc by nir_lower_tex_shadow. */ + assert(s.i <= 1); if (instr->op == nir_texop_txd) { /* Derivs appear in their own src args */