Merge branch 'master' of https://github.com/KhronosGroup/MoltenVK
diff --git a/Docs/Whats_New.md b/Docs/Whats_New.md index 192ea30..78395a8 100644 --- a/Docs/Whats_New.md +++ b/Docs/Whats_New.md
@@ -28,6 +28,7 @@ - MVKPipeline: Forbid vertex attribute offsets >= stride. - Fix handling of case where vertex bindings and binding indices don't match up. - Return VK_TIMEOUT even on zero wait if fences not signalled. +- Support iOS builds for arm64e architecture. - Improvements to building external libraries. - Print Vulkan semantics when logging converted GLSL.
diff --git a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj index d25f6cd..c3ce45b 100644 --- a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj +++ b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj
@@ -1033,7 +1033,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = arm64; + VALID_ARCHS = "arm64 arm64e"; }; name = Debug; }; @@ -1044,7 +1044,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = arm64; + VALID_ARCHS = "arm64 arm64e"; }; name = Release; };
diff --git a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj index 8e1dfe1..57a0336 100644 --- a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj +++ b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj
@@ -85,9 +85,9 @@ A964BD5F1C57EFBD00D930D8 /* MoltenVKShaderConverter */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = MoltenVKShaderConverter; sourceTree = BUILT_PRODUCTS_DIR; }; A964BD601C57EFBD00D930D8 /* MoltenVKGLSLToSPIRVConverter.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MoltenVKGLSLToSPIRVConverter.framework; sourceTree = BUILT_PRODUCTS_DIR; }; A964BD611C57EFBD00D930D8 /* MoltenVKGLSLToSPIRVConverter.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MoltenVKGLSLToSPIRVConverter.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - A972AD2A21CEE6A90013AB25 /* libglslang.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libglslang.a; path = "../External/build/iOS/libglslang.a"; sourceTree = "<group>"; }; - A972AD2F21CEE7040013AB25 /* libSPIRVCross.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSPIRVCross.a; path = "../External/build/iOS/libSPIRVCross.a"; sourceTree = "<group>"; }; - A972AD3021CEE7040013AB25 /* libSPIRVTools.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSPIRVTools.a; path = "../External/build/iOS/libSPIRVTools.a"; sourceTree = "<group>"; }; + A972AD2A21CEE6A90013AB25 /* libglslang.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libglslang.a; path = ../External/build/iOS/libglslang.a; sourceTree = "<group>"; }; + A972AD2F21CEE7040013AB25 /* libSPIRVCross.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSPIRVCross.a; path = ../External/build/iOS/libSPIRVCross.a; sourceTree = "<group>"; }; + A972AD3021CEE7040013AB25 /* libSPIRVTools.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSPIRVTools.a; path = ../External/build/iOS/libSPIRVTools.a; sourceTree = "<group>"; }; A972AD3421CEE7330013AB25 /* libSPIRVTools.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSPIRVTools.a; path = ../External/build/macOS/libSPIRVTools.a; sourceTree = "<group>"; }; A972AD3521CEE7330013AB25 /* libSPIRVCross.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSPIRVCross.a; path = ../External/build/macOS/libSPIRVCross.a; sourceTree = "<group>"; }; A972AD3821CEE7480013AB25 /* libglslang.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libglslang.a; path = ../External/build/macOS/libglslang.a; sourceTree = "<group>"; }; @@ -521,7 +521,7 @@ PRODUCT_NAME = MoltenVKGLSLToSPIRVConverter; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = arm64; + VALID_ARCHS = "arm64 arm64e"; }; name = Debug; }; @@ -541,7 +541,7 @@ PRODUCT_NAME = MoltenVKGLSLToSPIRVConverter; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = arm64; + VALID_ARCHS = "arm64 arm64e"; }; name = Release; }; @@ -597,7 +597,7 @@ PRODUCT_NAME = MoltenVKSPIRVToMSLConverter; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = arm64; + VALID_ARCHS = "arm64 arm64e"; }; name = Debug; }; @@ -621,7 +621,7 @@ PRODUCT_NAME = MoltenVKSPIRVToMSLConverter; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = arm64; + VALID_ARCHS = "arm64 arm64e"; }; name = Release; }; @@ -711,6 +711,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.11; ONLY_ACTIVE_ARCH = YES; SKIP_INSTALL = YES; + VALID_ARCHS = x86_64; }; name = Debug; }; @@ -757,6 +758,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.11; SKIP_INSTALL = YES; VALIDATE_PRODUCT = YES; + VALID_ARCHS = x86_64; }; name = Release; };