Merge pull request #249 from billhollings/master

Update MoltenVK to v1.0.21

.travis.yml

@@ -1,8 +1,8 @@
 language: objective-c 
 
 # macOS and Xcode Version
-# Xcode 9.2 running on macOS 10.12
-osx_image: xcode9.2
+# Xcode 9.4 running on macOS 10.13
+osx_image: xcode9.4
 
 # Build dependencies
 install:
@@ -15,6 +15,6 @@ cache:
     - External
 
 script:
-  - xcodebuild -scheme "MoltenVK (Debug)"
-  - xcodebuild -workspace Demos/Demos.xcworkspace -scheme "API-Samples-macOS"
+  - xcodebuild -scheme "MoltenVK Package (Release)"
+  - xcodebuild -workspace Demos/Demos.xcworkspace -scheme "Cube-macOS"
 

Docs/Whats_New.md

@@ -12,16 +12,38 @@ Copyright (c) 2014-2018 [The Brenwill Workshop Ltd.](http://www.brenwill.com)
 For best results, use a Markdown reader.*
 
 
+MoltenVK 1.0.21
+---------------
+
+Released 2018/09/08
+
+- Add support for extensions:
+    - VK_KHR_descriptor_update_template
+- Create 3D MTLTextureViews for 2D image views of 3D textures.
+- Allow building and packaging MoltenVK for of only iOS or only macOS.
+- Move packaging scripts out of Xcode projects and into script files.
+- vkUpdateDescriptorSet: Handle copies of uninitialized descriptors.
+- vkCmdFillBuffer & vkCmdCopyBuffers: Use dispatch call that supports older OS versions.
+- Update to latest SPIRV-Cross version:
+	- MSL: Emit F{Min,Max,Clamp} as fast:: and N{Min,Max,Clamp} as precise
+	- MSL: Implement multisampled array textures.
+	- MSL: Emit spvTexelBufferCoord() on ImageWrite to a Buffer.
+	- MSL: Handle interpolation qualifiers.
+	- MSL: Account for components when assigning locations to varyings.
+	- MSL: Do not emit function constants for version < 1.2.
+
+
+
 MoltenVK 1.0.20
 ---------------
 
 Released 2018/09/01
 
 - Add support for extensions:
-    - VK_KHR_maintenance1;
-	- VK_KHR_shader_draw_parameters;
-	- VK_KHR_get_physical_device_properties2;
-	- VK_KHR_push_descriptor;
+    - VK_KHR_maintenance1
+	- VK_KHR_shader_draw_parameters
+	- VK_KHR_get_physical_device_properties2
+	- VK_KHR_push_descriptor
 - Add ability to track and access supported and enabled extensions.
 - Update to latest SPIRV-Cross version.
 

ExternalRevisions/SPIRV-Cross_repo_revision

@@ -1 +1 @@
-6fd66664e8bdadd3f6281aad711f771ef9c24bbe
+9ffd4172b46408ab6b03625b0f4f9cfafa5aaa71

MoltenVK/MoltenVK.xcodeproj/project.pbxproj

@@ -831,7 +831,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "set -e\n\nexport MVK_PROD_NAME=\"MoltenVK\"\nexport MVK_DYLIB_NAME=\"lib${MVK_PROD_NAME}.dylib\"\nexport MVK_BUILT_PROD_PATH=\"${BUILT_PRODUCTS_DIR}\"\nexport MVK_SYS_FWK_DIR=\"${SDK_DIR}/System/Library/Frameworks\"\nexport MVK_USR_LIB_DIR=\"${SDK_DIR}/usr/lib\"\n\nclang \\\n-dynamiclib \\\n-arch x86_64 \\\n-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} \\\n-compatibility_version 1.0.0 -current_version 1.0.0  \\\n-install_name \"@rpath/${MVK_DYLIB_NAME}\"  \\\n-Wno-incompatible-sysroot \\\n-isysroot ${SDK_DIR} \\\n-iframework ${MVK_SYS_FWK_DIR}  \\\n-framework Metal -framework IOSurface -framework IOKit -framework QuartzCore -framework Foundation \\\n--library-directory ${MVK_USR_LIB_DIR} \\\n-lSystem  -lc++ \\\n-o \"${MVK_BUILT_PROD_PATH}/${MVK_DYLIB_NAME}\" \\\n-force_load \"${MVK_BUILT_PROD_PATH}/${MVK_PROD_NAME}.framework/${MVK_PROD_NAME}\"\n";
+			shellScript = "${SRCROOT}/scripts/create_dylib_macos.sh";
 		};
 		A9731FAD1EDDAE39006B7298 /* Create Dynamic Library */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -845,7 +845,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "set -e\n\nexport MVK_PROD_NAME=\"MoltenVK\"\nexport MVK_DYLIB_NAME=\"lib${MVK_PROD_NAME}.dylib\"\nexport MVK_BUILT_PROD_PATH=\"${BUILT_PRODUCTS_DIR}\"\nexport MVK_SYS_FWK_DIR=\"${SDK_DIR}/System/Library/Frameworks\"\nexport MVK_USR_LIB_DIR=\"${SDK_DIR}/usr/lib\"\n\n# Do not link to IOSurface if deploying to iOS versions below 11.0, doing so will\n# link IOSurface as a private framework, which will trigger App Store rejection.\nif [ $(echo \"${IPHONEOS_DEPLOYMENT_TARGET} >= 11.0\" | bc) -eq 1 ]\nthen\n    export MVK_IOSURFACE_FWK=\"-framework IOSurface\"\nelse\n    export MVK_IOSURFACE_FWK=\"\"\nfi\n\nclang \\\n-dynamiclib \\\n-arch arm64 \\\n-mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}  \\\n-compatibility_version 1.0.0 -current_version 1.0.0  \\\n-install_name \"@rpath/${MVK_DYLIB_NAME}\"  \\\n-Wno-incompatible-sysroot \\\n-isysroot ${SDK_DIR} \\\n-iframework ${MVK_SYS_FWK_DIR}  \\\n-framework Metal ${MVK_IOSURFACE_FWK} -framework UIKit -framework QuartzCore -framework Foundation \\\n--library-directory ${MVK_USR_LIB_DIR} \\\n-lSystem  -lc++ \\\n-o \"${MVK_BUILT_PROD_PATH}/${MVK_DYLIB_NAME}\" \\\n-force_load \"${MVK_BUILT_PROD_PATH}/${MVK_PROD_NAME}.framework/${MVK_PROD_NAME}\"\n";
