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

Update Demos to use latest LunarG VulkanSamples and Vulkan-LoaderAndValidationLayers code.

Browse Source 
Update to latest Vulkan-LoaderAndValidationLayers version.
Update to latest VulkanSamples version.
Update to latest SPIRV-Cross version.
This commit is contained in:
Bill Hollings 2018-04-16 16:26:34 -04:00
parent 206461371f
commit 3a2657b2bb
17 changed files with 3883 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Demos/LunarG-VulkanSamples/API-Samples/Samples.h
View File

@ -74,7 +74,7 @@
# include "../VulkanSamples/API-Samples/multithreaded_command_buffers/multithreaded_command_buffers.cpp" # include "../VulkanSamples/API-Samples/multithreaded_command_buffers/multithreaded_command_buffers.cpp"
#endif #endif
#ifdef MVK_SAMP_occlusion_query // iOS: Occlusion boolean supported, but not occlusion counting. #ifdef MVK_SAMP_occlusion_query
# include "../VulkanSamples/API-Samples/occlusion_query/occlusion_query.cpp" # include "../VulkanSamples/API-Samples/occlusion_query/occlusion_query.cpp"
#endif #endif
@ -98,7 +98,7 @@
# include "../VulkanSamples/API-Samples/template/template.cpp" # include "../VulkanSamples/API-Samples/template/template.cpp"
#endif #endif
#ifdef MVK_SAMP_texel_buffer // iOS only. Texel buffers are not supported on macOS #ifdef MVK_SAMP_texel_buffer
# include "../VulkanSamples/API-Samples/texel_buffer/texel_buffer.cpp" # include "../VulkanSamples/API-Samples/texel_buffer/texel_buffer.cpp"
#endif #endif

2
Demos/LunarG-VulkanSamples/Demos/Demos.h
View File

@ -23,7 +23,7 @@
#include <MoltenVK/mvk_vulkan.h> #include <MoltenVK/mvk_vulkan.h>
#ifdef MVK_SAMP_CUBE #ifdef MVK_SAMP_CUBE
# include "../VulkanSamples/demos/cube.c" # include "../Vulkan-LoaderAndValidationLayers/demos/cube.c"
#endif #endif

12
Demos/LunarG-VulkanSamples/Demos/Demos.xcodeproj/project.pbxproj
View File

@ -152,7 +152,7 @@
A904B5351C9A08C90008C013 /* lunarg.ppm */, A904B5351C9A08C90008C013 /* lunarg.ppm */,
); );
name = demos; name = demos;
path = ../VulkanSamples/demos; path = "../Vulkan-LoaderAndValidationLayers/demos";
sourceTree = "<group>"; sourceTree = "<group>";
}; };
A9295EAA1CECEF0900EFC483 /* Frameworks */ = { A9295EAA1CECEF0900EFC483 /* Frameworks */ = {
@ -335,7 +335,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "set -e\n\n\"${PROJECT_DIR}/../../../MoltenVKShaderConverter/Tools/MoltenVKShaderConverter\" -gi -so -xs \"-\" -d \"${PROJECT_DIR}/../VulkanSamples/demos\"\n"; shellScript = "set -e\n\n\"${PROJECT_DIR}/../../../MoltenVKShaderConverter/Tools/MoltenVKShaderConverter\" -gi -so -xs \"-\" -d \"${PROJECT_DIR}/../Vulkan-LoaderAndValidationLayers/demos\"\n";
}; };
A9BA29C6204F298800EA6575 /* Generate SPIR-V shaders */ = { A9BA29C6204F298800EA6575 /* Generate SPIR-V shaders */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
@ -349,7 +349,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "set -e\n\n\"${PROJECT_DIR}/../../../MoltenVKShaderConverter/Tools/MoltenVKShaderConverter\" -gi -so -xs \"-\" -d \"${PROJECT_DIR}/../VulkanSamples/demos\"\n"; shellScript = "set -e\n\n\"${PROJECT_DIR}/../../../MoltenVKShaderConverter/Tools/MoltenVKShaderConverter\" -gi -so -xs \"-\" -d \"${PROJECT_DIR}/../Vulkan-LoaderAndValidationLayers/demos\"\n";
}; };
/* End PBXShellScriptBuildPhase section */ /* End PBXShellScriptBuildPhase section */
@ -478,8 +478,9 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"\"$(SRCROOT)/include\"",
"\"$(SRCROOT)/../../../MoltenVK/include\"", "\"$(SRCROOT)/../../../MoltenVK/include\"",
"\"$(SRCROOT)/../VulkanSamples/include\"", "\"$(SRCROOT)/../Vulkan-LoaderAndValidationLayers/include\"",
); );
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
@ -502,8 +503,9 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"\"$(SRCROOT)/include\"",
"\"$(SRCROOT)/../../../MoltenVK/include\"", "\"$(SRCROOT)/../../../MoltenVK/include\"",
"\"$(SRCROOT)/../VulkanSamples/include\"", "\"$(SRCROOT)/../Vulkan-LoaderAndValidationLayers/include\"",
); );
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = "com.moltenvk.${PRODUCT_NAME:identifier}"; PRODUCT_BUNDLE_IDENTIFIER = "com.moltenvk.${PRODUCT_NAME:identifier}";

