Module: Mesa Branch: main Commit: c9c50f89b2b68300d473060df5d8d841e2e1e49e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c9c50f89b2b68300d473060df5d8d841e2e1e49e
Author: Caio Oliveira <[email protected]> Date: Wed Sep 15 13:20:53 2021 -0700 spirv: Use the incorporated names Reviewed-by: Ian Romanick <[email protected]> Reviewed-by: Jason Ekstrand <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14209> --- src/compiler/spirv/spirv_to_nir.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index f804031a200..204dff2f465 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -4458,10 +4458,10 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode, case SpvCapabilityImageGatherExtended: case SpvCapabilityStorageImageExtendedFormats: case SpvCapabilityVector16: - case SpvCapabilityDotProductKHR: - case SpvCapabilityDotProductInputAllKHR: - case SpvCapabilityDotProductInput4x8BitKHR: - case SpvCapabilityDotProductInput4x8BitPackedKHR: + case SpvCapabilityDotProduct: + case SpvCapabilityDotProductInputAll: + case SpvCapabilityDotProductInput4x8Bit: + case SpvCapabilityDotProductInput4x8BitPacked: break; case SpvCapabilityLinkage: @@ -4702,7 +4702,7 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode, spv_check_supported(fragment_shader_pixel_interlock, cap); break; - case SpvCapabilityDemoteToHelperInvocationEXT: + case SpvCapabilityDemoteToHelperInvocation: spv_check_supported(demote_to_helper_invocation, cap); b->uses_demote_to_helper_invocation = true; break; @@ -6120,7 +6120,7 @@ vtn_handle_body_instruction(struct vtn_builder *b, SpvOp opcode, nir_end_invocation_interlock(&b->nb); break; - case SpvOpDemoteToHelperInvocationEXT: { + case SpvOpDemoteToHelperInvocation: { nir_demote(&b->nb); break; }
