From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Mon, 15 Feb 2021 21:48:55 +0000 (-0600)
Subject: nir: Fix parameter order in the bcsel-of-shuffle optimization
X-Git-Tag: upstream/21.2.3~7770
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b133a1b25c17198193dafd6b356dfa42bc27028;p=platform%2Fupstream%2Fmesa.git

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 <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9068>
---

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;
 }