41
Demos/LunarG-VulkanSamples/Demos/include/cube.frag.inc Normal file
View File

@ -0,0 +1,41 @@
// 5.2.2593
0x07230203,0x00010000,0x00080005,0x00000030,0x00000000,0x00020011,0x00000001,0x0006000b,
0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
0x0008000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x0000000b,0x00000022,0x0000002a,
0x00030010,0x00000004,0x00000007,0x00030003,0x00000002,0x00000190,0x00090004,0x415f4c47,
0x735f4252,0x72617065,0x5f657461,0x64616873,0x6f5f7265,0x63656a62,0x00007374,0x00090004,
0x415f4c47,0x735f4252,0x69646168,0x6c5f676e,0x75676e61,0x5f656761,0x70303234,0x006b6361,
0x00040005,0x00000004,0x6e69616d,0x00000000,0x00030005,0x00000009,0x00005864,0x00050005,
0x0000000b,0x67617266,0x736f705f,0x00000000,0x00030005,0x0000000e,0x00005964,0x00040005,
0x00000011,0x6d726f6e,0x00006c61,0x00040005,0x00000017,0x6867696c,0x00000074,0x00050005,
0x00000022,0x61724675,0x6c6f4367,0x0000726f,0x00030005,0x00000027,0x00786574,0x00050005,
0x0000002a,0x63786574,0x64726f6f,0x00000000,0x00040047,0x0000000b,0x0000001e,0x00000001,
0x00040047,0x00000022,0x0000001e,0x00000000,0x00040047,0x00000027,0x00000022,0x00000000,
0x00040047,0x00000027,0x00000021,0x00000001,0x00040047,0x0000002a,0x0000001e,0x00000000,
0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,0x00000020,
0x00040017,0x00000007,0x00000006,0x00000003,0x00040020,0x00000008,0x00000007,0x00000007,
0x00040020,0x0000000a,0x00000001,0x00000007,0x0004003b,0x0000000a,0x0000000b,0x00000001,
0x00040020,0x00000016,0x00000007,0x00000006,0x0004002b,0x00000006,0x00000018,0x00000000,
0x0004002b,0x00000006,0x00000019,0x3ed91687,0x0004002b,0x00000006,0x0000001a,0x3f10e560,
0x0004002b,0x00000006,0x0000001b,0x3f34fdf4,0x0006002c,0x00000007,0x0000001c,0x00000019,
0x0000001a,0x0000001b,0x00040017,0x00000020,0x00000006,0x00000004,0x00040020,0x00000021,
0x00000003,0x00000020,0x0004003b,0x00000021,0x00000022,0x00000003,0x00090019,0x00000024,
0x00000006,0x00000001,0x00000000,0x00000000,0x00000000,0x00000001,0x00000000,0x0003001b,
0x00000025,0x00000024,0x00040020,0x00000026,0x00000000,0x00000025,0x0004003b,0x00000026,
0x00000027,0x00000000,0x00040020,0x00000029,0x00000001,0x00000020,0x0004003b,0x00000029,
0x0000002a,0x00000001,0x00040017,0x0000002b,0x00000006,0x00000002,0x00050036,0x00000002,
0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000009,
0x00000007,0x0004003b,0x00000008,0x0000000e,0x00000007,0x0004003b,0x00000008,0x00000011,
0x00000007,0x0004003b,0x00000016,0x00000017,0x00000007,0x0004003d,0x00000007,0x0000000c,
0x0000000b,0x000400cf,0x00000007,0x0000000d,0x0000000c,0x0003003e,0x00000009,0x0000000d,
0x0004003d,0x00000007,0x0000000f,0x0000000b,0x000400d0,0x00000007,0x00000010,0x0000000f,
0x0003003e,0x0000000e,0x00000010,0x0004003d,0x00000007,0x00000012,0x00000009,0x0004003d,
0x00000007,0x00000013,0x0000000e,0x0007000c,0x00000007,0x00000014,0x00000001,0x00000044,
0x00000012,0x00000013,0x0006000c,0x00000007,0x00000015,0x00000001,0x00000045,0x00000014,
0x0003003e,0x00000011,0x00000015,0x0004003d,0x00000007,0x0000001d,0x00000011,0x00050094,
0x00000006,0x0000001e,0x0000001c,0x0000001d,0x0007000c,0x00000006,0x0000001f,0x00000001,
0x00000028,0x00000018,0x0000001e,0x0003003e,0x00000017,0x0000001f,0x0004003d,0x00000006,
0x00000023,0x00000017,0x0004003d,0x00000025,0x00000028,0x00000027,0x0004003d,0x00000020,
0x0000002c,0x0000002a,0x0007004f,0x0000002b,0x0000002d,0x0000002c,0x0000002c,0x00000000,
0x00000001,0x00050057,0x00000020,0x0000002e,0x00000028,0x0000002d,0x0005008e,0x00000020,
0x0000002f,0x0000002e,0x00000023,0x0003003e,0x00000022,0x0000002f,0x000100fd,0x00010038

