From ea0bbe82019458f3c0482a2d13614fdd06041ee3 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Mon, 25 Dec 2017 15:18:00 -0500 Subject: [PATCH] nir: add missing local_group_size intrinsic For GL_ARB_compute_variable_group_size Reported-by: Karol Herbst Signed-off-by: Rob Clark Reviewed-by: Kenneth Graunke Reviewed-by: Jason Ekstrand --- src/compiler/nir/nir.c | 4 ++++ src/compiler/nir/nir_intrinsics.h | 1 + 2 files changed, 5 insertions(+) diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c index 688f2b1ae32..692d97bf9aa 100644 --- a/src/compiler/nir/nir.c +++ b/src/compiler/nir/nir.c @@ -1969,6 +1969,8 @@ nir_intrinsic_from_system_value(gl_system_value val) return nir_intrinsic_load_subgroup_le_mask; case SYSTEM_VALUE_SUBGROUP_LT_MASK: return nir_intrinsic_load_subgroup_lt_mask; + case SYSTEM_VALUE_LOCAL_GROUP_SIZE: + return nir_intrinsic_load_local_group_size; default: unreachable("system value does not directly correspond to intrinsic"); } @@ -2038,6 +2040,8 @@ nir_system_value_from_intrinsic(nir_intrinsic_op intrin) return SYSTEM_VALUE_SUBGROUP_LE_MASK; case nir_intrinsic_load_subgroup_lt_mask: return SYSTEM_VALUE_SUBGROUP_LT_MASK; + case nir_intrinsic_load_local_group_size: + return SYSTEM_VALUE_LOCAL_GROUP_SIZE; default: unreachable("intrinsic doesn't produce a system value"); } diff --git a/src/compiler/nir/nir_intrinsics.h b/src/compiler/nir/nir_intrinsics.h index ccf8e06336c..ede29277876 100644 --- a/src/compiler/nir/nir_intrinsics.h +++ b/src/compiler/nir/nir_intrinsics.h @@ -363,6 +363,7 @@ SYSTEM_VALUE(subgroup_gt_mask, 0, 0, xx, xx, xx) SYSTEM_VALUE(subgroup_le_mask, 0, 0, xx, xx, xx) SYSTEM_VALUE(subgroup_lt_mask, 0, 0, xx, xx, xx) SYSTEM_VALUE(subgroup_id, 1, 0, xx, xx, xx) +SYSTEM_VALUE(local_group_size, 3, 0, xx, xx, xx) /* Blend constant color values. Float values are clamped. */ SYSTEM_VALUE(blend_const_color_r_float, 1, 0, xx, xx, xx) -- 2.30.2