diff options
| author | Matt Turner <mattst88@gmail.com> | 2017-06-22 16:37:51 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2017-07-20 16:56:49 -0700 |
| commit | 43ef75b394f1cd779a54a22fe16fbb5ef23f0458 (patch) | |
| tree | 60122c01065572e95fa49b427d7a0cfbc6066542 /src/intel | |
| parent | 636fe4d1c6b21e9efecd4bce1cedd67afa33343a (diff) | |
nir: Add system values from ARB_shader_ballot
We already had a channel_num system value, which I'm renaming to
subgroup_invocation to match the rest of the new system values.
Note that while ballotARB(true) will return zeros in the high 32-bits on
systems where gl_SubGroupSizeARB <= 32, the gl_SubGroup??MaskARB
variables do not consider whether channels are enabled. See issue (1) of
ARB_shader_ballot.
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/intel')
| -rw-r--r-- | src/intel/compiler/brw_fs_nir.cpp | 2 | ||||
| -rw-r--r-- | src/intel/compiler/brw_nir_intrinsics.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp index 607cb01c8b7..491f5184e39 100644 --- a/src/intel/compiler/brw_fs_nir.cpp +++ b/src/intel/compiler/brw_fs_nir.cpp @@ -4103,7 +4103,7 @@ fs_visitor::nir_emit_intrinsic(const fs_builder &bld, nir_intrinsic_instr *instr break; } - case nir_intrinsic_load_channel_num: { + case nir_intrinsic_load_subgroup_invocation: { fs_reg tmp = bld.vgrf(BRW_REGISTER_TYPE_UW); dest = retype(dest, BRW_REGISTER_TYPE_UD); const fs_builder allbld8 = bld.group(8, 0).exec_all(); diff --git a/src/intel/compiler/brw_nir_intrinsics.c b/src/intel/compiler/brw_nir_intrinsics.c index d63570fa2a7..abbbc6f93ec 100644 --- a/src/intel/compiler/brw_nir_intrinsics.c +++ b/src/intel/compiler/brw_nir_intrinsics.c @@ -88,10 +88,10 @@ lower_cs_intrinsics_convert_block(struct lower_intrinsics_state *state, /* We construct the local invocation index from: * * gl_LocalInvocationIndex = - * cs_thread_local_id + channel_num; + * cs_thread_local_id + subgroup_invocation; */ nir_ssa_def *thread_local_id = read_thread_local_id(state); - nir_ssa_def *channel = nir_load_channel_num(b); + nir_ssa_def *channel = nir_load_subgroup_invocation(b); sysval = nir_iadd(b, channel, thread_local_id); break; } |