50
Demos/LunarG-VulkanSamples/Demos/include/cube.vert.inc Normal file
View File

@ -0,0 +1,50 @@
// 5.2.2593
0x07230203,0x00010000,0x00080005,0x0000002f,0x00000000,0x00020011,0x00000001,0x0006000b,
0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
0x0009000f,0x00000000,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00000015,0x0000001e,
0x0000002b,0x00030003,0x00000002,0x00000190,0x00090004,0x415f4c47,0x735f4252,0x72617065,
0x5f657461,0x64616873,0x6f5f7265,0x63656a62,0x00007374,0x00090004,0x415f4c47,0x735f4252,
0x69646168,0x6c5f676e,0x75676e61,0x5f656761,0x70303234,0x006b6361,0x00040005,0x00000004,
0x6e69616d,0x00000000,0x00050005,0x00000009,0x63786574,0x64726f6f,0x00000000,0x00030005,
0x0000000f,0x00667562,0x00040006,0x0000000f,0x00000000,0x0050564d,0x00060006,0x0000000f,
0x00000001,0x69736f70,0x6e6f6974,0x00000000,0x00050006,0x0000000f,0x00000002,0x72747461,
0x00000000,0x00040005,0x00000011,0x66756275,0x00000000,0x00060005,0x00000015,0x565f6c67,
0x65747265,0x646e4978,0x00007865,0x00060005,0x0000001c,0x505f6c67,0x65567265,0x78657472,
0x00000000,0x00060006,0x0000001c,0x00000000,0x505f6c67,0x7469736f,0x006e6f69,0x00070006,
0x0000001c,0x00000001,0x505f6c67,0x746e696f,0x657a6953,0x00000000,0x00070006,0x0000001c,
0x00000002,0x435f6c67,0x4470696c,0x61747369,0x0065636e,0x00030005,0x0000001e,0x00000000,
0x00050005,0x0000002b,0x67617266,0x736f705f,0x00000000,0x00040047,0x00000009,0x0000001e,
0x00000000,0x00040047,0x0000000d,0x00000006,0x00000010,0x00040047,0x0000000e,0x00000006,
0x00000010,0x00040048,0x0000000f,0x00000000,0x00000005,0x00050048,0x0000000f,0x00000000,
0x00000023,0x00000000,0x00050048,0x0000000f,0x00000000,0x00000007,0x00000010,0x00050048,
0x0000000f,0x00000001,0x00000023,0x00000040,0x00050048,0x0000000f,0x00000002,0x00000023,
0x00000280,0x00030047,0x0000000f,0x00000002,0x00040047,0x00000011,0x00000022,0x00000000,
0x00040047,0x00000011,0x00000021,0x00000000,0x00040047,0x00000015,0x0000000b,0x0000002a,
0x00050048,0x0000001c,0x00000000,0x0000000b,0x00000000,0x00050048,0x0000001c,0x00000001,
0x0000000b,0x00000001,0x00050048,0x0000001c,0x00000002,0x0000000b,0x00000003,0x00030047,
0x0000001c,0x00000002,0x00040047,0x0000002b,0x0000001e,0x00000001,0x00020013,0x00000002,
0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,0x00000020,0x00040017,0x00000007,
0x00000006,0x00000004,0x00040020,0x00000008,0x00000003,0x00000007,0x0004003b,0x00000008,
0x00000009,0x00000003,0x00040018,0x0000000a,0x00000007,0x00000004,0x00040015,0x0000000b,
0x00000020,0x00000000,0x0004002b,0x0000000b,0x0000000c,0x00000024,0x0004001c,0x0000000d,
0x00000007,0x0000000c,0x0004001c,0x0000000e,0x00000007,0x0000000c,0x0005001e,0x0000000f,
0x0000000a,0x0000000d,0x0000000e,0x00040020,0x00000010,0x00000002,0x0000000f,0x0004003b,
0x00000010,0x00000011,0x00000002,0x00040015,0x00000012,0x00000020,0x00000001,0x0004002b,
0x00000012,0x00000013,0x00000002,0x00040020,0x00000014,0x00000001,0x00000012,0x0004003b,
0x00000014,0x00000015,0x00000001,0x00040020,0x00000017,0x00000002,0x00000007,0x0004002b,
0x0000000b,0x0000001a,0x00000001,0x0004001c,0x0000001b,0x00000006,0x0000001a,0x0005001e,
0x0000001c,0x00000007,0x00000006,0x0000001b,0x00040020,0x0000001d,0x00000003,0x0000001c,
0x0004003b,0x0000001d,0x0000001e,0x00000003,0x0004002b,0x00000012,0x0000001f,0x00000000,
0x00040020,0x00000020,0x00000002,0x0000000a,0x0004002b,0x00000012,0x00000023,0x00000001,
0x00040017,0x00000029,0x00000006,0x00000003,0x00040020,0x0000002a,0x00000003,0x00000029,
0x0004003b,0x0000002a,0x0000002b,0x00000003,0x00050036,0x00000002,0x00000004,0x00000000,
0x00000003,0x000200f8,0x00000005,0x0004003d,0x00000012,0x00000016,0x00000015,0x00060041,
0x00000017,0x00000018,0x00000011,0x00000013,0x00000016,0x0004003d,0x00000007,0x00000019,
0x00000018,0x0003003e,0x00000009,0x00000019,0x00050041,0x00000020,0x00000021,0x00000011,
0x0000001f,0x0004003d,0x0000000a,0x00000022,0x00000021,0x0004003d,0x00000012,0x00000024,
0x00000015,0x00060041,0x00000017,0x00000025,0x00000011,0x00000023,0x00000024,0x0004003d,
0x00000007,0x00000026,0x00000025,0x00050091,0x00000007,0x00000027,0x00000022,0x00000026,
0x00050041,0x00000008,0x00000028,0x0000001e,0x0000001f,0x0003003e,0x00000028,0x00000027,
0x00050041,0x00000008,0x0000002c,0x0000001e,0x0000001f,0x0004003d,0x00000007,0x0000002d,
0x0000002c,0x0008004f,0x00000029,0x0000002e,0x0000002d,0x0000002d,0x00000000,0x00000001,
0x00000002,0x0003003e,0x0000002b,0x0000002e,0x000100fd,0x00010038