+			shellScript = "${SRCROOT}/scripts/create_dylib_ios.sh";
 		};
 /* End PBXShellScriptBuildPhase section */
 

MoltenVK/MoltenVK/API/vk_mvk_moltenvk.h

@@ -48,7 +48,7 @@ extern "C" {
  */
 #define MVK_VERSION_MAJOR   1
 #define MVK_VERSION_MINOR   0
-#define MVK_VERSION_PATCH   20
+#define MVK_VERSION_PATCH   21
 
 #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)

MoltenVK/scripts/create_dylib_ios.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -e
+
+export MVK_PROD_NAME="MoltenVK"
+export MVK_DYLIB_NAME="lib${MVK_PROD_NAME}.dylib"
+export MVK_BUILT_PROD_PATH="${BUILT_PRODUCTS_DIR}"
+export MVK_SYS_FWK_DIR="${SDK_DIR}/System/Library/Frameworks"
+export MVK_USR_LIB_DIR="${SDK_DIR}/usr/lib"
+
+# Do not link to IOSurface if deploying to iOS versions below 11.0, doing so will
+# link IOSurface as a private framework, which will trigger App Store rejection.
+if [ $(echo "${IPHONEOS_DEPLOYMENT_TARGET} >= 11.0" | bc) -eq 1 ]
+then
+    export MVK_IOSURFACE_FWK="-framework IOSurface"
+else
+    export MVK_IOSURFACE_FWK=""
+fi
+
+clang \
+-dynamiclib \
+-arch arm64 \
+-mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}  \
+-compatibility_version 1.0.0 -current_version 1.0.0  \
+-install_name "@rpath/${MVK_DYLIB_NAME}"  \
+-Wno-incompatible-sysroot \
+-isysroot ${SDK_DIR} \
+-iframework ${MVK_SYS_FWK_DIR}  \
+-framework Metal ${MVK_IOSURFACE_FWK} -framework UIKit -framework QuartzCore -framework Foundation \
+--library-directory ${MVK_USR_LIB_DIR} \
+-lSystem  -lc++ \
+-o "${MVK_BUILT_PROD_PATH}/${MVK_DYLIB_NAME}" \
+-force_load "${MVK_BUILT_PROD_PATH}/${MVK_PROD_NAME}.framework/${MVK_PROD_NAME}"

MoltenVK/scripts/create_dylib_macos.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -e
+
+export MVK_PROD_NAME="MoltenVK"
+export MVK_DYLIB_NAME="lib${MVK_PROD_NAME}.dylib"
+export MVK_BUILT_PROD_PATH="${BUILT_PRODUCTS_DIR}"
+export MVK_SYS_FWK_DIR="${SDK_DIR}/System/Library/Frameworks"
+export MVK_USR_LIB_DIR="${SDK_DIR}/usr/lib"
+
+clang \
+-dynamiclib \
+-arch x86_64 \
+-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} \
+-compatibility_version 1.0.0 -current_version 1.0.0  \
+-install_name "@rpath/${MVK_DYLIB_NAME}"  \
+-Wno-incompatible-sysroot \
+-isysroot ${SDK_DIR} \
+-iframework ${MVK_SYS_FWK_DIR}  \
+-framework Metal -framework IOSurface -framework IOKit -framework QuartzCore -framework Foundation \
+--library-directory ${MVK_USR_LIB_DIR} \
+-lSystem  -lc++ \
+-o "${MVK_BUILT_PROD_PATH}/${MVK_DYLIB_NAME}" \
+-force_load "${MVK_BUILT_PROD_PATH}/${MVK_PROD_NAME}.framework/${MVK_PROD_NAME}"