Merge pull request #2371 from billhollings/fix-spvx-namespace

Fix SPIRV-Cross namespace build error on some alternate build environments.
KhronosGroup · Oct 9, 2024 · 78396b7 · 78396b7
2 parents da408fc + 856c823
commit 78396b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Docs/Whats_New.md b/Docs/Whats_New.md
@@ -18,7 +18,8 @@ MoltenVK 1.2.12
 
 Released TBD
 
-
+- Fix _SPIRV-Cross_ namespace build error on some alternate build environments.
+- Fix recent failure of `CI.yml` to upload release build artifacts to GitHub.
 
 
 

diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKDescriptorSet.mm b/MoltenVK/MoltenVK/GPUObjects/MVKDescriptorSet.mm
@@ -263,7 +263,7 @@ static void populateAuxBuffer(mvk::SPIRVToMSLConversionConfiguration& shaderConf
 		MVKShaderStageResourceBinding buffBinding;
 		buffBinding.bufferIndex = getBufferSizeBufferArgBuferIndex();
 		populateAuxBuffer(shaderConfig, buffBinding, descSetIndex,
-						  MVK_spirv_cross::kBufferSizeBufferBinding,
+						  SPIRV_CROSS_NAMESPACE::kBufferSizeBufferBinding,
 						  getMetalFeatures().nativeTextureAtomics);
 	}