diff options
| author | Jason Ekstrand <[email protected]> | 2017-08-22 19:58:59 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2017-11-07 10:37:52 -0800 |
| commit | 3ee91ee6ac739f7ad4d5d4b066073efbeb511b41 (patch) | |
| tree | b11171839e3759db0e8412e27af05c44a1ba4bb7 /src | |
| parent | ad127afcfd5e7d6fb98e7cf2ae02333249d31fb2 (diff) | |
nir: Make ballot intrinsics variable-size
This way they can return either a uvec4 or a uint64_t. At the moment,
this is a no-op since we still always return a uint64_t.
Reviewed-by: Lionel Landwerlin <[email protected]>
Reviewed-by: Iago Toral Quiroga <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/glsl/glsl_to_nir.cpp | 1 | ||||
| -rw-r--r-- | src/compiler/nir/nir_intrinsics.h | 12 | ||||
| -rw-r--r-- | src/compiler/nir/nir_lower_system_values.c | 1 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp index a7dfe57636d..caea2ea3b2b 100644 --- a/src/compiler/glsl/glsl_to_nir.cpp +++ b/src/compiler/glsl/glsl_to_nir.cpp @@ -1165,6 +1165,7 @@ nir_visitor::visit(ir_call *ir) case nir_intrinsic_ballot: { nir_ssa_dest_init(&instr->instr, &instr->dest, ir->return_deref->type->vector_elements, 64, NULL); + instr->num_components = ir->return_deref->type->vector_elements; ir_rvalue *value = (ir_rvalue *) ir->actual_parameters.get_head(); instr->src[0] = nir_src_for_ssa(evaluate_rvalue(value)); diff --git a/src/compiler/nir/nir_intrinsics.h b/src/compiler/nir/nir_intrinsics.h index bb8cfac6620..20bef339ac4 100644 --- a/src/compiler/nir/nir_intrinsics.h +++ b/src/compiler/nir/nir_intrinsics.h @@ -102,7 +102,7 @@ INTRINSIC(shader_clock, 0, ARR(0), true, 2, 0, 0, xx, xx, xx, NIR_INTRINSIC_CAN_ * * GLSL functions from ARB_shader_ballot. */ -INTRINSIC(ballot, 1, ARR(1), true, 1, 0, 0, xx, xx, xx, NIR_INTRINSIC_CAN_ELIMINATE) +INTRINSIC(ballot, 1, ARR(1), true, 0, 0, 0, xx, xx, xx, NIR_INTRINSIC_CAN_ELIMINATE) INTRINSIC(read_invocation, 2, ARR(0, 1), true, 0, 0, 0, xx, xx, xx, NIR_INTRINSIC_CAN_ELIMINATE) INTRINSIC(read_first_invocation, 1, ARR(0), true, 0, 0, 0, xx, xx, xx, NIR_INTRINSIC_CAN_ELIMINATE) @@ -350,11 +350,11 @@ SYSTEM_VALUE(layer_id, 1, 0, xx, xx, xx) SYSTEM_VALUE(view_index, 1, 0, xx, xx, xx) SYSTEM_VALUE(subgroup_size, 1, 0, xx, xx, xx) SYSTEM_VALUE(subgroup_invocation, 1, 0, xx, xx, xx) -SYSTEM_VALUE(subgroup_eq_mask, 1, 0, xx, xx, xx) -SYSTEM_VALUE(subgroup_ge_mask, 1, 0, xx, xx, xx) -SYSTEM_VALUE(subgroup_gt_mask, 1, 0, xx, xx, xx) -SYSTEM_VALUE(subgroup_le_mask, 1, 0, xx, xx, xx) -SYSTEM_VALUE(subgroup_lt_mask, 1, 0, xx, xx, xx) +SYSTEM_VALUE(subgroup_eq_mask, 0, 0, xx, xx, xx) +SYSTEM_VALUE(subgroup_ge_mask, 0, 0, xx, xx, xx) +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) /* Blend constant color values. Float values are clamped. */ diff --git a/src/compiler/nir/nir_lower_system_values.c b/src/compiler/nir/nir_lower_system_values.c index 39b1a260bd0..48c497ef411 100644 --- a/src/compiler/nir/nir_lower_system_values.c +++ b/src/compiler/nir/nir_lower_system_values.c @@ -126,6 +126,7 @@ convert_block(nir_block *block, nir_builder *b) nir_intrinsic_from_system_value(var->data.location); nir_intrinsic_instr *load = nir_intrinsic_instr_create(b->shader, op); nir_ssa_dest_init(&load->instr, &load->dest, 1, 64, NULL); + load->num_components = 1; nir_builder_instr_insert(b, &load->instr); sysval = &load->dest.ssa; break; |