diff options
| author | Eric Anholt <eric@anholt.net> | 2016-08-05 17:10:18 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2016-08-19 13:11:36 -0700 |
| commit | c35f9792202c4450d19c5616e2a38b9e81e418fe (patch) | |
| tree | 58ac7d76a5932a8dff9e3afe1828a30dae4eddd1 /src/compiler/nir/nir_lower_system_values.c | |
| parent | 24728637e2c006012e4c0a3d87629b53beaddd3b (diff) | |
| download | external_mesa3d-c35f9792202c4450d19c5616e2a38b9e81e418fe.zip external_mesa3d-c35f9792202c4450d19c5616e2a38b9e81e418fe.tar.gz external_mesa3d-c35f9792202c4450d19c5616e2a38b9e81e418fe.tar.bz2 | |
nir: Add nir_builder support for individual system value loads.
The previous nir_load_system_value(b, nir_intrinsic_load_whatever), 0) was
rather verbose, when system values should be easy to generate.
The index is left out because only one system value had an index included
in it.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/compiler/nir/nir_lower_system_values.c')
| -rw-r--r-- | src/compiler/nir/nir_lower_system_values.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/compiler/nir/nir_lower_system_values.c b/src/compiler/nir/nir_lower_system_values.c index 3ca8e08..9747ac4 100644 --- a/src/compiler/nir/nir_lower_system_values.c +++ b/src/compiler/nir/nir_lower_system_values.c @@ -62,10 +62,8 @@ convert_block(nir_block *block, nir_builder *b) local_size.u32[1] = b->shader->info.cs.local_size[1]; local_size.u32[2] = b->shader->info.cs.local_size[2]; - nir_ssa_def *group_id = - nir_load_system_value(b, nir_intrinsic_load_work_group_id, 0); - nir_ssa_def *local_id = - nir_load_system_value(b, nir_intrinsic_load_local_invocation_id, 0); + nir_ssa_def *group_id = nir_load_work_group_id(b); + nir_ssa_def *local_id = nir_load_local_invocation_id(b); sysval = nir_iadd(b, nir_imul(b, group_id, nir_build_imm(b, 3, 32, local_size)), @@ -87,8 +85,7 @@ convert_block(nir_block *block, nir_builder *b) * gl_WorkGroupSize.y + gl_LocalInvocationID.y * * gl_WorkGroupSize.x + gl_LocalInvocationID.x" */ - nir_ssa_def *local_id = - nir_load_system_value(b, nir_intrinsic_load_local_invocation_id, 0); + nir_ssa_def *local_id = nir_load_local_invocation_id(b); nir_ssa_def *size_x = nir_imm_int(b, b->shader->info.cs.local_size[0]); nir_ssa_def *size_y = nir_imm_int(b, b->shader->info.cs.local_size[1]); @@ -104,17 +101,17 @@ convert_block(nir_block *block, nir_builder *b) case SYSTEM_VALUE_VERTEX_ID: if (b->shader->options->vertex_id_zero_based) { sysval = nir_iadd(b, - nir_load_system_value(b, nir_intrinsic_load_vertex_id_zero_base, 0), - nir_load_system_value(b, nir_intrinsic_load_base_vertex, 0)); + nir_load_vertex_id_zero_base(b), + nir_load_base_vertex(b)); } else { - sysval = nir_load_system_value(b, nir_intrinsic_load_vertex_id, 0); + sysval = nir_load_vertex_id(b); } break; case SYSTEM_VALUE_INSTANCE_INDEX: sysval = nir_iadd(b, - nir_load_system_value(b, nir_intrinsic_load_instance_id, 0), - nir_load_system_value(b, nir_intrinsic_load_base_instance, 0)); + nir_load_instance_id(b), + nir_load_base_instance(b)); break; default: |