3724
Demos/LunarG-VulkanSamples/Demos/include/vk_enum_string_helper.h Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -602,7 +602,8 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"\"$(SRCROOT)/../../../MoltenVK/include\"", "\"$(SRCROOT)/../../../MoltenVK/include\"",
"\"$(SRCROOT)/../VulkanSamples/libs\"", "\"$(SRCROOT)/../VulkanSamples/API-Samples/utils\"",
"\"$(SRCROOT)/../../../MoltenVKShaderConverter\"",
); );
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
@ -630,7 +631,8 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"\"$(SRCROOT)/../../../MoltenVK/include\"", "\"$(SRCROOT)/../../../MoltenVK/include\"",
"\"$(SRCROOT)/../VulkanSamples/libs\"", "\"$(SRCROOT)/../VulkanSamples/API-Samples/utils\"",
"\"$(SRCROOT)/../../../MoltenVKShaderConverter\"",
); );
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = "com.moltenvk.${PRODUCT_NAME:identifier}"; PRODUCT_BUNDLE_IDENTIFIER = "com.moltenvk.${PRODUCT_NAME:identifier}";

1
Demos/LunarG-VulkanSamples/Vulkan-LoaderAndValidationLayers Symbolic link
View File

@ -0,0 +1 @@
../../External/Vulkan-LoaderAndValidationLayers

