Pass zero count for variable sized descriptor arrays.

Fixes a GPU crash and doesn't introduce a validation error, unlike passing the maximum size.
js6i · Sep 13, 2024 · 13bdb46 · 13bdb46
1 parent 2f7ae76
commit 13bdb46
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKDescriptor.mm b/MoltenVK/MoltenVK/GPUObjects/MVKDescriptor.mm
@@ -110,8 +110,6 @@ void mvkPopulateShaderConversionConfig(mvk::SPIRVToMSLConversionConfiguration& s
 									   VkDescriptorType descType,
 									   MVKSampler* immutableSampler,
 									   bool usingNativeTextureAtomics) {
-	if (count == 0) { return; }
-
 #define addResourceBinding(spvRezType)												\
 	do {																			\
 		mvk::MSLResourceBinding rb;													\
@@ -533,7 +531,7 @@ void mvkPopulateShaderConversionConfig(mvk::SPIRVToMSLConversionConfiguration& s
                                                                    uint32_t dslIndex) {
 	// For argument buffers, set variable length arrays to length 1 in shader.
 	bool isUsingMtlArgBuff = _layout->isUsingMetalArgumentBuffers();
-	uint32_t descCnt = isUsingMtlArgBuff ? getDescriptorCount(1) : getDescriptorCount();
+	uint32_t descCnt = isUsingMtlArgBuff ? getDescriptorCount(0) : getDescriptorCount();
 
 	// Establish the resource indices to use, by combining the offsets of the DSL and this DSL binding.
     MVKShaderResourceBinding mtlIdxs = _mtlResourceIndexOffsets + dslMTLRezIdxOffsets;

diff --git a/MoltenVKShaderConverter/MoltenVKShaderConverter/SPIRVToMSLConverter.cpp b/MoltenVKShaderConverter/MoltenVKShaderConverter/SPIRVToMSLConverter.cpp
@@ -318,6 +318,9 @@ MVK_PUBLIC_SYMBOL bool SPIRVToMSLConverter::convert(SPIRVToMSLConversionConfigur
 			auto& rbb = rb.resourceBinding;
 			if (rbb.stage == shaderConfig.options.entryPointStage) {
 				pMSLCompiler->add_msl_resource_binding(rbb);
+				if (rbb.count == 0) {
+					pMSLCompiler->set_argument_buffer_device_address_space(rbb.desc_set, true);
+				}
 				if (rb.requiresConstExprSampler) {
 					pMSLCompiler->remap_constexpr_sampler_by_binding(rbb.desc_set, rbb.binding, rb.constExprSampler);
 				}