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

MoltenVK 1.0.26.

Browse Source 
Fixes to create_dylib.sh to cleanup bitcode and architecture support.
Update to latest SPIRV-Cross version.
Update MoltenVK version to 1.0.26.
Update Xcode projects to Xcode 10.1.
Update What's New document.
This commit is contained in:
Bill Hollings 2018-11-06 16:01:36 -05:00
parent 1d64dae0cc
commit 38160b3eb3
31 changed files with 104 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/project.pbxproj
View File

@ -545,7 +545,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = { 29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 1000; LastUpgradeCheck = 1010;
TargetAttributes = { TargetAttributes = {
A977BCBD1B66BB010067E5BF = { A977BCBD1B66BB010067E5BF = {
DevelopmentTeam = VU3TCKU48B; DevelopmentTeam = VU3TCKU48B;

2
Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/xcshareddata/xcschemes/API-Samples-iOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1000" LastUpgradeVersion = "1010"
version = "2.0"> version = "2.0">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/xcshareddata/xcschemes/API-Samples-macOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1000" LastUpgradeVersion = "1010"
version = "2.0"> version = "2.0">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
Demos/LunarG-VulkanSamples/Cube/Cube.xcodeproj/project.pbxproj
View File

@ -234,7 +234,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = { 29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 1000; LastUpgradeCheck = 1010;
TargetAttributes = { TargetAttributes = {
A9B53B0F1C3AC0BE00ABC6F6 = { A9B53B0F1C3AC0BE00ABC6F6 = {
DevelopmentTeam = VU3TCKU48B; DevelopmentTeam = VU3TCKU48B;

2
Demos/LunarG-VulkanSamples/Cube/Cube.xcodeproj/xcshareddata/xcschemes/Cube-iOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1000" LastUpgradeVersion = "1010"
version = "2.0"> version = "2.0">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
Demos/LunarG-VulkanSamples/Cube/Cube.xcodeproj/xcshareddata/xcschemes/Cube-macOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1000" LastUpgradeVersion = "1010"
version = "2.0"> version = "2.0">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
Demos/LunarG-VulkanSamples/Hologram/Hologram.xcodeproj/project.pbxproj
View File

@ -283,7 +283,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = { 29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 1000; LastUpgradeCheck = 1010;
TargetAttributes = { TargetAttributes = {
A977BCBD1B66BB010067E5BF = { A977BCBD1B66BB010067E5BF = {
DevelopmentTeam = VU3TCKU48B; DevelopmentTeam = VU3TCKU48B;

2
Demos/LunarG-VulkanSamples/Hologram/Hologram.xcodeproj/xcshareddata/xcschemes/Hologram-iOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1000" LastUpgradeVersion = "1010"
version = "2.0"> version = "2.0">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
Demos/LunarG-VulkanSamples/Hologram/Hologram.xcodeproj/xcshareddata/xcschemes/Hologram-macOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1000" LastUpgradeVersion = "1010"
version = "2.0"> version = "2.0">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

16
Docs/Whats_New.md
View File

@ -12,6 +12,22 @@ Copyright (c) 2014-2018 [The Brenwill Workshop Ltd.](http://www.brenwill.com)
For best results, use a Markdown reader.* For best results, use a Markdown reader.*
MoltenVK 1.0.26
---------------
Released 2018/11/06
- Fix memoryTypes order to match Vulkan spec.
- Allow linear images to use host-coherent memory.
- Generate Bitcode in iOS libraries.
- Allow all pipeline attachements to be unused.
- Perform usage checks on 3D images.
- Enhancements to dylib generation script.
- Update to latest SPIRV-Cross version:
- MSL: Support 8 & 16 bit types.
- MSL: Updated spec constant support.
MoltenVK 1.0.25 MoltenVK 1.0.25
--------------- ---------------

4
ExternalRevisions/README.md
View File

@ -126,12 +126,16 @@ if you encounter any building errors, you may need to re-add the *SPIRV-Cross* l
spirv_cfg.cpp spirv_cfg.cpp
spirv_cfg.hpp spirv_cfg.hpp
spirv_common.hpp spirv_common.hpp
spirv_cross_parsed_ir.cpp
spirv_cross_parsed_ir.hpp
spirv_cross.cpp spirv_cross.cpp
spirv_cross.hpp spirv_cross.hpp
spirv_glsl.cpp spirv_glsl.cpp
spirv_glsl.hpp spirv_glsl.hpp
spirv_msl.cpp spirv_msl.cpp
spirv_msl.hpp spirv_msl.hpp
spirv_parser.cpp
spirv_parser.hpp
In the ***Choose options for adding these files*** dialog that opens, select the In the ***Choose options for adding these files*** dialog that opens, select the
***Create groups*** option, add the files to *both* the `MoltenVKSPIRVToMSLConverter-iOS` ***Create groups*** option, add the files to *both* the `MoltenVKSPIRVToMSLConverter-iOS`

2
ExternalRevisions/SPIRV-Cross_repo_revision
View File

@ -1 +1 @@
cc5c0204d8bcdadbb4add03e53346df98bf27fa4 daaffc4717cad9fbeb8848867f38a732120c6317

2
MoltenVK/MoltenVK.xcodeproj/project.pbxproj
View File

@ -752,7 +752,7 @@
A9F55D25198BE6A7004EC31B /* Project object */ = { A9F55D25198BE6A7004EC31B /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 1000; LastUpgradeCheck = 1010;
ORGANIZATIONNAME = "The Brenwill Workshop Ltd."; ORGANIZATIONNAME = "The Brenwill Workshop Ltd.";
TargetAttributes = { TargetAttributes = {
A9B8EE091A98D796009C5A02 = { A9B8EE091A98D796009C5A02 = {

2
MoltenVK/MoltenVK.xcodeproj/xcshareddata/xcschemes/MoltenVK-iOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1000" LastUpgradeVersion = "1010"
version = "2.0"> version = "2.0">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
MoltenVK/MoltenVK.xcodeproj/xcshareddata/xcschemes/MoltenVK-macOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1000" LastUpgradeVersion = "1010"
version = "2.0"> version = "2.0">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
MoltenVK/MoltenVK/API/vk_mvk_moltenvk.h
View File

@ -48,7 +48,7 @@ extern "C" {
*/ */
#define MVK_VERSION_MAJOR 1 #define MVK_VERSION_MAJOR 1
#define MVK_VERSION_MINOR 0 #define MVK_VERSION_MINOR 0
#define MVK_VERSION_PATCH 25 #define MVK_VERSION_PATCH 26
#define MVK_MAKE_VERSION(major, minor, patch) (((major) * 10000) + ((minor) * 100) + (patch)) #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) #define MVK_VERSION MVK_MAKE_VERSION(MVK_VERSION_MAJOR, MVK_VERSION_MINOR, MVK_VERSION_PATCH)

5
MoltenVK/MoltenVK/Commands/MVKCommandBuffer.mm
View File

@ -233,7 +233,7 @@ void MVKCommandEncoder::beginNextSubpass(VkSubpassContents contents) {
setSubpass(contents, _renderSubpassIndex + 1); setSubpass(contents, _renderSubpassIndex + 1);
} }
/** Sets the current render subpass to the subpass with the specified index. */ // Sets the current render subpass to the subpass with the specified index.
void MVKCommandEncoder::setSubpass(VkSubpassContents subpassContents, uint32_t subpassIndex) { void MVKCommandEncoder::setSubpass(VkSubpassContents subpassContents, uint32_t subpassIndex) {
_subpassContents = subpassContents; _subpassContents = subpassContents;
_renderSubpassIndex = subpassIndex; _renderSubpassIndex = subpassIndex;
@ -241,8 +241,7 @@ void MVKCommandEncoder::setSubpass(VkSubpassContents subpassContents, uint32_t s
beginMetalRenderPass(); beginMetalRenderPass();
} }
// Called after the _mtlRenderEncoder is established. // Creates _mtlRenderEncoder and marks cached render state as dirty so it will be set into the _mtlRenderEncoder.
// Marks cached render state as dirty so it will be set into the _mtlRenderEncoder.
void MVKCommandEncoder::beginMetalRenderPass() { void MVKCommandEncoder::beginMetalRenderPass() {
endCurrentMetalEncoding(); endCurrentMetalEncoding();

11
MoltenVK/scripts/create_dylib.sh
View File

@ -6,19 +6,24 @@ export MVK_DYLIB_NAME="lib${PRODUCT_NAME}.dylib"
export MVK_SYS_FWK_DIR="${SDK_DIR}/System/Library/Frameworks" export MVK_SYS_FWK_DIR="${SDK_DIR}/System/Library/Frameworks"
export MVK_USR_LIB_DIR="${SDK_DIR}/usr/lib" export MVK_USR_LIB_DIR="${SDK_DIR}/usr/lib"
if test x"${ENABLE_BITCODE}" = xYES; then
MVK_EMBED_BITCODE="-fembed-bitcode"
fi
if test x"${ENABLE_THREAD_SANITIZER}" = xYES; then if test x"${ENABLE_THREAD_SANITIZER}" = xYES; then
MVK_TSAN="-fsanitize=thread" MVK_TSAN="-fsanitize=thread"
fi fi
clang++ \ clang++ \
-stdlib=${CLANG_CXX_LIBRARY} \ -stdlib=${CLANG_CXX_LIBRARY} \
-dynamiclib ${MVK_TSAN} \ -dynamiclib \
$(printf "-arch %s " ${ARCHS}) \ $(printf -- "-arch %s " ${ARCHS}) \
-m${MVK_OS}-version-min=${MVK_MIN_OS_VERSION} \ -m${MVK_OS}-version-min=${MVK_MIN_OS_VERSION} \
-compatibility_version 1.0.0 -current_version 1.0.0 \ -compatibility_version 1.0.0 -current_version 1.0.0 \
-install_name "@rpath/${MVK_DYLIB_NAME}" \ -install_name "@rpath/${MVK_DYLIB_NAME}" \
-Wno-incompatible-sysroot \ -Wno-incompatible-sysroot \
-fembed-bitcode \ ${MVK_EMBED_BITCODE} \
${MVK_TSAN} \
-isysroot ${SDK_DIR} \ -isysroot ${SDK_DIR} \
-iframework ${MVK_SYS_FWK_DIR} \ -iframework ${MVK_SYS_FWK_DIR} \
-framework Metal ${MVK_IOSURFACE_FWK} -framework ${MVK_UX_FWK} -framework QuartzCore -framework IOKit -framework Foundation \ -framework Metal ${MVK_IOSURFACE_FWK} -framework ${MVK_UX_FWK} -framework QuartzCore -framework IOKit -framework Foundation \

2
MoltenVKPackaging.xcodeproj/project.pbxproj
View File

@ -287,7 +287,7 @@
A90B2B1D1A9B6170008EE819 /* Project object */ = { A90B2B1D1A9B6170008EE819 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 1000; LastUpgradeCheck = 1010;
TargetAttributes = { TargetAttributes = {
A9FEADBC1F3517480010240E = { A9FEADBC1F3517480010240E = {
DevelopmentTeam = VU3TCKU48B; DevelopmentTeam = VU3TCKU48B;

2
MoltenVKPackaging.xcodeproj/xcshareddata/xcschemes/MoltenVK Package (Debug).xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1000" LastUpgradeVersion = "1010"
version = "2.0"> version = "2.0">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
MoltenVKPackaging.xcodeproj/xcshareddata/xcschemes/MoltenVK Package (iOS only).xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1000" LastUpgradeVersion = "1010"
version = "2.0"> version = "2.0">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
MoltenVKPackaging.xcodeproj/xcshareddata/xcschemes/MoltenVK Package (macOS only).xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1000" LastUpgradeVersion = "1010"
version = "2.0"> version = "2.0">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
MoltenVKPackaging.xcodeproj/xcshareddata/xcschemes/MoltenVK Package.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1000" LastUpgradeVersion = "1010"
version = "2.0"> version = "2.0">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

1
MoltenVKShaderConverter/MoltenVKSPIRVToMSLConverter/SPIRVToMSLConverter.cpp
View File

@ -206,7 +206,6 @@ MVK_PUBLIC_SYMBOL bool SPIRVToMSLConverter::convert(SPIRVToMSLConverterContext&
mslOpts.aux_buffer_index = context.options.auxBufferIndex; mslOpts.aux_buffer_index = context.options.auxBufferIndex;
mslOpts.enable_point_size_builtin = context.options.isRenderingPoints; mslOpts.enable_point_size_builtin = context.options.isRenderingPoints;
mslOpts.disable_rasterization = context.options.isRasterizationDisabled; mslOpts.disable_rasterization = context.options.isRasterizationDisabled;
mslOpts.resolve_specialized_array_lengths = true;
mslOpts.swizzle_texture_samples = true; mslOpts.swizzle_texture_samples = true;
pMSLCompiler->set_msl_options(mslOpts); pMSLCompiler->set_msl_options(mslOpts);

26
MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj
View File

@ -199,6 +199,14 @@
A93E831F211F76F6001FEBD4 /* InitializeDll.h in Headers */ = {isa = PBXBuildFile; fileRef = A93E826C211F76F6001FEBD4 /* InitializeDll.h */; }; A93E831F211F76F6001FEBD4 /* InitializeDll.h in Headers */ = {isa = PBXBuildFile; fileRef = A93E826C211F76F6001FEBD4 /* InitializeDll.h */; };
A93E8320211F76F6001FEBD4 /* InitializeDll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A93E826D211F76F6001FEBD4 /* InitializeDll.cpp */; }; A93E8320211F76F6001FEBD4 /* InitializeDll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A93E826D211F76F6001FEBD4 /* InitializeDll.cpp */; };
A93E8321211F76F6001FEBD4 /* InitializeDll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A93E826D211F76F6001FEBD4 /* InitializeDll.cpp */; }; A93E8321211F76F6001FEBD4 /* InitializeDll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A93E826D211F76F6001FEBD4 /* InitializeDll.cpp */; };
A94E30CF219209C700394673 /* spirv_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A94E30CD219209C700394673 /* spirv_parser.cpp */; };
A94E30D0219209C700394673 /* spirv_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A94E30CD219209C700394673 /* spirv_parser.cpp */; };
A94E30D1219209C700394673 /* spirv_parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = A94E30CE219209C700394673 /* spirv_parser.hpp */; };
A94E30D2219209C700394673 /* spirv_parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = A94E30CE219209C700394673 /* spirv_parser.hpp */; };
A94E30D521920A8C00394673 /* spirv_cross_parsed_ir.hpp in Headers */ = {isa = PBXBuildFile; fileRef = A94E30D321920A8C00394673 /* spirv_cross_parsed_ir.hpp */; };
A94E30D621920A8C00394673 /* spirv_cross_parsed_ir.hpp in Headers */ = {isa = PBXBuildFile; fileRef = A94E30D321920A8C00394673 /* spirv_cross_parsed_ir.hpp */; };
A94E30D721920A8C00394673 /* spirv_cross_parsed_ir.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A94E30D421920A8C00394673 /* spirv_cross_parsed_ir.cpp */; };
A94E30D821920A8C00394673 /* spirv_cross_parsed_ir.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A94E30D421920A8C00394673 /* spirv_cross_parsed_ir.cpp */; };
A95096BB2003D00300F10950 /* FileSupport.mm in Sources */ = {isa = PBXBuildFile; fileRef = A925B70A1C7754B2006E7ECD /* FileSupport.mm */; }; A95096BB2003D00300F10950 /* FileSupport.mm in Sources */ = {isa = PBXBuildFile; fileRef = A925B70A1C7754B2006E7ECD /* FileSupport.mm */; };
A95096BC2003D00300F10950 /* FileSupport.mm in Sources */ = {isa = PBXBuildFile; fileRef = A925B70A1C7754B2006E7ECD /* FileSupport.mm */; }; A95096BC2003D00300F10950 /* FileSupport.mm in Sources */ = {isa = PBXBuildFile; fileRef = A925B70A1C7754B2006E7ECD /* FileSupport.mm */; };
A95096BF2003D32400F10950 /* DirectorySupport.mm in Sources */ = {isa = PBXBuildFile; fileRef = A95096BD2003D32400F10950 /* DirectorySupport.mm */; }; A95096BF2003D32400F10950 /* DirectorySupport.mm in Sources */ = {isa = PBXBuildFile; fileRef = A95096BD2003D32400F10950 /* DirectorySupport.mm */; };
@ -953,6 +961,10 @@
A93E826B211F76F6001FEBD4 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; }; A93E826B211F76F6001FEBD4 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
A93E826C211F76F6001FEBD4 /* InitializeDll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InitializeDll.h; sourceTree = "<group>"; }; A93E826C211F76F6001FEBD4 /* InitializeDll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InitializeDll.h; sourceTree = "<group>"; };
A93E826D211F76F6001FEBD4 /* InitializeDll.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InitializeDll.cpp; sourceTree = "<group>"; }; A93E826D211F76F6001FEBD4 /* InitializeDll.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InitializeDll.cpp; sourceTree = "<group>"; };
A94E30CD219209C700394673 /* spirv_parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = spirv_parser.cpp; sourceTree = "<group>"; };
A94E30CE219209C700394673 /* spirv_parser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = spirv_parser.hpp; sourceTree = "<group>"; };
A94E30D321920A8C00394673 /* spirv_cross_parsed_ir.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = spirv_cross_parsed_ir.hpp; sourceTree = "<group>"; };
A94E30D421920A8C00394673 /* spirv_cross_parsed_ir.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = spirv_cross_parsed_ir.cpp; sourceTree = "<group>"; };
A95096BD2003D32400F10950 /* DirectorySupport.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DirectorySupport.mm; sourceTree = "<group>"; }; A95096BD2003D32400F10950 /* DirectorySupport.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DirectorySupport.mm; sourceTree = "<group>"; };
A95096BE2003D32400F10950 /* DirectorySupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectorySupport.h; sourceTree = "<group>"; }; A95096BE2003D32400F10950 /* DirectorySupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectorySupport.h; sourceTree = "<group>"; };
A95C5F3D1DEA9070000D17B6 /* spirv_cfg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = spirv_cfg.cpp; sourceTree = "<group>"; }; A95C5F3D1DEA9070000D17B6 /* spirv_cfg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = spirv_cfg.cpp; sourceTree = "<group>"; };
@ -1328,12 +1340,16 @@
A95C5F3D1DEA9070000D17B6 /* spirv_cfg.cpp */, A95C5F3D1DEA9070000D17B6 /* spirv_cfg.cpp */,
A95C5F3E1DEA9070000D17B6 /* spirv_cfg.hpp */, A95C5F3E1DEA9070000D17B6 /* spirv_cfg.hpp */,
A9AB19901CB5B5A80001E7F9 /* spirv_common.hpp */, A9AB19901CB5B5A80001E7F9 /* spirv_common.hpp */,
A94E30D421920A8C00394673 /* spirv_cross_parsed_ir.cpp */,
A94E30D321920A8C00394673 /* spirv_cross_parsed_ir.hpp */,
A9AB19911CB5B5A80001E7F9 /* spirv_cross.cpp */, A9AB19911CB5B5A80001E7F9 /* spirv_cross.cpp */,
A9AB19921CB5B5A80001E7F9 /* spirv_cross.hpp */, A9AB19921CB5B5A80001E7F9 /* spirv_cross.hpp */,
A9AB19931CB5B5A80001E7F9 /* spirv_glsl.cpp */, A9AB19931CB5B5A80001E7F9 /* spirv_glsl.cpp */,
A9AB19941CB5B5A80001E7F9 /* spirv_glsl.hpp */, A9AB19941CB5B5A80001E7F9 /* spirv_glsl.hpp */,
A9AB19951CB5B5A80001E7F9 /* spirv_msl.cpp */, A9AB19951CB5B5A80001E7F9 /* spirv_msl.cpp */,
A9AB19961CB5B5A80001E7F9 /* spirv_msl.hpp */, A9AB19961CB5B5A80001E7F9 /* spirv_msl.hpp */,
A94E30CD219209C700394673 /* spirv_parser.cpp */,
A94E30CE219209C700394673 /* spirv_parser.hpp */,
); );
name = "SPIRV-Cross"; name = "SPIRV-Cross";
path = "../SPIRV-Cross"; path = "../SPIRV-Cross";
@ -2058,6 +2074,7 @@
A96FE8BE215473A00060D1A3 /* spirv_optimizer_options.h in Headers */, A96FE8BE215473A00060D1A3 /* spirv_optimizer_options.h in Headers */,
A96FE76E215473A00060D1A3 /* compact_ids_pass.h in Headers */, A96FE76E215473A00060D1A3 /* compact_ids_pass.h in Headers */,
A96FE712215473A00060D1A3 /* spirv_definition.h in Headers */, A96FE712215473A00060D1A3 /* spirv_definition.h in Headers */,
A94E30D1219209C700394673 /* spirv_parser.hpp in Headers */,
A96FE8A8215473A00060D1A3 /* dominator_tree.h in Headers */, A96FE8A8215473A00060D1A3 /* dominator_tree.h in Headers */,
A96FE7E0215473A00060D1A3 /* struct_cfg_analysis.h in Headers */, A96FE7E0215473A00060D1A3 /* struct_cfg_analysis.h in Headers */,
A96FE766215473A00060D1A3 /* loop_fusion.h in Headers */, A96FE766215473A00060D1A3 /* loop_fusion.h in Headers */,
@ -2134,6 +2151,7 @@
A96FE8DC215473A00060D1A3 /* basic_block.h in Headers */, A96FE8DC215473A00060D1A3 /* basic_block.h in Headers */,
A96FE834215473A00060D1A3 /* dead_variable_elimination.h in Headers */, A96FE834215473A00060D1A3 /* dead_variable_elimination.h in Headers */,
A96FE740215473A00060D1A3 /* text_handler.h in Headers */, A96FE740215473A00060D1A3 /* text_handler.h in Headers */,
A94E30D521920A8C00394673 /* spirv_cross_parsed_ir.hpp in Headers */,
A9AB199B1CB5B5A80001E7F9 /* spirv_cross.hpp in Headers */, A9AB199B1CB5B5A80001E7F9 /* spirv_cross.hpp in Headers */,
A96FE7F8215473A00060D1A3 /* dead_insert_elim_pass.h in Headers */, A96FE7F8215473A00060D1A3 /* dead_insert_elim_pass.h in Headers */,
A96FE872215473A00060D1A3 /* local_ssa_elim_pass.h in Headers */, A96FE872215473A00060D1A3 /* local_ssa_elim_pass.h in Headers */,
@ -2219,6 +2237,7 @@
A96FE8BF215473A00060D1A3 /* spirv_optimizer_options.h in Headers */, A96FE8BF215473A00060D1A3 /* spirv_optimizer_options.h in Headers */,
A96FE76F215473A00060D1A3 /* compact_ids_pass.h in Headers */, A96FE76F215473A00060D1A3 /* compact_ids_pass.h in Headers */,
A96FE713215473A00060D1A3 /* spirv_definition.h in Headers */, A96FE713215473A00060D1A3 /* spirv_definition.h in Headers */,
A94E30D2219209C700394673 /* spirv_parser.hpp in Headers */,
A96FE8A9215473A00060D1A3 /* dominator_tree.h in Headers */, A96FE8A9215473A00060D1A3 /* dominator_tree.h in Headers */,
A96FE7E1215473A00060D1A3 /* struct_cfg_analysis.h in Headers */, A96FE7E1215473A00060D1A3 /* struct_cfg_analysis.h in Headers */,
A96FE767215473A00060D1A3 /* loop_fusion.h in Headers */, A96FE767215473A00060D1A3 /* loop_fusion.h in Headers */,
@ -2295,6 +2314,7 @@
A96FE8DD215473A00060D1A3 /* basic_block.h in Headers */, A96FE8DD215473A00060D1A3 /* basic_block.h in Headers */,
A96FE835215473A00060D1A3 /* dead_variable_elimination.h in Headers */, A96FE835215473A00060D1A3 /* dead_variable_elimination.h in Headers */,
A96FE741215473A00060D1A3 /* text_handler.h in Headers */, A96FE741215473A00060D1A3 /* text_handler.h in Headers */,
A94E30D621920A8C00394673 /* spirv_cross_parsed_ir.hpp in Headers */,
A9AB199C1CB5B5A80001E7F9 /* spirv_cross.hpp in Headers */, A9AB199C1CB5B5A80001E7F9 /* spirv_cross.hpp in Headers */,
A96FE7F9215473A00060D1A3 /* dead_insert_elim_pass.h in Headers */, A96FE7F9215473A00060D1A3 /* dead_insert_elim_pass.h in Headers */,
A96FE873215473A00060D1A3 /* local_ssa_elim_pass.h in Headers */, A96FE873215473A00060D1A3 /* local_ssa_elim_pass.h in Headers */,
@ -2464,7 +2484,7 @@
A9F55D25198BE6A7004EC31B /* Project object */ = { A9F55D25198BE6A7004EC31B /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 1000; LastUpgradeCheck = 1010;
ORGANIZATIONNAME = "The Brenwill Workshop Ltd."; ORGANIZATIONNAME = "The Brenwill Workshop Ltd.";
TargetAttributes = { TargetAttributes = {
A9092A8C1A81717B00051823 = { A9092A8C1A81717B00051823 = {
@ -2678,6 +2698,7 @@
A96FE73C215473A00060D1A3 /* markv_encoder.cpp in Sources */, A96FE73C215473A00060D1A3 /* markv_encoder.cpp in Sources */,
A96FE90C215473A00060D1A3 /* instruction.cpp in Sources */, A96FE90C215473A00060D1A3 /* instruction.cpp in Sources */,
A96FE81A215473A00060D1A3 /* strength_reduction_pass.cpp in Sources */, A96FE81A215473A00060D1A3 /* strength_reduction_pass.cpp in Sources */,
A94E30D721920A8C00394673 /* spirv_cross_parsed_ir.cpp in Sources */,
A96FE78A215473A00060D1A3 /* local_redundancy_elimination.cpp in Sources */, A96FE78A215473A00060D1A3 /* local_redundancy_elimination.cpp in Sources */,
A96FE826215473A00060D1A3 /* loop_fusion_pass.cpp in Sources */, A96FE826215473A00060D1A3 /* loop_fusion_pass.cpp in Sources */,
A96FE782215473A00060D1A3 /* local_single_block_elim_pass.cpp in Sources */, A96FE782215473A00060D1A3 /* local_single_block_elim_pass.cpp in Sources */,
@ -2717,6 +2738,7 @@
A96FE7F2215473A00060D1A3 /* simplification_pass.cpp in Sources */, A96FE7F2215473A00060D1A3 /* simplification_pass.cpp in Sources */,
A95096BB2003D00300F10950 /* FileSupport.mm in Sources */, A95096BB2003D00300F10950 /* FileSupport.mm in Sources */,
A96FE6F2215473A00060D1A3 /* string_utils.cpp in Sources */, A96FE6F2215473A00060D1A3 /* string_utils.cpp in Sources */,
A94E30CF219209C700394673 /* spirv_parser.cpp in Sources */,
A909408A1C58013E0094110D /* SPIRVToMSLConverter.cpp in Sources */, A909408A1C58013E0094110D /* SPIRVToMSLConverter.cpp in Sources */,
A96FE7C0215473A00060D1A3 /* loop_unswitch_pass.cpp in Sources */, A96FE7C0215473A00060D1A3 /* loop_unswitch_pass.cpp in Sources */,
A96FE82E215473A00060D1A3 /* dead_insert_elim_pass.cpp in Sources */, A96FE82E215473A00060D1A3 /* dead_insert_elim_pass.cpp in Sources */,
@ -2845,6 +2867,7 @@
A96FE73D215473A00060D1A3 /* markv_encoder.cpp in Sources */, A96FE73D215473A00060D1A3 /* markv_encoder.cpp in Sources */,
A96FE90D215473A00060D1A3 /* instruction.cpp in Sources */, A96FE90D215473A00060D1A3 /* instruction.cpp in Sources */,
A96FE81B215473A00060D1A3 /* strength_reduction_pass.cpp in Sources */, A96FE81B215473A00060D1A3 /* strength_reduction_pass.cpp in Sources */,
A94E30D821920A8C00394673 /* spirv_cross_parsed_ir.cpp in Sources */,
A96FE78B215473A00060D1A3 /* local_redundancy_elimination.cpp in Sources */, A96FE78B215473A00060D1A3 /* local_redundancy_elimination.cpp in Sources */,
A96FE827215473A00060D1A3 /* loop_fusion_pass.cpp in Sources */, A96FE827215473A00060D1A3 /* loop_fusion_pass.cpp in Sources */,
A96FE783215473A00060D1A3 /* local_single_block_elim_pass.cpp in Sources */, A96FE783215473A00060D1A3 /* local_single_block_elim_pass.cpp in Sources */,
@ -2884,6 +2907,7 @@
A96FE7F3215473A00060D1A3 /* simplification_pass.cpp in Sources */, A96FE7F3215473A00060D1A3 /* simplification_pass.cpp in Sources */,
A95096BC2003D00300F10950 /* FileSupport.mm in Sources */, A95096BC2003D00300F10950 /* FileSupport.mm in Sources */,
A96FE6F3215473A00060D1A3 /* string_utils.cpp in Sources */, A96FE6F3215473A00060D1A3 /* string_utils.cpp in Sources */,
A94E30D0219209C700394673 /* spirv_parser.cpp in Sources */,
A909408B1C58013E0094110D /* SPIRVToMSLConverter.cpp in Sources */, A909408B1C58013E0094110D /* SPIRVToMSLConverter.cpp in Sources */,
A96FE7C1215473A00060D1A3 /* loop_unswitch_pass.cpp in Sources */, A96FE7C1215473A00060D1A3 /* loop_unswitch_pass.cpp in Sources */,
A96FE82F215473A00060D1A3 /* dead_insert_elim_pass.cpp in Sources */, A96FE82F215473A00060D1A3 /* dead_insert_elim_pass.cpp in Sources */,

2
MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKGLSLToSPIRVConverter-iOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1000" LastUpgradeVersion = "1010"
version = "2.0"> version = "2.0">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKGLSLToSPIRVConverter-macOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1000" LastUpgradeVersion = "1010"
version = "2.0"> version = "2.0">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKSPIRVToMSLConverter-iOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1000" LastUpgradeVersion = "1010"
version = "2.0"> version = "2.0">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKSPIRVToMSLConverter-macOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1000" LastUpgradeVersion = "1010"
version = "2.0"> version = "2.0">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKShaderConverter.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1000" LastUpgradeVersion = "1010"
version = "2.0"> version = "2.0">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

27
fetchDependencies
View File

@ -101,8 +101,7 @@ EXT_DIR=External
EXT_REV_DIR=ExternalRevisions EXT_REV_DIR=ExternalRevisions
echo echo
echo Retrieving MoltenVK dependencies into ${EXT_DIR}. echo ========== Retrieving MoltenVK dependencies into ${EXT_DIR} ==========
echo
mkdir -p ${EXT_DIR} mkdir -p ${EXT_DIR}
cd ${EXT_DIR} cd ${EXT_DIR}
@ -110,6 +109,10 @@ cd ${EXT_DIR}
# ----------------- Cereal ------------------- # ----------------- Cereal -------------------
echo
echo ========== Cereal ==========
echo
REPO_NAME=cereal REPO_NAME=cereal
REPO_URL="https://github.com/USCiLab/${REPO_NAME}.git" REPO_URL="https://github.com/USCiLab/${REPO_NAME}.git"
REPO_REV=$(cat "../${EXT_REV_DIR}/${REPO_NAME}_repo_revision") REPO_REV=$(cat "../${EXT_REV_DIR}/${REPO_NAME}_repo_revision")
@ -119,6 +122,10 @@ update_repo ${REPO_NAME} ${REPO_URL} ${REPO_REV}
# ----------------- Vulkan-Headers ------------------- # ----------------- Vulkan-Headers -------------------
echo
echo ========== Vulkan-Headers ==========
echo
# When MoltenVK is built by something that already has # When MoltenVK is built by something that already has
# a copy of this repo, use it by creating a symlink. # a copy of this repo, use it by creating a symlink.
if [ ! "$V_HEADERS_ROOT" = "" ]; then if [ ! "$V_HEADERS_ROOT" = "" ]; then
@ -136,6 +143,10 @@ fi
# ----------------- SPIRV-Cross ------------------- # ----------------- SPIRV-Cross -------------------
echo
echo ========== SPIRV-Cross ==========
echo
# When MoltenVK is built by something that already has # When MoltenVK is built by something that already has
# a copy of this repo, use it by creating a symlink. # a copy of this repo, use it by creating a symlink.
if [ ! "$SPIRV_CROSS_ROOT" = "" ]; then if [ ! "$SPIRV_CROSS_ROOT" = "" ]; then
@ -153,6 +164,10 @@ fi
# ----------------- glslang ------------------- # ----------------- glslang -------------------
echo
echo ========== glslang and SPIRV-Tools ==========
echo
# When MoltenVK is built by something that already has # When MoltenVK is built by something that already has
# a copy of this repo, use it by creating a symlink. # a copy of this repo, use it by creating a symlink.
if [ ! "$GLSLANG_ROOT" = "" ]; then if [ ! "$GLSLANG_ROOT" = "" ]; then
@ -176,6 +191,10 @@ fi
# ----------------- Vulkan-Tools ------------------- # ----------------- Vulkan-Tools -------------------
echo
echo ========== Vulkan-Tools ==========
echo
REPO_NAME=Vulkan-Tools REPO_NAME=Vulkan-Tools
REPO_URL="https://github.com/KhronosGroup/${REPO_NAME}.git" REPO_URL="https://github.com/KhronosGroup/${REPO_NAME}.git"
REPO_REV=$(cat "../${EXT_REV_DIR}/${REPO_NAME}_repo_revision") REPO_REV=$(cat "../${EXT_REV_DIR}/${REPO_NAME}_repo_revision")
@ -185,6 +204,10 @@ update_repo ${REPO_NAME} ${REPO_URL} ${REPO_REV}
# ----------------- VulkanSamples ------------------- # ----------------- VulkanSamples -------------------
echo
echo ========== VulkanSamples ==========
echo
REPO_NAME=VulkanSamples REPO_NAME=VulkanSamples
REPO_URL="https://github.com/LunarG/${REPO_NAME}.git" REPO_URL="https://github.com/LunarG/${REPO_NAME}.git"
REPO_REV=$(cat "../${EXT_REV_DIR}/${REPO_NAME}_repo_revision") REPO_REV=$(cat "../${EXT_REV_DIR}/${REPO_NAME}_repo_revision")