Module: Mesa Branch: master Commit: 1a83c9a619dc8c7f50ad8f6381b178785c1b0099 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1a83c9a619dc8c7f50ad8f6381b178785c1b0099
Author: Caio Marcelo de Oliveira Filho <[email protected]> Date: Fri Jun 7 23:08:04 2019 -0700 spirv: Implement SPV_EXT_demote_to_helper_invocation Reviewed-by: Jason Ekstrand <[email protected]> --- src/compiler/shader_info.h | 1 + src/compiler/spirv/spirv_to_nir.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/src/compiler/shader_info.h b/src/compiler/shader_info.h index 46588c327f9..f71b93e84d0 100644 --- a/src/compiler/shader_info.h +++ b/src/compiler/shader_info.h @@ -35,6 +35,7 @@ extern "C" { struct spirv_supported_capabilities { bool address; bool atomic_storage; + bool demote_to_helper_invocation; bool derivative_group; bool descriptor_array_dynamic_indexing; bool descriptor_array_non_uniform_indexing; diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index b9eb69c7247..3e88e54ab84 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -3718,6 +3718,10 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode, spv_check_supported(fragment_shader_pixel_interlock, cap); break; + case SpvCapabilityDemoteToHelperInvocationEXT: + spv_check_supported(demote_to_helper_invocation, cap); + break; + default: vtn_fail("Unhandled capability: %s (%u)", spirv_capability_to_string(cap), cap); @@ -4532,6 +4536,28 @@ vtn_handle_body_instruction(struct vtn_builder *b, SpvOp opcode, vtn_emit_barrier(b, nir_intrinsic_end_invocation_interlock); break; + case SpvOpDemoteToHelperInvocationEXT: { + nir_intrinsic_instr *intrin = + nir_intrinsic_instr_create(b->shader, nir_intrinsic_demote); + nir_builder_instr_insert(&b->nb, &intrin->instr); + break; + } + + case SpvOpIsHelperInvocationEXT: { + nir_intrinsic_instr *intrin = + nir_intrinsic_instr_create(b->shader, nir_intrinsic_is_helper_invocation); + nir_ssa_dest_init(&intrin->instr, &intrin->dest, 1, 1, NULL); + nir_builder_instr_insert(&b->nb, &intrin->instr); + + struct vtn_type *res_type = + vtn_value(b, w[1], vtn_value_type_type)->type; + struct vtn_ssa_value *val = vtn_create_ssa_value(b, res_type->type); + val->def = &intrin->dest.ssa; + + vtn_push_ssa(b, w[2], res_type, val); + break; + } + default: vtn_fail_with_opcode("Unhandled opcode", opcode); } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
