Merge pull request #348 from billhollings/master

Align MoltenVK with Vulkan SDK 1.1.92
KhronosGroup · Nov 15, 2018 · e8f29ad · e8f29ad
2 parents 946cdd0 + 2f131a7
commit e8f29ad
Show file tree

Hide file tree

Showing 17 changed files with 73 additions and 858 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,14 @@
 # MoltenVK specific
 Package/
 
+# MoltenVK Dependencies
+External/cereal
+External/glslang
+External/SPIRV-Cross
+External/Vulkan-Headers
+External/Vulkan-Tools
+External/VulkanSamples
+
 # Mac OS X Finder
 .DS_Store
 
@@ -14,14 +22,6 @@ project.xcworkspace/
 build/
 *.[oa]
 
-# Dependencies
-External/cereal
-External/glslang
-External/SPIRV-Cross
-External/Vulkan-Headers
-External/Vulkan-Tools
-External/VulkanSamples
-
 # Other source repository archive directories (protects when importing)
 .hg
 .svn

diff --git a/Demos/LunarG-VulkanSamples/Hologram/HelpersDispatchTable.cpp b/Demos/LunarG-VulkanSamples/Hologram/HelpersDispatchTable.cpp
diff --git a/Demos/LunarG-VulkanSamples/Hologram/HelpersDispatchTable.h b/Demos/LunarG-VulkanSamples/Hologram/HelpersDispatchTable.h
diff --git a/Demos/LunarG-VulkanSamples/Hologram/Hologram.xcodeproj/project.pbxproj b/Demos/LunarG-VulkanSamples/Hologram/Hologram.xcodeproj/project.pbxproj
@@ -91,8 +91,8 @@
 		A9C2AB98218503A400DDBC03 /* MoltenVKGLSLToSPIRVConverter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MoltenVKGLSLToSPIRVConverter.framework; path = ../../../MoltenVKShaderConverter/MoltenVKGLSLToSPIRVConverter/iOS/MoltenVKGLSLToSPIRVConverter.framework; sourceTree = "<group>"; };
 		A9C2AB9B218503BA00DDBC03 /* MoltenVKGLSLToSPIRVConverter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MoltenVKGLSLToSPIRVConverter.framework; path = ../../../MoltenVKShaderConverter/MoltenVKGLSLToSPIRVConverter/macOS/MoltenVKGLSLToSPIRVConverter.framework; sourceTree = "<group>"; };
 		A9C2AB9C218503BA00DDBC03 /* libMoltenVK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libMoltenVK.a; path = ../../../MoltenVK/macOS/static/libMoltenVK.a; sourceTree = "<group>"; };
-		A9D516F61CD575E300097D96 /* HelpersDispatchTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HelpersDispatchTable.cpp; sourceTree = SOURCE_ROOT; };
-		A9D516F71CD575E300097D96 /* HelpersDispatchTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelpersDispatchTable.h; sourceTree = SOURCE_ROOT; };
+		A9D516F61CD575E300097D96 /* HelpersDispatchTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HelpersDispatchTable.cpp; sourceTree = "<group>"; };
+		A9D516F71CD575E300097D96 /* HelpersDispatchTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelpersDispatchTable.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -243,8 +243,6 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "Hologram-iOS" */;
 			buildPhases = (
-				A99789D71CD41746005E7DAC /* ShellScript */,
-				A9006C4A1CDAB49000C6BC7B /* ShellScript */,
 				1D60588D0D05DD3D006BFB54 /* Resources */,
 				1D60588E0D05DD3D006BFB54 /* Sources */,
 				1D60588F0D05DD3D006BFB54 /* Frameworks */,
@@ -262,8 +260,6 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = A977BCFB1B66BB010067E5BF /* Build configuration list for PBXNativeTarget "Hologram-macOS" */;
 			buildPhases = (
-				A99789CD1CD3FFEB005E7DAC /* Run Script */,
-				A9D516F41CD5752C00097D96 /* ShellScript */,
 				A977BCBE1B66BB010067E5BF /* Resources */,
 				A977BCC91B66BB010067E5BF /* Sources */,
 				A977BCF11B66BB010067E5BF /* Frameworks */,
@@ -339,63 +335,6 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
-/* Begin PBXShellScriptBuildPhase section */
-		A9006C4A1CDAB49000C6BC7B /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "../VulkanSamples/Sample-Programs/Hologram/generate-dispatch-table HelpersDispatchTable.cpp";
-		};
-		A99789CD1CD3FFEB005E7DAC /* Run Script */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"",
-			);
-			name = "Run Script";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "../VulkanSamples/Sample-Programs/Hologram/generate-dispatch-table HelpersDispatchTable.h";
-		};
-		A99789D71CD41746005E7DAC /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "../VulkanSamples/Sample-Programs/Hologram/generate-dispatch-table HelpersDispatchTable.h";
-		};
-		A9D516F41CD5752C00097D96 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "../VulkanSamples/Sample-Programs/Hologram/generate-dispatch-table HelpersDispatchTable.cpp\n";
-		};
-/* End PBXShellScriptBuildPhase section */
-
 /* Begin PBXSourcesBuildPhase section */
 		1D60588E0D05DD3D006BFB54 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;

