Merge pull request #2242 from billhollings/update-1.2.10

Maintenance update to 1.2.10.

Docs/MoltenVK_Runtime_UserGuide.md

@@ -61,7 +61,7 @@ graphics and compute functionality, that is built on Apple's [*Metal*](https://d
 graphics and compute framework on *macOS*, *iOS*, and *tvOS*. **MoltenVK** allows you to use *Vulkan*
 graphics and compute functionality to develop modern, cross-platform, high-performance graphical games
 and applications, and to run them across many platforms, including *macOS*, *iOS*, *tvOS*, *Simulators*,
-and *Mac Catalyst* on *macOS 11.0+*.
+and *Mac Catalyst*.
 
 *Metal* uses a different shading language, the *Metal Shading Language (MSL)*, than
 *Vulkan*, which uses *SPIR-V*. **MoltenVK** automatically converts your *SPIR-V* shaders
@@ -175,11 +175,10 @@ Open the *Build Phases* tab and open the *Link Binary With Libraries* list.
  - `Foundation.framework`.
  - `QuartzCore.framework`
  - `CoreGraphics.framework`
+ - `IOSurface.framework`
  - `IOKit.framework` (*macOS*)
  - `AppKit.framework` (*macOS*)
  - `UIKit.framework` (*iOS* or *tvOS*)
- - `IOSurface.framework` (*macOS*, or *iOS* if `IPHONEOS_DEPLOYMENT_TARGET` is at least `iOS 11.0`,
-  or *tvOS* if `TVOS_DEPLOYMENT_TARGET` is at least `tvOS 11.0`)
 
 
 <a name="requirements"></a>
@@ -188,16 +187,10 @@ Open the *Build Phases* tab and open the *Link Binary With Libraries* list.
 **MoltenVK** references the latest *Apple SDK* frameworks. To access these frameworks when building
 your app, and to avoid build errors, be sure to use the latest publicly available version of *Xcode*.
 
->***Note:*** To support `IOSurfaces` on *iOS* or *tvOS*, any app that uses **MoltenVK** must be
-built with a minimum **iOS Deployment Target** (aka `IPHONEOS_DEPLOYMENT_TARGET `) build setting
-of `iOS 11.0` or greater, or a minimum **tvOS Deployment Target** (aka `TVOS_DEPLOYMENT_TARGET `)
-build setting of `tvOS 11.0` or greater.
-
 Once built, your app integrating the **MoltenVK** libraries can be run on *macOS*, *iOS* or *tvOS*
 devices that support *Metal*, or on the *Xcode* *iOS Simulator* or *tvOS Simulator*.
 
