From 740734ac725bb2901ebf2061be7e00126cfbb6cd Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Mon, 9 Mar 2026 15:27:50 -0400 Subject: [PATCH] etnaviv: Call lower_bool_to_int32 not to_bitsize It calls both for some reason but never handles any other booleans than 32-bit. This was probably a mistake. Fixes: e63a7882a0ae ("etnaviv: call nir_lower_bool_to_bitsize") Acked-by: Alyssa Rosenzweig Reviewed-by: Christoph Pillmayer Reviewed-by: Christian Gmeiner (cherry picked from commit 6fb39956597101881cf36cb15169416c00f95ea9) Part-of: --- .pick_status.json | 2 +- src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 1813a8a55d6..aa094f109a7 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -504,7 +504,7 @@ "description": "etnaviv: Call lower_bool_to_int32 not to_bitsize", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "e63a7882a0ae2461cc2b84de96549c2df9d25985", "notes": null diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c index 4f45bfccc34..2c8b54d9d86 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c @@ -1327,7 +1327,7 @@ etna_compile_shader(struct etna_shader_variant *v) NIR_PASS(_, s, nir_opt_dce); NIR_PASS(_, s, nir_opt_cse); - NIR_PASS(_, s, nir_lower_bool_to_bitsize); + NIR_PASS(_, s, nir_lower_bool_to_int32); NIR_PASS(_, s, etna_lower_alu, c->specs->has_new_transcendentals); /* needs to be the last pass that touches pass_flags! */