61
ExternalRevisions/README.md
View File

@ -30,25 +30,19 @@ Fetching External Libraries
**MoltenVK** uses technology from the following external open-source libraries: **MoltenVK** uses technology from the following external open-source libraries:
- [*cereal*](https://github.com/USCiLab/cereal)
- [*SPIRV-Cross*](https://github.com/KhronosGroup/SPIRV-Cross) - [*SPIRV-Cross*](https://github.com/KhronosGroup/SPIRV-Cross)
- [*Vulkan-LoaderAndValidationLayers*](https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers) - [*Vulkan-LoaderAndValidationLayers*](https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers)
- [*glslang*](https://github.com/KhronosGroup/glslang) - [*glslang*](https://github.com/KhronosGroup/glslang)
- [*SPIRV-Tools*](https://github.com/KhronosGroup/SPIRV-Tools) - [*SPIRV-Tools*](https://github.com/KhronosGroup/SPIRV-Tools)
- [*SPIRV-Headers*](https://github.com/KhronosGroup/SPIRV-Headers) - [*SPIRV-Headers*](https://github.com/KhronosGroup/SPIRV-Headers)
- [*VulkanSamples*](https://github.com/brenwill/VulkanSamples) - [*VulkanSamples*](https://github.com/LunarG/VulkanSamples)
- [*cereal*](https://github.com/USCiLab/cereal)
These external open-source libraries are maintained in the `External` directory. These external open-source libraries are maintained in the `External` directory.
To retrieve these libraries from their sources, run the `fetchDependencies` script To retrieve these libraries from their sources, run the `fetchDependencies` script
in the main repository directory: in the main repository directory:
./fetchDependencies [-sdk] ./fetchDependencies
The `-sdk` option tells the script that **MoltenVK** is being installed as part of
the *LunarG Vulkan SDK*, and that **MoltenVK** can find some of the required libraries
already loaded in the SDK, instead of retrieving them from their repositories again.
If you are using **MoltenVK** outside of the *LunarG Vulkan SDK*, do not use the `-sdk`
option, so that all of the required external libraries will be retrieved.
@ -60,6 +54,9 @@ To maintain consistency between the libraries, **MoltenVK** retrieves specific
versions of each external library. The version of each external library is versions of each external library. The version of each external library is
determined as follows: determined as follows:
- **_cereal_**: a GitHub repository commit identifier found in the
`ExternalRevisions/cereal_repo_revision` file.
- **_SPIRV-Cross_**: a GitHub repository commit identifier found in the - **_SPIRV-Cross_**: a GitHub repository commit identifier found in the
`ExternalRevisions/SPIRV-Cross_repo_revision` file. `ExternalRevisions/SPIRV-Cross_repo_revision` file.
@ -69,15 +66,11 @@ determined as follows:
- **_Vulkan-LoaderAndValidationLayers_**: a GitHub repository commit identifier found - **_Vulkan-LoaderAndValidationLayers_**: a GitHub repository commit identifier found
in the `ExternalRevisions/Vulkan-LoaderAndValidationLayers_repo_revision` file. in the `ExternalRevisions/Vulkan-LoaderAndValidationLayers_repo_revision` file.
- **_glslang_**: a GitHub repository commit identifier found in the retrieved - **_glslang_**: automatically retrieved by the *Vulkan-LoaderAndValidationLayers* repository.
*Vulkan-LoaderAndValidationLayers* repository.
- **_SPIRV-Tools_**: automatically retrieved by the *glslang* repository. - **_SPIRV-Tools_**: automatically retrieved by the *glslang* repository.
- **_SPIRV-Headers_**: automatically retrieved by the *glslang* repository. - **_SPIRV-Headers_**: automatically retrieved by the *glslang* repository.
- **_cereal_**: a GitHub repository commit identifier found in the
`ExternalRevisions/cereal_repo_revision` file.
You can update which versions of the *SPIRV-Cross*, *VulkanSamples*, You can update which versions of the *SPIRV-Cross*, *VulkanSamples*,
*Vulkan-LoaderAndValidationLayers*, or *cereal* libraries are retrieved, *Vulkan-LoaderAndValidationLayers*, or *cereal* libraries are retrieved,
@ -95,6 +88,22 @@ the `fetchDependencies` script again.
>to ensure all necessary external library files are included in the **MoltenVK** builds. >to ensure all necessary external library files are included in the **MoltenVK** builds.
<a name="add_cereal"></a>
Adding the *cereal* Library to the *MoltenVK Xcode* Project
-----------------------------------------------------------
The `MoltenVK` *Xcode* project is already configured to use the *cereal* library. However, after
updating the version of *cereal*, as described [above](#updating), if you encounter any building
errors, you may need to re-add the *cereal* library to the `MoltenVK` *Xcode* project as follows:
1. In the *Project Navigator* panel, select the `MoltenVK` *Xcode* project, then the `MoltenVK`
project target, and open the *Build Settings* tab. Locate the build setting entry
**Header Search Paths** (`HEADER_SEARCH_PATHS`) and add the following paths:
"$(SRCROOT)/../External/cereal/include"
<a name="add_spirv-cross"></a> <a name="add_spirv-cross"></a>
Adding the *SPIRV-Cross* Library to the *MoltenVKShaderConverter Xcode* Project Adding the *SPIRV-Cross* Library to the *MoltenVKShaderConverter Xcode* Project
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
@ -177,10 +186,10 @@ if you encounter any building errors, you may need to re-add the *SPIRV-Tools* l
`MoltenVKSPIRVToMSLConverter-macOS` target, and open the *Build Settings* tab. Locate the build setting `MoltenVKSPIRVToMSLConverter-macOS` target, and open the *Build Settings* tab. Locate the build setting
entry **Header Search Paths** (`HEADER_SEARCH_PATHS`) and add the following paths: entry **Header Search Paths** (`HEADER_SEARCH_PATHS`) and add the following paths:
"$(SRCROOT)/../External/glslang/External/spirv-tools/include" "$(SRCROOT)/glslang/External/spirv-tools/include"
"$(SRCROOT)/../External/glslang/External/spirv-tools/source" "$(SRCROOT)/glslang/External/spirv-tools/source"
"$(SRCROOT)/../External/glslang/External/spirv-tools/external/spirv-headers/include" "$(SRCROOT)/glslang/External/spirv-tools/external/spirv-headers/include"
"$(SRCROOT)/../External/glslang/build/External/spirv-tools" "$(SRCROOT)/glslang/build/External/spirv-tools"
4. Repeat *Step 3* for the `MoltenVKSPIRVToMSLConverter-iOS` target within the `MoltenVKShaderConverter` *Xcode* project 4. Repeat *Step 3* for the `MoltenVKSPIRVToMSLConverter-iOS` target within the `MoltenVKShaderConverter` *Xcode* project
@ -233,19 +242,3 @@ if you encounter any building errors, you may need to re-add the *glslang* libra
3. Open the `project.pbxproj` file in a text editor. 3. Open the `project.pbxproj` file in a text editor.
4. Remove all occurrences of `path-to-glslang-repo-folder` from the paths to the 4. Remove all occurrences of `path-to-glslang-repo-folder` from the paths to the
`glslang`, `OGLCompilersDLL`, and `SPIRV` directories added above. `glslang`, `OGLCompilersDLL`, and `SPIRV` directories added above.
<a name="add_cereal"></a>
Adding the *cereal* Library to the *MoltenVK Xcode* Project
-----------------------------------------------------------
The `MoltenVK` *Xcode* project is already configured to use the *cereal* library. However, after
updating the version of *cereal*, as described [above](#updating), if you encounter any building
errors, you may need to re-add the *cereal* library to the `MoltenVK` *Xcode* project as follows:
1. In the *Project Navigator* panel, select the `MoltenVK` *Xcode* project, then the `MoltenVK`
project target, and open the *Build Settings* tab. Locate the build setting entry
**Header Search Paths** (`HEADER_SEARCH_PATHS`) and add the following paths:
"$(SRCROOT)/../External/cereal/include"

2
ExternalRevisions/SPIRV-Cross_repo_revision
View File

@ -1 +1 @@
5161d5ed3b5a788c2469bb548fbb6001f98c03fa 7796a9f3ec94733830ad8c648157a3b1c5693e34

2
ExternalRevisions/Vulkan-LoaderAndValidationLayers_repo_revision
View File

@ -1 +1 @@
78ae9ec027bfad5d2ace2fce7d82c4e364c6b22c 359f2c1b6ca510a01f4c56f310ce0913ad345c3c

2
ExternalRevisions/VulkanSamples_repo_revision
View File

@ -1 +1 @@
8dc54f70b2f11858b422477e7a9eaa7fb455dee2 2c05813aff7161f04250673e690e6c130cfae2d7

2
MoltenVKShaderConverter/MoltenVKGLSLToSPIRVConverter/GLSLToSPIRVConverter.cpp
View File

@ -21,7 +21,7 @@
#include "SPIRVToMSLConverter.h" #include "SPIRVToMSLConverter.h"
#include "MVKStrings.h" #include "MVKStrings.h"
#include "GlslangToSpv.h" #include "GlslangToSpv.h"
#include "../../External/glslang/SPIRV/disassemble.h" #include "../glslang/SPIRV/disassemble.h"
#include "doc.h" #include "doc.h"
#include <sstream> #include <sstream>

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

@ -1177,7 +1177,7 @@
A9AB19961CB5B5A80001E7F9 /* spirv_msl.hpp */, A9AB19961CB5B5A80001E7F9 /* spirv_msl.hpp */,
); );
name = "SPIRV-Cross"; name = "SPIRV-Cross";
path = "../../External/SPIRV-Cross"; path = "../SPIRV-Cross";
sourceTree = "<group>"; sourceTree = "<group>";
}; };
A964B28D1C57EBC400D930D8 /* Products */ = { A964B28D1C57EBC400D930D8 /* Products */ = {
@ -1200,7 +1200,7 @@
A9A577C02054A0E20072F392 /* SPIRV */, A9A577C02054A0E20072F392 /* SPIRV */,
); );
name = glslang; name = glslang;
path = ../../External/glslang; path = ../glslang;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
A97CC73C1C7527F3004A5C7E /* MoltenVKShaderConverterTool */ = { A97CC73C1C7527F3004A5C7E /* MoltenVKShaderConverterTool */ = {
@ -1712,7 +1712,7 @@
A9A574D520549F1B0072F392 /* source */, A9A574D520549F1B0072F392 /* source */,
); );
name = "SPIRV-Tools"; name = "SPIRV-Tools";
path = "../../External/glslang/External/spirv-tools"; path = "../glslang/External/spirv-tools";
sourceTree = "<group>"; sourceTree = "<group>";
}; };
/* End PBXGroup section */ /* End PBXGroup section */
@ -2742,10 +2742,10 @@
GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"\"$(SRCROOT)/../External/glslang/External/spirv-tools/include\"", "\"$(SRCROOT)/glslang/External/spirv-tools/include\"",
"\"$(SRCROOT)/../External/glslang/External/spirv-tools/source\"", "\"$(SRCROOT)/glslang/External/spirv-tools/source\"",
"\"$(SRCROOT)/../External/glslang/External/spirv-tools/external/spirv-headers/include\"", "\"$(SRCROOT)/glslang/External/spirv-tools/external/spirv-headers/include\"",
"\"$(SRCROOT)/../External/glslang/build/External/spirv-tools\"", "\"$(SRCROOT)/glslang/build/External/spirv-tools\"",
); );
IPHONEOS_DEPLOYMENT_TARGET = 8.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MACH_O_TYPE = staticlib; MACH_O_TYPE = staticlib;
@ -2764,10 +2764,10 @@
GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"\"$(SRCROOT)/../External/glslang/External/spirv-tools/include\"", "\"$(SRCROOT)/glslang/External/spirv-tools/include\"",
"\"$(SRCROOT)/../External/glslang/External/spirv-tools/source\"", "\"$(SRCROOT)/glslang/External/spirv-tools/source\"",
"\"$(SRCROOT)/../External/glslang/External/spirv-tools/external/spirv-headers/include\"", "\"$(SRCROOT)/glslang/External/spirv-tools/external/spirv-headers/include\"",
"\"$(SRCROOT)/../External/glslang/build/External/spirv-tools\"", "\"$(SRCROOT)/glslang/build/External/spirv-tools\"",
); );
IPHONEOS_DEPLOYMENT_TARGET = 8.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MACH_O_TYPE = staticlib; MACH_O_TYPE = staticlib;
@ -2785,10 +2785,10 @@
GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"\"$(SRCROOT)/../External/glslang/External/spirv-tools/include\"", "\"$(SRCROOT)/glslang/External/spirv-tools/include\"",
"\"$(SRCROOT)/../External/glslang/External/spirv-tools/source\"", "\"$(SRCROOT)/glslang/External/spirv-tools/source\"",
"\"$(SRCROOT)/../External/glslang/External/spirv-tools/external/spirv-headers/include\"", "\"$(SRCROOT)/glslang/External/spirv-tools/external/spirv-headers/include\"",
"\"$(SRCROOT)/../External/glslang/build/External/spirv-tools\"", "\"$(SRCROOT)/glslang/build/External/spirv-tools\"",
); );
MACH_O_TYPE = staticlib; MACH_O_TYPE = staticlib;
PRODUCT_NAME = MoltenVKSPIRVToMSLConverter; PRODUCT_NAME = MoltenVKSPIRVToMSLConverter;
@ -2803,10 +2803,10 @@
GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"\"$(SRCROOT)/../External/glslang/External/spirv-tools/include\"", "\"$(SRCROOT)/glslang/External/spirv-tools/include\"",
"\"$(SRCROOT)/../External/glslang/External/spirv-tools/source\"", "\"$(SRCROOT)/glslang/External/spirv-tools/source\"",
"\"$(SRCROOT)/../External/glslang/External/spirv-tools/external/spirv-headers/include\"", "\"$(SRCROOT)/glslang/External/spirv-tools/external/spirv-headers/include\"",
"\"$(SRCROOT)/../External/glslang/build/External/spirv-tools\"", "\"$(SRCROOT)/glslang/build/External/spirv-tools\"",
); );
MACH_O_TYPE = staticlib; MACH_O_TYPE = staticlib;
PRODUCT_NAME = MoltenVKSPIRVToMSLConverter; PRODUCT_NAME = MoltenVKSPIRVToMSLConverter;

