Ryujinx/moltenvk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added MSL Version 3.1 for switch case

Browse Source 
In this commit, I've added support for Xcode 15, and added a case for MSL version 3.1. I added this because I noticed xcode was throwing some warnings about an unhandled switch case.
This commit is contained in:
Antarctic Coder 2023-07-05 09:47:38 -04:00
parent 41dbd9d490
commit 6bca44c612
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Common/MVKCommonEnvironment.h
View File

@ -88,6 +88,10 @@ extern "C" {
#endif
/** Building with Xcode versions. iOS version also covers tvOS. */
#ifndef MVK_XCODE_15
# define MVK_XCODE_15 ((__MAC_OS_X_VERSION_MAX_ALLOWED >= 140000) || \
(__IPHONE_OS_VERSION_MAX_ALLOWED >= 170000))
#endif
#ifndef MVK_XCODE_14_3
# define MVK_XCODE_14_3 ((__MAC_OS_X_VERSION_MAX_ALLOWED >= 130300) || \
(__IPHONE_OS_VERSION_MAX_ALLOWED >= 160400))

5
MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
View File

@ -2097,6 +2097,11 @@ void MVKPhysicalDevice::initMetalFeatures() {
_metalFeatures.mslVersion = SPIRV_CROSS_NAMESPACE::CompilerMSL::Options::make_msl_version(maj, min);
switch (_metalFeatures.mslVersionEnum) {
#if MVK_XCODE_15
case MTLLanguageVersion3_1:
setMSLVersion(3, 1);
break;
#endif
#if MVK_XCODE_14
case MTLLanguageVersion3_0:
setMSLVersion(3, 0);