From 2b5651e0027c9682ca02b814191929a3363306a4 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Mon, 15 Feb 2021 15:48:55 -0600 Subject: [PATCH] nir: Fix parameter order in the bcsel-of-shuffle optimization Fixes: 4ff4d4e56966a40 "nir/opt_intrinsic: Optimize bcsel(b, shuffle..." Reviewed-by: Caio Marcelo de Oliveira Filho Part-of: (cherry picked from commit 8b133a1b25c17198193dafd6b356dfa42bc27028) --- .pick_status.json | 2 +- src/compiler/nir/nir_opt_intrinsics.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 75e44e3c4c1..97981b32cdc 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -859,7 +859,7 @@ "description": "nir: Fix parameter order in the bcsel-of-shuffle optimization", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "4ff4d4e56966a40bff83d1813e3a308cff38736e" }, diff --git a/src/compiler/nir/nir_opt_intrinsics.c b/src/compiler/nir/nir_opt_intrinsics.c index 74bad15c696..6742fe91988 100644 --- a/src/compiler/nir/nir_opt_intrinsics.c +++ b/src/compiler/nir/nir_opt_intrinsics.c @@ -85,7 +85,7 @@ try_opt_bcsel_of_shuffle(nir_builder *b, nir_alu_instr *alu, return NULL; nir_ssa_def *index = nir_bcsel(b, alu->src[0].src.ssa, index1, index2); - nir_ssa_def *shuffle = nir_shuffle(b, index, data1); + nir_ssa_def *shuffle = nir_shuffle(b, data1, index); return shuffle; }