From 9d26aa99d5ec86b1a036231d2070d936060e578c Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Thu, 19 Jan 2023 13:28:33 -0800 Subject: [PATCH] spirv2dxil: Support subgroup SPIR-V caps Part-of: --- src/microsoft/spirv_to_dxil/dxil_spirv_nir.c | 4 ++++ src/microsoft/spirv_to_dxil/spirv_to_dxil.c | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c b/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c index 84a474cd9d7..83061d018d3 100644 --- a/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c +++ b/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c @@ -39,6 +39,10 @@ spirv_to_nir_options = { .draw_parameters = true, .multiview = true, .subgroup_basic = true, + .subgroup_ballot = true, + .subgroup_vote = true, + .subgroup_shuffle = true, + .subgroup_quad = true, }, .ubo_addr_format = nir_address_format_32bit_index_offset, .ssbo_addr_format = nir_address_format_32bit_index_offset, diff --git a/src/microsoft/spirv_to_dxil/spirv_to_dxil.c b/src/microsoft/spirv_to_dxil/spirv_to_dxil.c index 9f0779cc465..9daccf07400 100644 --- a/src/microsoft/spirv_to_dxil/spirv_to_dxil.c +++ b/src/microsoft/spirv_to_dxil/spirv_to_dxil.c @@ -56,7 +56,6 @@ spirv_to_dxil(const uint32_t *words, size_t word_count, if (stage == DXIL_SPIRV_SHADER_NONE || stage == DXIL_SPIRV_SHADER_KERNEL) return false; - glsl_type_singleton_init_or_ref(); struct nir_to_dxil_options opts = {