Merge pull request #2197 from Try/rich-descriptor-fixup

HansKristian-Work · web-flow · commit 5e963d62fa3f · 2023-09-12T11:42:26.000+02:00
Fixup check for SPVFuncImplVariableSizedDescriptor
diff --git a/spirv_msl.cpp b/spirv_msl.cpp
@@ -7290,7 +7290,8 @@ void CompilerMSL::emit_custom_functions()
 			end_scope_decl();
 			statement("");
 
-			if (msl_options.runtime_array_rich_descriptor)
+			if (msl_options.runtime_array_rich_descriptor &&
+			    spv_function_implementations.count(SPVFuncImplVariableSizedDescriptor) != 0)
 			{
 				statement("template<typename T>");
 				statement("struct spvDescriptorArray<device T*>");

Original file line number	Diff line number	Diff line change
`@@ -7290,7 +7290,8 @@ void CompilerMSL::emit_custom_functions()`
`7290`	`7290`	`end_scope_decl();`
`7291`	`7291`	`statement("");`
`7292`	`7292`
`7293`		`- if (msl_options.runtime_array_rich_descriptor)`
	`7293`	`+ if (msl_options.runtime_array_rich_descriptor &&`
	`7294`	`+ spv_function_implementations.count(SPVFuncImplVariableSizedDescriptor) != 0)`
`7294`	`7295`	`{`
`7295`	`7296`	`statement("template<typename T>");`
`7296`	`7297`	`statement("struct spvDescriptorArray<device T*>");`