Merge pull request #2228 from billhollings/vulkan-sdk-1.3.283

Update dependency libraries to match Vulkan SDK 1.3.283.
KhronosGroup · May 5, 2024 · 1abae61 · 1abae61
2 parents 75fb949 + d2677a6
commit 1abae61
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 65 deletions.
diff --git a/Docs/MoltenVK_Configuration_Parameters.md b/Docs/MoltenVK_Configuration_Parameters.md
@@ -675,7 +675,8 @@ features that are difficult to support otherwise.
 
 Unlike `MVK_USE_METAL_PRIVATE_API`, this setting may be overridden at run time.
 
-This option is not available unless MoltenVK were built with `MVK_USE_METAL_PRIVATE_API` set to `1`.
+This option is not available unless **MoltenVK** was built with `MVK_USE_METAL_PRIVATE_API` set to `1`.
+
 
 ---------------------------------------
 #### MVK_CONFIG_SHADER_DUMP_DIR
@@ -685,5 +686,5 @@ This option is not available unless MoltenVK were built with `MVK_USE_METAL_PRIV
 
 _(The default value is an empty string)._
 
-If not empty, MoltenVK will dump all SPIRV shaders, compiled MSL shaders, and pipeline shader lists to the given directory.
+If not empty, **MoltenVK** will dump all SPIR-V shaders, compiled MSL shaders, and pipeline shader lists to the given directory.
 The directory will be non-recursively created if it doesn't already exist.
diff --git a/Docs/Whats_New.md b/Docs/Whats_New.md
@@ -16,13 +16,31 @@ Copyright (c) 2015-2024 [The Brenwill Workshop Ltd.](http://www.brenwill.com)
 MoltenVK 1.2.9
 --------------
 
-Released TBD
+Released 2024/05/07
 
 - Add support for extensions:
  - `VK_EXT_host_image_copy`
 - To support legacy apps, restore `MoltenVK/dylib` directory via symlink to `MoltenVK/dynamic/dylib`.
-- Add `MVKPerformanceTracker::previous` to track latest-but-one performance measurements.
+- Enhancements to `MVKPerformanceStatistics`. Add `MVKPerformanceTracker::previous`, 
+ `MVKQueuePerformance::waitSubmitCommandBuffers`, and `MVKQueuePerformance::waitPresentSwapchains`.
+- Add `MVK_CONFIG_SHADER_DUMP_DIR` configuration parameter to optionally dump shaders to files.
+- Return **MoltenVK** log level string in `pMessageIdName` field of debug utils callback data.
 - Fix crash when using `VK_EXT_metal_objects` under _ARC_.
+- Fix deadlock when creating a swapchain on a thread other than the main thread.
+- Fix potential memory leak in `vkQueueWaitIdle()`.
+- Ensure buffer bindings are actually used to avoid potential overrun on Metal buffer indexes.
+- Update dependency libraries to match _Vulkan SDK 1.3.283_.
+- Update `MVK_PRIVATE_API_VERSION` to `41`.
+- Update to latest SPIRV-Cross:
+ - MSL: Add support for overlapping bindings.
+ - MSL: Use recursive template for `spvArrayCopy()`.
+ - MSL: Improve argument buffer descriptor aliasing implementation.
+ - MSL: Workaround compiler issue with image fence when used as reference.
+ - MSL: Fix SUMulExtended for 64-bit inputs.
+ - MSL: Handle Atomic{S,U}{Min,Max} with mismatched image sign.
+ - MSL: Handle missing FP16 trancendental overloads.
+ - MSL: Remove pointer wrapper stored in `spvDescriptorArray()` to avoid potential Metal compiler bug. 
+
 
 
 MoltenVK 1.2.8

diff --git a/ExternalRevisions/SPIRV-Cross_repo_revision b/ExternalRevisions/SPIRV-Cross_repo_revision
@@ -1 +1 @@
-de0e72a0db21d1a12eb37cbfd15199b3e66fc9d9
+2ccc81fd826e4dd4a2db2f94b8e6eb738a89f5f1
diff --git a/ExternalRevisions/Volk_repo_revision b/ExternalRevisions/Volk_repo_revision
@@ -1 +1 @@
-01986ac85fa2e5c70df09aeae9c907e27c5d50b2
+3a8068a57417940cf2bf9d837a7bb60d015ca2f1
diff --git a/ExternalRevisions/Vulkan-Headers_repo_revision b/ExternalRevisions/Vulkan-Headers_repo_revision
@@ -1 +1 @@
-577baa05033cf1d9236b3d078ca4b3269ed87a2b
+eaa319dade959cb61ed2229c8ea42e307cc8f8b3
diff --git a/ExternalRevisions/Vulkan-Tools_repo_revision b/ExternalRevisions/Vulkan-Tools_repo_revision
@@ -1 +1 @@
-da49add44591bee19975e4668e418591effd8240
+09f5cc6b0758a05ccd6bcde1342256c15c76670e
diff --git a/ExternalRevisions/glslang_repo_revision b/ExternalRevisions/glslang_repo_revision
@@ -1 +1 @@
-ee2f5d09eaf8f4e8d0d598bd2172fce290d4ca60
+e8dd0b6903b34f1879520b444634c75ea2deedf5
diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKQueue.mm b/MoltenVK/MoltenVK/GPUObjects/MVKQueue.mm
@@ -147,7 +147,6 @@
 
  @autoreleasepool {
  auto* mtlCmdBuff = getMTLCommandBuffer(cmdUse);
-
  [mtlCmdBuff commit];
  [mtlCmdBuff waitUntilCompleted];
  }

diff --git a/MoltenVK/MoltenVK/Utility/MVKBaseObject.h b/MoltenVK/MoltenVK/Utility/MVKBaseObject.h
@@ -226,7 +226,7 @@ static inline const MVKConfiguration& mvkGetMVKConfig(MVKBaseObject* mvkObj) {
 }
 
 /** Returns the reporting level string associated with the specified MoltenVK log level. */
-static constexpr char* mvkGetReportingLevelString(MVKConfigLogLevel logLevel) {
+static inline const char* mvkGetReportingLevelString(MVKConfigLogLevel logLevel) {
  switch (logLevel) {
  case MVK_CONFIG_LOG_LEVEL_ERROR: return "mvk-error";
  case MVK_CONFIG_LOG_LEVEL_WARNING: return "mvk-warn";

diff --git a/Templates/Vulkan-Headers/VK_EXT_metal_objects-unret.gitdiff b/Templates/Vulkan-Headers/VK_EXT_metal_objects-unret.gitdiff
diff --git a/Templates/spirv-tools/build.zip b/Templates/spirv-tools/build.zip
diff --git a/fetchDependencies b/fetchDependencies
@@ -320,14 +320,6 @@ else
  update_repo ${REPO_NAME} ${REPO_URL} ${REPO_REV}
 fi
 
-# Apply a Git diff file to add an __unsafe_unretained ownership
-# qualifier to the Metal object declarations in vulkan_metal.h.
-# This should be a temporary patch until the VK_EXT_metal_objects extension can be properly modified.
-echo "Adding __unsafe_unretained ownership qualifier to the Metal objects in vulkan_metal.h."
-cd ${REPO_NAME}
-git apply ../../Templates/${REPO_NAME}/VK_EXT_metal_objects-unret.gitdiff
-cd - > /dev/null
-
 
 # ----------------- SPIRV-Cross -------------------