From 1dfbfad0b96e2b76a736856913c9ee613ddeaf34 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Mon, 21 Aug 2017 16:05:20 -0700 Subject: [PATCH] nir: Fix system_value_from_intrinsic for subgroups A couple of the cases were backwards Reviewed-by: Matt Turner Cc: mesa-stable@lists.freedesktop.org (cherry picked from commit 63e79a8a777b36ecb30a1f6900e6b638cb32fc5f) --- src/compiler/nir/nir.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c index b608b2a0d64..7e83dbd2f39 100644 --- a/src/compiler/nir/nir.c +++ b/src/compiler/nir/nir.c @@ -1975,10 +1975,10 @@ nir_system_value_from_intrinsic(nir_intrinsic_op intrin) return SYSTEM_VALUE_HELPER_INVOCATION; case nir_intrinsic_load_view_index: return SYSTEM_VALUE_VIEW_INDEX; - case SYSTEM_VALUE_SUBGROUP_SIZE: - return nir_intrinsic_load_subgroup_size; - case SYSTEM_VALUE_SUBGROUP_INVOCATION: - return nir_intrinsic_load_subgroup_invocation; + case nir_intrinsic_load_subgroup_size: + return SYSTEM_VALUE_SUBGROUP_SIZE; + case nir_intrinsic_load_subgroup_invocation: + return SYSTEM_VALUE_SUBGROUP_INVOCATION; case nir_intrinsic_load_subgroup_eq_mask: return SYSTEM_VALUE_SUBGROUP_EQ_MASK; case nir_intrinsic_load_subgroup_ge_mask: