diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2015-08-22 18:51:08 -0700 |
|---|---|---|
| committer | Jordan Justen <jordan.l.justen@intel.com> | 2015-09-29 08:23:47 -0700 |
| commit | 4c6ddd3397f9ec363342831eab710003996e77a8 (patch) | |
| tree | 40a35e523cee09194885d1f738cea6949e15a784 | |
| parent | f6ae91406966c0fdcfcd628539e34964ae0ab1a6 (diff) | |
| download | external_mesa3d-4c6ddd3397f9ec363342831eab710003996e77a8.zip external_mesa3d-4c6ddd3397f9ec363342831eab710003996e77a8.tar.gz external_mesa3d-4c6ddd3397f9ec363342831eab710003996e77a8.tar.bz2 | |
nir: Convert SYSTEM_VALUE_NUM_WORK_GROUPS to a nir intrinsic
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
| -rw-r--r-- | src/glsl/nir/nir.c | 4 | ||||
| -rw-r--r-- | src/glsl/nir/nir_intrinsics.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/glsl/nir/nir.c b/src/glsl/nir/nir.c index 1206bb4..57fd959 100644 --- a/src/glsl/nir/nir.c +++ b/src/glsl/nir/nir.c @@ -1487,6 +1487,8 @@ nir_intrinsic_from_system_value(gl_system_value val) return nir_intrinsic_load_local_invocation_id; case SYSTEM_VALUE_WORK_GROUP_ID: return nir_intrinsic_load_work_group_id; + case SYSTEM_VALUE_NUM_WORK_GROUPS: + return nir_intrinsic_load_num_work_groups; /* FINISHME: Add tessellation intrinsics. case SYSTEM_VALUE_TESS_COORD: case SYSTEM_VALUE_VERTICES_IN: @@ -1523,6 +1525,8 @@ nir_system_value_from_intrinsic(nir_intrinsic_op intrin) return SYSTEM_VALUE_SAMPLE_MASK_IN; case nir_intrinsic_load_local_invocation_id: return SYSTEM_VALUE_LOCAL_INVOCATION_ID; + case nir_intrinsic_load_num_work_groups: + return SYSTEM_VALUE_NUM_WORK_GROUPS; case nir_intrinsic_load_work_group_id: return SYSTEM_VALUE_WORK_GROUP_ID; /* FINISHME: Add tessellation intrinsics. diff --git a/src/glsl/nir/nir_intrinsics.h b/src/glsl/nir/nir_intrinsics.h index 06f1b02..649312f 100644 --- a/src/glsl/nir/nir_intrinsics.h +++ b/src/glsl/nir/nir_intrinsics.h @@ -198,6 +198,7 @@ SYSTEM_VALUE(invocation_id, 1, 0) SYSTEM_VALUE(local_invocation_id, 3, 0) SYSTEM_VALUE(work_group_id, 3, 0) SYSTEM_VALUE(user_clip_plane, 4, 1) /* const_index[0] is user_clip_plane[idx] */ +SYSTEM_VALUE(num_work_groups, 3, 0) /* * The format of the indices depends on the type of the load. For uniforms, |