From 0928060a23ed6bd2607cd7b55666216660394a7f Mon Sep 17 00:00:00 2001 From: OatmealDome Date: Tue, 18 Oct 2022 17:40:43 -0400 Subject: [PATCH 1/3] MoltenVK: Update to version 1.2.0 --- Externals/MoltenVK/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals/MoltenVK/CMakeLists.txt b/Externals/MoltenVK/CMakeLists.txt index 9d77e861d3..0ca22c1c1a 100644 --- a/Externals/MoltenVK/CMakeLists.txt +++ b/Externals/MoltenVK/CMakeLists.txt @@ -1,6 +1,6 @@ include(ExternalProject) -set(MOLTENVK_VERSION "v1.1.11") +set(MOLTENVK_VERSION "v1.2.0") ExternalProject_Add(MoltenVK GIT_REPOSITORY https://github.com/KhronosGroup/MoltenVK.git From 4b790b10ae6100e4fa322245b8810651f5773d59 Mon Sep 17 00:00:00 2001 From: OatmealDome Date: Tue, 18 Oct 2022 17:43:18 -0400 Subject: [PATCH 2/3] Revert "MoltenVK: Add patch to resolve a crash on macOS Mojave" This reverts commit dae3bf9a7de6c1826a7e0a8f7cfca45f9939123e. --- ...pchainKHR_on_macOS_10.14_and_earlier.patch | 55 ------------------- 1 file changed, 55 deletions(-) delete mode 100644 Externals/MoltenVK/patches/0002-Fix-crash-in-vkCreateSwapchainKHR_on_macOS_10.14_and_earlier.patch diff --git a/Externals/MoltenVK/patches/0002-Fix-crash-in-vkCreateSwapchainKHR_on_macOS_10.14_and_earlier.patch b/Externals/MoltenVK/patches/0002-Fix-crash-in-vkCreateSwapchainKHR_on_macOS_10.14_and_earlier.patch deleted file mode 100644 index 0b251e21de..0000000000 --- a/Externals/MoltenVK/patches/0002-Fix-crash-in-vkCreateSwapchainKHR_on_macOS_10.14_and_earlier.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 07ac3c8603e2abc4a062adc9388f1acd08ac421e Mon Sep 17 00:00:00 2001 -From: Tom Butterworth -Date: Thu, 18 Aug 2022 16:54:20 +0100 -Subject: [PATCH 1/2] Fix crash in vkCreateSwapchainKHR() on macOS 10.14 and - earlier - ---- - MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm b/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm -index 781f72bb..df2896db 100644 ---- a/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm -+++ b/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm -@@ -402,10 +402,12 @@ static inline CIE1931XY VkXYColorEXTToCIE1931XY(VkXYColorEXT xy) { - _presentableImages.push_back(_device->createPresentableSwapchainImage(&imgInfo, this, imgIdx, NULL)); - } - --#if MVK_MACOS && !MVK_MACCAT -- NSString* screenName = _mtlLayer.screenMVK.localizedName; --#else - NSString* screenName = @"Main Screen"; -+#if MVK_MACOS && !MVK_MACCAT -+ if ([_mtlLayer.screenMVK respondsToSelector:@selector(localizedName)]) -+ { -+ screenName = _mtlLayer.screenMVK.localizedName; -+ } - #endif - MVKLogInfo("Created %d swapchain images with initial size (%d, %d) and contents scale %.1f for screen %s.", - imgCnt, imgExtent.width, imgExtent.height, _mtlLayer.contentsScale, screenName.UTF8String); - -From 47d2c74bd1a3fcf8369c80696fc890aa90b44802 Mon Sep 17 00:00:00 2001 -From: Tom Butterworth -Date: Thu, 18 Aug 2022 21:55:17 +0100 -Subject: [PATCH 2/2] Style fix - -Co-authored-by: Bill Hollings ---- - MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm b/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm -index df2896db..2739b872 100644 ---- a/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm -+++ b/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm -@@ -404,8 +404,7 @@ static inline CIE1931XY VkXYColorEXTToCIE1931XY(VkXYColorEXT xy) { - - NSString* screenName = @"Main Screen"; - #if MVK_MACOS && !MVK_MACCAT -- if ([_mtlLayer.screenMVK respondsToSelector:@selector(localizedName)]) -- { -+ if ([_mtlLayer.screenMVK respondsToSelector:@selector(localizedName)]) { - screenName = _mtlLayer.screenMVK.localizedName; - } - #endif From 68b33b971843ed402e94d0f89f3571abddc0c98e Mon Sep 17 00:00:00 2001 From: OatmealDome Date: Tue, 18 Oct 2022 17:52:06 -0400 Subject: [PATCH 3/3] MoltenVK: Update framebuffer fetch patch for 1.2.0 --- ...MSLConverter-Enable-use_framebuffer_fetch_sub.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Externals/MoltenVK/patches/0001-SPIRVToMSLConverter-Enable-use_framebuffer_fetch_sub.patch b/Externals/MoltenVK/patches/0001-SPIRVToMSLConverter-Enable-use_framebuffer_fetch_sub.patch index 4cd0c3d8f7..095b40f52e 100644 --- a/Externals/MoltenVK/patches/0001-SPIRVToMSLConverter-Enable-use_framebuffer_fetch_sub.patch +++ b/Externals/MoltenVK/patches/0001-SPIRVToMSLConverter-Enable-use_framebuffer_fetch_sub.patch @@ -1,6 +1,6 @@ -From 4ca33b7a9b149c6fbcc1c88ce08fc49f21294f6d Mon Sep 17 00:00:00 2001 +From b005336f0424de785967e4a67cc5fb7b46e5b321 Mon Sep 17 00:00:00 2001 From: OatmealDome -Date: Sat, 31 Jul 2021 19:18:35 -0400 +Date: Tue, 18 Oct 2022 17:49:12 -0400 Subject: [PATCH] SPIRVToMSLConverter: Enable use_framebuffer_fetch_subpasses --- @@ -8,7 +8,7 @@ Subject: [PATCH] SPIRVToMSLConverter: Enable use_framebuffer_fetch_subpasses 1 file changed, 1 insertion(+) diff --git a/MoltenVKShaderConverter/MoltenVKShaderConverter/SPIRVToMSLConverter.cpp b/MoltenVKShaderConverter/MoltenVKShaderConverter/SPIRVToMSLConverter.cpp -index 17c79394..97e98004 100644 +index 6853b91c..e0155090 100644 --- a/MoltenVKShaderConverter/MoltenVKShaderConverter/SPIRVToMSLConverter.cpp +++ b/MoltenVKShaderConverter/MoltenVKShaderConverter/SPIRVToMSLConverter.cpp @@ -92,6 +92,7 @@ MVK_PUBLIC_SYMBOL SPIRVToMSLConversionOptions::SPIRVToMSLConversionOptions() { @@ -18,7 +18,7 @@ index 17c79394..97e98004 100644 + mslOptions.use_framebuffer_fetch_subpasses = true; } - MVK_PUBLIC_SYMBOL bool mvk::MSLShaderInput::matches(const mvk::MSLShaderInput& other) const { + MVK_PUBLIC_SYMBOL bool mvk::MSLShaderInterfaceVariable::matches(const mvk::MSLShaderInterfaceVariable& other) const { -- -2.30.1 (Apple Git-130) +2.32.1 (Apple Git-133)