diff --git a/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/project.pbxproj b/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/project.pbxproj index adb88b3a..145fcef1 100644 --- a/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/project.pbxproj +++ b/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/project.pbxproj @@ -659,7 +659,6 @@ PRODUCT_NAME = "API-Samples"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = arm64; }; name = Debug; }; @@ -681,7 +680,6 @@ PRODUCT_NAME = "API-Samples"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = arm64; }; name = Release; }; @@ -738,6 +736,7 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -768,6 +767,7 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; diff --git a/Demos/LunarG-VulkanSamples/Cube/Cube.xcodeproj/project.pbxproj b/Demos/LunarG-VulkanSamples/Cube/Cube.xcodeproj/project.pbxproj index 75030f0d..2766dab5 100644 --- a/Demos/LunarG-VulkanSamples/Cube/Cube.xcodeproj/project.pbxproj +++ b/Demos/LunarG-VulkanSamples/Cube/Cube.xcodeproj/project.pbxproj @@ -359,7 +359,6 @@ PRODUCT_NAME = Cube; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = arm64; }; name = Debug; }; @@ -380,13 +379,13 @@ PRODUCT_NAME = Cube; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = arm64; }; name = Release; }; C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -417,6 +416,7 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; diff --git a/Demos/LunarG-VulkanSamples/Hologram/Hologram.xcodeproj/project.pbxproj b/Demos/LunarG-VulkanSamples/Hologram/Hologram.xcodeproj/project.pbxproj index 9129ae35..3f77a1bf 100644 --- a/Demos/LunarG-VulkanSamples/Hologram/Hologram.xcodeproj/project.pbxproj +++ b/Demos/LunarG-VulkanSamples/Hologram/Hologram.xcodeproj/project.pbxproj @@ -360,7 +360,6 @@ LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../MoltenVK/iOS/static\""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = arm64; }; name = Debug; }; @@ -375,7 +374,6 @@ LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../MoltenVK/iOS/static\""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = arm64; }; name = Release; }; @@ -416,6 +414,7 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -448,6 +447,7 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; diff --git a/Docs/Whats_New.md b/Docs/Whats_New.md index a114c71b..952e7967 100644 --- a/Docs/Whats_New.md +++ b/Docs/Whats_New.md @@ -13,6 +13,14 @@ For best results, use a Markdown reader.* +MoltenVK 1.0.44 +--------------- + +Released TBD + +- Refactor **MoltenVK** *Xcode* build architectures + + MoltenVK 1.0.43 --------------- diff --git a/ExternalDependencies.xcodeproj/project.pbxproj b/ExternalDependencies.xcodeproj/project.pbxproj index e0c0ac2b..578b93f4 100644 --- a/ExternalDependencies.xcodeproj/project.pbxproj +++ b/ExternalDependencies.xcodeproj/project.pbxproj @@ -3720,34 +3720,24 @@ A90FD89D21CC4EAB00B92BB2 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = arm64; - BITCODE_GENERATION_MODE = bitcode; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross", ); PRODUCT_NAME = SPIRVCross; SDKROOT = iphoneos; - VALID_ARCHS = arm64; }; name = Debug; }; A90FD89E21CC4EAB00B92BB2 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = arm64; - BITCODE_GENERATION_MODE = bitcode; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross", ); PRODUCT_NAME = SPIRVCross; SDKROOT = iphoneos; - VALID_ARCHS = arm64; }; name = Release; }; @@ -3826,10 +3816,6 @@ A972A80D21CECBBF0013AB25 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = arm64; - BITCODE_GENERATION_MODE = bitcode; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEPLOYMENT_POSTPROCESSING = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; HEADER_SEARCH_PATHS = ( @@ -3841,17 +3827,12 @@ ); PRODUCT_NAME = SPIRVTools; SDKROOT = iphoneos; - VALID_ARCHS = arm64; }; name = Debug; }; A972A80E21CECBBF0013AB25 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = arm64; - BITCODE_GENERATION_MODE = bitcode; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEPLOYMENT_POSTPROCESSING = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; HEADER_SEARCH_PATHS = ( @@ -3863,7 +3844,6 @@ ); PRODUCT_NAME = SPIRVTools; SDKROOT = iphoneos; - VALID_ARCHS = arm64; }; name = Release; }; @@ -3904,11 +3884,7 @@ A972ABDA21CED7BC0013AB25 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = arm64; - BITCODE_GENERATION_MODE = bitcode; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = NO; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "AMD_EXTENSIONS=1", @@ -3924,18 +3900,13 @@ ); PRODUCT_NAME = glslang; SDKROOT = iphoneos; - VALID_ARCHS = arm64; }; name = Debug; }; A972ABDB21CED7BC0013AB25 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = arm64; - BITCODE_GENERATION_MODE = bitcode; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = NO; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "AMD_EXTENSIONS=1", @@ -3951,7 +3922,6 @@ ); PRODUCT_NAME = glslang; SDKROOT = iphoneos; - VALID_ARCHS = arm64; }; name = Release; }; @@ -4003,6 +3973,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = NO; @@ -4050,6 +4021,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = NO; diff --git a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj index dc881171..fb23b985 100644 --- a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj +++ b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj @@ -1146,24 +1146,18 @@ A9B8EE1E1A98D796009C5A02 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = arm64; - BITCODE_GENERATION_MODE = bitcode; IPHONEOS_DEPLOYMENT_TARGET = 9.0; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = arm64; }; name = Debug; }; A9B8EE1F1A98D796009C5A02 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = arm64; - BITCODE_GENERATION_MODE = bitcode; IPHONEOS_DEPLOYMENT_TARGET = 9.0; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = arm64; }; name = Release; }; @@ -1172,7 +1166,6 @@ buildSettings = { MACOSX_DEPLOYMENT_TARGET = 10.11; SDKROOT = macosx; - VALID_ARCHS = x86_64; }; name = Debug; }; @@ -1181,7 +1174,6 @@ buildSettings = { MACOSX_DEPLOYMENT_TARGET = 10.11; SDKROOT = macosx; - VALID_ARCHS = x86_64; }; name = Release; }; @@ -1189,6 +1181,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = NO; @@ -1249,6 +1242,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = NO; diff --git a/MoltenVK/MoltenVK/API/vk_mvk_moltenvk.h b/MoltenVK/MoltenVK/API/vk_mvk_moltenvk.h index 80be2fc2..71e165e4 100644 --- a/MoltenVK/MoltenVK/API/vk_mvk_moltenvk.h +++ b/MoltenVK/MoltenVK/API/vk_mvk_moltenvk.h @@ -50,7 +50,7 @@ typedef unsigned long MTLLanguageVersion; */ #define MVK_VERSION_MAJOR 1 #define MVK_VERSION_MINOR 0 -#define MVK_VERSION_PATCH 43 +#define MVK_VERSION_PATCH 44 #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) diff --git a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj index 4de848f9..a52b7835 100644 --- a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj +++ b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj @@ -705,8 +705,6 @@ A93747401A9A8B2900F29B34 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = arm64; - BITCODE_GENERATION_MODE = bitcode; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = NO; CLANG_WARN_UNREACHABLE_CODE = NO; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; @@ -716,15 +714,12 @@ PRODUCT_NAME = MoltenVKGLSLToSPIRVConverter; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = arm64; }; name = Debug; }; A93747411A9A8B2900F29B34 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = arm64; - BITCODE_GENERATION_MODE = bitcode; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = NO; CLANG_WARN_UNREACHABLE_CODE = NO; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; @@ -734,7 +729,6 @@ PRODUCT_NAME = MoltenVKGLSLToSPIRVConverter; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = arm64; }; name = Release; }; @@ -769,8 +763,6 @@ A93903BD1C57E9D700FE90DC /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = arm64; - BITCODE_GENERATION_MODE = bitcode; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross", @@ -780,15 +772,12 @@ PRODUCT_NAME = MoltenVKSPIRVToMSLConverter; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = arm64; }; name = Debug; }; A93903BE1C57E9D700FE90DC /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = arm64; - BITCODE_GENERATION_MODE = bitcode; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross", @@ -798,7 +787,6 @@ PRODUCT_NAME = MoltenVKSPIRVToMSLConverter; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = arm64; }; name = Release; }; @@ -834,6 +822,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = NO; @@ -880,7 +869,6 @@ MACOSX_DEPLOYMENT_TARGET = 10.11; ONLY_ACTIVE_ARCH = YES; SKIP_INSTALL = YES; - VALID_ARCHS = x86_64; }; name = Debug; }; @@ -888,6 +876,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = NO; @@ -934,7 +923,6 @@ MACOSX_DEPLOYMENT_TARGET = 10.11; SKIP_INSTALL = YES; VALIDATE_PRODUCT = YES; - VALID_ARCHS = x86_64; }; name = Release; };