commit 63e79a8a777b36ecb30a1f6900e6b638cb32fc5f
author Jason Ekstrand <jason.ekstrand@intel.com> Mon Aug 21 16:05:20 2017 -0700
committer Jason Ekstrand <jason.ekstrand@intel.com> Mon Aug 28 08:57:52 2017 -0700
tree 9500ca46ce52a025a9940b999131b31d17fd7aef
parent 79d8d6b02219adc97278c2e111ede209dcf7b4f6

nir: Fix system_value_from_intrinsic for subgroups

A couple of the cases were backwards

Reviewed-by: Matt Turner <mattst88@gmail.com>
Cc: mesa-stable@lists.freedesktop.org

src/compiler/nir/nir.c

diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c
index e9e0489..afd4d1a 100644
--- a/src/compiler/nir/nir.c
+++ b/src/compiler/nir/nir.c
@@ -1992,10 +1992,10 @@
       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: