ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11179 from OatmealDome/mvk-1.2.0 

MoltenVK: Update to version 1.2.0
This commit is contained in:
JMC47 2022-10-22 04:53:01 -04:00 committed by GitHub
parent 5f1b7012ed 68b33b9718
commit 4bf8a2393c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Externals/MoltenVK/CMakeLists.txt vendored
View File

@ -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

10
Externals/MoltenVK/patches/0001-SPIRVToMSLConverter-Enable-use_framebuffer_fetch_sub.patch vendored
View File

@ -1,6 +1,6 @@
From 4ca33b7a9b149c6fbcc1c88ce08fc49f21294f6d Mon Sep 17 00:00:00 2001
From b005336f0424de785967e4a67cc5fb7b46e5b321 Mon Sep 17 00:00:00 2001
From: OatmealDome <julian@oatmealdome.me>
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)

55
Externals/MoltenVK/patches/0002-Fix-crash-in-vkCreateSwapchainKHR_on_macOS_10.14_and_earlier.patch vendored
View File

@ -1,55 +0,0 @@
From 07ac3c8603e2abc4a062adc9388f1acd08ac421e Mon Sep 17 00:00:00 2001
From: Tom Butterworth <tom@derivative.ca>
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 <bangnoise@gmail.com>
Date: Thu, 18 Aug 2022 21:55:17 +0100
Subject: [PATCH 2/2] Style fix
Co-authored-by: Bill Hollings <bill.hollings@brenwill.com>
---
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