diff --git a/Docs/Whats_New.md b/Docs/Whats_New.md
@@ -12,6 +12,24 @@ Copyright (c) 2014-2018 [The Brenwill Workshop Ltd.](http://www.brenwill.com)
 For best results, use a Markdown reader.*
 
 
+MoltenVK 1.0.27
+---------------
+
+Released 2018/11/15
+
+- Remove destroyed resources from descriptor sets.
+- Forbid compressed formats on non-2D images.
+- Update to latest dependency libraries for Vulkan SDK 1.1.92.
+- Update to latest SPIRV-Cross version:
+	- MSL: Print early_fragment_tests specifier before fragment shader declaration.
+	- MSL: Also pack members at unaligned offsets.
+	- MSL: Also pack 2- and 4- element vectors when necessary.
+	- MSL: Emit wrapper for SSign (sign() for int types).
+	- MSL: Support extended arithmetic opcodes.
+	- Handle opcode OpSourceContinued.
+	- Handle group decorations.
+
+
 MoltenVK 1.0.26
 ---------------
 

diff --git a/ExternalRevisions/SPIRV-Cross_repo_revision b/ExternalRevisions/SPIRV-Cross_repo_revision
@@ -1 +1 @@
-daaffc4717cad9fbeb8848867f38a732120c6317
+ea6bdacd056b77ec1004822482d08b6f31473f25
diff --git a/ExternalRevisions/Vulkan-Headers_repo_revision b/ExternalRevisions/Vulkan-Headers_repo_revision
@@ -1 +1 @@
-2fd5a24ec4a6df303b2155b3f85b6b8c1d56f6c0
+114c3546e195819bd53a34b39f5194b2989a5b12
diff --git a/ExternalRevisions/Vulkan-Tools_repo_revision b/ExternalRevisions/Vulkan-Tools_repo_revision
@@ -1 +1 @@
-f2c941819838c349fe0cc8eb2dddac294fe012e9
+d74a02234851dfacf6b140c1ab4d81becf704098
diff --git a/ExternalRevisions/VulkanSamples_repo_revision b/ExternalRevisions/VulkanSamples_repo_revision
@@ -1 +1 @@
-7cca1899215bbb043914cc5ef74924dc7f189b64
+1a849458db984f77c9ecfa79041ede550094c2f2
diff --git a/ExternalRevisions/glslang_repo_revision b/ExternalRevisions/glslang_repo_revision
@@ -1 +1 @@
-91ac4290bcf2cb930b4fb0981f09c00c0b6797e1
+d509a5eec6f5a65b3ffdfa0a19096f338d2582be
diff --git a/MoltenVK/MoltenVK/API/vk_mvk_moltenvk.h b/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   26
+#define MVK_VERSION_PATCH   27
 
 #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)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		daaffc4717cad9fbeb8848867f38a732120c6317
		ea6bdacd056b77ec1004822482d08b6f31473f25
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2fd5a24ec4a6df303b2155b3f85b6b8c1d56f6c0
		114c3546e195819bd53a34b39f5194b2989a5b12
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		f2c941819838c349fe0cc8eb2dddac294fe012e9
		d74a02234851dfacf6b140c1ab4d81becf704098
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		7cca1899215bbb043914cc5ef74924dc7f189b64
		1a849458db984f77c9ecfa79041ede550094c2f2
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		91ac4290bcf2cb930b4fb0981f09c00c0b6797e1
		d509a5eec6f5a65b3ffdfa0a19096f338d2582be