1
MoltenVKShaderConverter/SPIRV-Cross Symbolic link
View File

@ -0,0 +1 @@
../External/SPIRV-Cross

1
MoltenVKShaderConverter/glslang Symbolic link
View File

@ -0,0 +1 @@
../External/Vulkan-LoaderAndValidationLayers/external/glslang

26
fetchDependencies
View File

@ -137,34 +137,10 @@ else
update_repo ${REPO_NAME} ${REPO_URL} ${REPO_REV} update_repo ${REPO_NAME} ${REPO_URL} ${REPO_REV}
fi
# ----------------- glslang, SPIRV-Tools & SPIRV-Headers -------------------
# When MoltenVK is built by something that already has a copy of the
# glslang repo, copy it here.
# Note that a symlink doesn't work because the name of the containing
# directory (e.g., External) may not be the same.
if [ ! "$GLSLANG_ROOT" = "" ]; then
REPO_NAME=${GLSLANG_NAME}
rm -rf ${REPO_NAME}
cp -a ${GLSLANG_ROOT} ${REPO_NAME}
else
REPO_NAME=${GLSLANG_NAME}
REPO_URL=$(cat "${V_LVL_NAME}/external_revisions/glslang_giturl")
REPO_REV=$(cat "${V_LVL_NAME}/external_revisions/glslang_revision")
update_repo ${REPO_NAME} ${REPO_URL} ${REPO_REV}
cd ${REPO_NAME} cd ${REPO_NAME}
./update_glslang_sources.py ./update_external_sources.sh -g
cd - cd -
build_repo ${REPO_NAME}
fi fi
cd .. cd ..