-- At runtime, **MoltenVK** requires at least *macOS 10.11*, *iOS 9*, or *tvOS 9*
- (or *iOS 11* or *tvOS 11* if using `IOSurfaces`).
+- At runtime, **MoltenVK** requires at least *macOS 10.15*, *iOS 13*, or *tvOS 13*.
 - Information on *macOS* devices that are compatible with *Metal* can be found in
  [this article](http://www.idownloadblog.com/2015/06/22/how-to-find-mac-el-capitan-metal-compatible).
 - Information on *iOS* devices that are compatible with *Metal* can be found in

Docs/Whats_New.md

@@ -13,6 +13,20 @@ Copyright (c) 2015-2024 [The Brenwill Workshop Ltd.](http://www.brenwill.com)
 
 
 
+MoltenVK 1.2.10
+---------------
+
+Released TBD
+
+- MSL shader conversion, only pass resource bindings that apply to current shader stage.
+- Update documentation for minimum runtime OS requirements to indicate _macOS 10.15_, _iOS 13_, or _tvOS 13_.
+- Update to latest SPIRV-Cross:
+ - MSL: Add option to force depth write in fragment shaders
+ - MSL: Improve handling of padded descriptors with argument buffers
+ - MSL: Support ConstOffsets on image gather.
+
+
+
 MoltenVK 1.2.9
 --------------
 

ExternalRevisions/SPIRV-Cross_repo_revision

@@ -1 +1 @@
-84cdc3b68e5ef5a15ecfacda77c61f24a9080cf9
+d47a140735cb44e511d0188a6318c365789e4699

MoltenVK/MoltenVK.xcodeproj/project.pbxproj

@@ -2658,7 +2658,7 @@
  CLANG_WARN_UNREACHABLE_CODE = YES;
  CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
  COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 1.2.9;
+ CURRENT_PROJECT_VERSION = 1.2.10;
  DYLIB_COMPATIBILITY_VERSION = 1;
  DYLIB_CURRENT_VERSION = 1;
  ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -2729,7 +2729,7 @@
  CLANG_WARN_UNREACHABLE_CODE = YES;
  CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
  COPY_PHASE_STRIP = YES;
- CURRENT_PROJECT_VERSION = 1.2.9;
+ CURRENT_PROJECT_VERSION = 1.2.10;
  DYLIB_COMPATIBILITY_VERSION = 1;
  DYLIB_CURRENT_VERSION = 1;
  ENABLE_NS_ASSERTIONS = NO;

MoltenVK/MoltenVK/API/mvk_private_api.h

@@ -64,7 +64,7 @@ typedef unsigned long MTLArgumentBuffersTier;
  */
 #define MVK_VERSION_MAJOR 1
 #define MVK_VERSION_MINOR 2
-#define MVK_VERSION_PATCH 9
+#define MVK_VERSION_PATCH 10
 
 #define MVK_MAKE_VERSION(major, minor, patch) (((major) * 10000) + ((minor) * 100) + (patch))
 #define MVK_VERSION MVK_MAKE_VERSION(MVK_VERSION_MAJOR, MVK_VERSION_MINOR, MVK_VERSION_PATCH)

MoltenVKShaderConverter/MoltenVKShaderConverter/SPIRVToMSLConverter.cpp

@@ -316,10 +316,11 @@ MVK_PUBLIC_SYMBOL bool SPIRVToMSLConverter::convert(SPIRVToMSLConversionConfigur
  // Add resource bindings and hardcoded constexpr samplers
  for (auto& rb : shaderConfig.resourceBindings) {
  auto& rbb = rb.resourceBinding;
- pMSLCompiler->add_msl_resource_binding(rbb);
-
- if (rb.requiresConstExprSampler) {
- pMSLCompiler->remap_constexpr_sampler_by_binding(rbb.desc_set, rbb.binding, rb.constExprSampler);
+ if (rbb.stage == shaderConfig.options.entryPointStage) {
+ pMSLCompiler->add_msl_resource_binding(rbb);
+ if (rb.requiresConstExprSampler) {
+ pMSLCompiler->remap_constexpr_sampler_by_binding(rbb.desc_set, rbb.binding, rb.constExprSampler);
+ }
  }
  }
 

README.md

@@ -191,22 +191,10 @@ to your app or game, first add the value `-fno-objc-msgsend-selector-stubs` to t
 projects, build **MoltenVK** with *Xcode 14* or later, and then link `MoltenVK.xcframework`
 to your app or game using *Xcode 13* or earlier.
 
-**MoltenVK** can be built to support at least *macOS 10.11*, *iOS 9*, or *tvOS 9*, but the default
-_Xcode_ build settings in the included _Xcode_ projects are set to a minimum deployment target of 
-*macOS 10.13*, *iOS 11*, and *tvOS 11*, which are the oldest OS versions supported by the current
-_Xcode_ version. If you require support for earlier OS versions, modify the `MACOSX_DEPLOYMENT_TARGET`,
-`IPHONEOS_DEPLOYMENT_TARGET`, or `TVOS_DEPLOYMENT_TARGET` build settings in _Xcode_ before building **MoltenVK**.
-
->***Note:*** To support `IOSurfaces` on *iOS* or *tvOS*, **MoltenVK**, and any app that uses
-**MoltenVK**, must be built with a minimum **iOS Deployment Target** (aka `IPHONEOS_DEPLOYMENT_TARGET `)
-build setting of `iOS 11.0` or greater, or a minimum **tvOS Deployment Target** (aka `TVOS_DEPLOYMENT_TARGET `)
-build setting of `tvOS 11.0` or greater.
-
 Once built, the **MoltenVK** libraries can be run on *macOS*, *iOS*, *tvOS*, or *visionOS* devices
 that support *Metal*,or on the *Xcode* *iOS Simulator*, *tvOS Simulator*, or *visionOS Simulator*.
 
-- At runtime, **MoltenVK** requires at least *macOS 10.11*, *iOS 9.0*, *tvOS 9.0*,
- or *visionOS 1.0* (or *iOS 11* or *tvOS 11* if using `IOSurfaces`).
+- The minimum runtime OS versions are indicated in the _Deployment Target_ build settings in `MoltenVK.xcodeproj`.
 - Information on *macOS* devices that are compatible with *Metal* can be found in
  [this article](http://www.idownloadblog.com/2015/06/22/how-to-find-mac-el-capitan-metal-compatible).
 - Information on *iOS* devices that are compatible with *Metal* can be found in