Merge pull request #685 from billhollings/master

Update to latest version of SPIRV-Cross.
KhronosGroup · Jul 24, 2019 · 73cbc80 · 73cbc80
2 parents a945872 + 095dd33
commit 73cbc80
Show file tree

Hide file tree

Showing 27 changed files with 31 additions and 29 deletions.
diff --git a/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/project.pbxproj b/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/project.pbxproj
@@ -545,7 +545,7 @@
  29B97313FDCFA39411CA2CEA /* Project object */ = {
  isa = PBXProject;
  attributes = {
- LastUpgradeCheck = 1020;
+ LastUpgradeCheck = 1030;
  TargetAttributes = {
  A977BCBD1B66BB010067E5BF = {
  DevelopmentTeam = VU3TCKU48B;

diff --git a/...Samples/API-Samples/API-Samples.xcodeproj/xcshareddata/xcschemes/API-Samples-iOS.xcscheme b/...Samples/API-Samples/API-Samples.xcodeproj/xcshareddata/xcschemes/API-Samples-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1020"
+ LastUpgradeVersion = "1030"
  version = "2.0">
  <BuildAction
  parallelizeBuildables = "YES"

diff --git a/...mples/API-Samples/API-Samples.xcodeproj/xcshareddata/xcschemes/API-Samples-macOS.xcscheme b/...mples/API-Samples/API-Samples.xcodeproj/xcshareddata/xcschemes/API-Samples-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1020"
+ LastUpgradeVersion = "1030"
  version = "2.0">
  <BuildAction
  parallelizeBuildables = "YES"
@@ -42,9 +42,9 @@
  </AdditionalOptions>
  </TestAction>
  <LaunchAction
- buildConfiguration = "Release"
- selectedDebuggerIdentifier = ""
- selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
  launchStyle = "0"
  useCustomWorkingDirectory = "NO"
  ignoresPersistentStateOnLaunch = "NO"

diff --git a/Demos/LunarG-VulkanSamples/API-Samples/iOS/DemoViewController.mm b/Demos/LunarG-VulkanSamples/API-Samples/iOS/DemoViewController.mm
@@ -32,7 +32,7 @@
  * Initialize sample from view, and resize view in accordance with the sample. 
  */
 void init_window(struct sample_info &info) {
- info.window = sampleView.layer;
+ info.caMetalLayer = sampleView.layer;
  sampleView.bounds = CGRectMake(0, 0, info.width, info.height);
 }
 

diff --git a/Demos/LunarG-VulkanSamples/API-Samples/macOS/DemoViewController.mm b/Demos/LunarG-VulkanSamples/API-Samples/macOS/DemoViewController.mm
@@ -33,7 +33,7 @@
  * Initialize sample from view, and resize view in accordance with the sample.
  */
 void init_window(struct sample_info &info) {
- info.window = sampleView.layer;
+ info.caMetalLayer = sampleView.layer;
  sampleView.bounds = CGRectMake(0, 0, info.width, info.height);
 }
 

diff --git a/Demos/LunarG-VulkanSamples/Cube/Cube.xcodeproj/project.pbxproj b/Demos/LunarG-VulkanSamples/Cube/Cube.xcodeproj/project.pbxproj
@@ -234,7 +234,7 @@
  29B97313FDCFA39411CA2CEA /* Project object */ = {
  isa = PBXProject;
  attributes = {
- LastUpgradeCheck = 1020;
+ LastUpgradeCheck = 1030;
  TargetAttributes = {
  A9B53B0F1C3AC0BE00ABC6F6 = {
  DevelopmentTeam = VU3TCKU48B;

diff --git a/Demos/LunarG-VulkanSamples/Cube/Cube.xcodeproj/xcshareddata/xcschemes/Cube-iOS.xcscheme b/Demos/LunarG-VulkanSamples/Cube/Cube.xcodeproj/xcshareddata/xcschemes/Cube-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1020"
+ LastUpgradeVersion = "1030"
  version = "2.0">
  <BuildAction
  parallelizeBuildables = "YES"

diff --git a/Demos/LunarG-VulkanSamples/Cube/Cube.xcodeproj/xcshareddata/xcschemes/Cube-macOS.xcscheme b/Demos/LunarG-VulkanSamples/Cube/Cube.xcodeproj/xcshareddata/xcschemes/Cube-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1020"
+ LastUpgradeVersion = "1030"
  version = "2.0">
  <BuildAction
  parallelizeBuildables = "YES"

diff --git a/Demos/LunarG-VulkanSamples/Hologram/Hologram.xcodeproj/project.pbxproj b/Demos/LunarG-VulkanSamples/Hologram/Hologram.xcodeproj/project.pbxproj
@@ -265,7 +265,7 @@
  29B97313FDCFA39411CA2CEA /* Project object */ = {
  isa = PBXProject;
  attributes = {
- LastUpgradeCheck = 1020;
+ LastUpgradeCheck = 1030;
  TargetAttributes = {
  A977BCBD1B66BB010067E5BF = {
  DevelopmentTeam = VU3TCKU48B;

diff --git a/...rG-VulkanSamples/Hologram/Hologram.xcodeproj/xcshareddata/xcschemes/Hologram-iOS.xcscheme b/...rG-VulkanSamples/Hologram/Hologram.xcodeproj/xcshareddata/xcschemes/Hologram-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1020"
+ LastUpgradeVersion = "1030"
  version = "2.0">
  <BuildAction
  parallelizeBuildables = "YES"

diff --git a/...-VulkanSamples/Hologram/Hologram.xcodeproj/xcshareddata/xcschemes/Hologram-macOS.xcscheme b/...-VulkanSamples/Hologram/Hologram.xcodeproj/xcshareddata/xcschemes/Hologram-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1020"
+ LastUpgradeVersion = "1030"
  version = "2.0">
  <BuildAction
  parallelizeBuildables = "YES"

diff --git a/Docs/Whats_New.md b/Docs/Whats_New.md
@@ -65,6 +65,7 @@ Released 2019/07/25
 - Document that the functions in `vk_mvk_moltenvk.h` cannot be used with objects 
  retrieved through the *Vulkan SDK Loader and Layers* framework.
 - Update `VK_MVK_MOLTENVK_SPEC_VERSION` to 21.
+- Update dependency libraries to match Vulkan SDK 1.1.114.
 - Update to latest SPIRV-Cross version:
  - MSL: Support `SPV_KHR_multiview` extension.
  - MSL: Support the `SPV_KHR_post_depth_coverage` extension.
@@ -82,6 +83,7 @@ Released 2019/07/25
  - MSL: Support scalar block layout.
  - MSL: Use the `select()` function for `OpSelect`.
  - MSL: Handle `coherent`, `volatile`, and `restrict`.
+ - MSL: Refactor buffer packing logic from ground up.
  - MSL: Fix alignment of packed types.
  - MSL: Handle packed matrices.
  - MSL: Conditionally validate MSL 2.2 shaders.

diff --git a/ExternalRevisions/SPIRV-Cross_repo_revision b/ExternalRevisions/SPIRV-Cross_repo_revision
@@ -1 +1 @@
-fb71a337a2899eed2d1dbc2f5cd21cb35aba67b0
+07bb1a53e0cb86cfb9b116623493df974ad9ccee
diff --git a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj
@@ -830,7 +830,7 @@
  A9F55D25198BE6A7004EC31B /* Project object */ = {
  isa = PBXProject;
  attributes = {
- LastUpgradeCheck = 1020;
+ LastUpgradeCheck = 1030;
  ORGANIZATIONNAME = "The Brenwill Workshop Ltd.";
  TargetAttributes = {
  A9B8EE091A98D796009C5A02 = {

diff --git a/MoltenVK/MoltenVK.xcodeproj/xcshareddata/xcschemes/MoltenVK-iOS.xcscheme b/MoltenVK/MoltenVK.xcodeproj/xcshareddata/xcschemes/MoltenVK-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1020"
+ LastUpgradeVersion = "1030"
  version = "2.0">
  <BuildAction
  parallelizeBuildables = "YES"

diff --git a/MoltenVK/MoltenVK.xcodeproj/xcshareddata/xcschemes/MoltenVK-macOS.xcscheme b/MoltenVK/MoltenVK.xcodeproj/xcshareddata/xcschemes/MoltenVK-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1020"
+ LastUpgradeVersion = "1030"
  version = "2.0">
  <BuildAction
  parallelizeBuildables = "YES"

diff --git a/MoltenVKPackaging.xcodeproj/project.pbxproj b/MoltenVKPackaging.xcodeproj/project.pbxproj
@@ -248,7 +248,7 @@
  A90B2B1D1A9B6170008EE819 /* Project object */ = {
  isa = PBXProject;
  attributes = {
- LastUpgradeCheck = 1020;
+ LastUpgradeCheck = 1030;
  TargetAttributes = {
  A9FEADBC1F3517480010240E = {
  DevelopmentTeam = VU3TCKU48B;

diff --git a/MoltenVKPackaging.xcodeproj/xcshareddata/xcschemes/MoltenVK Package (Debug).xcscheme b/MoltenVKPackaging.xcodeproj/xcshareddata/xcschemes/MoltenVK Package (Debug).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1020"
+ LastUpgradeVersion = "1030"
  version = "2.0">
  <BuildAction
  parallelizeBuildables = "YES"

diff --git a/MoltenVKPackaging.xcodeproj/xcshareddata/xcschemes/MoltenVK Package (iOS only).xcscheme b/MoltenVKPackaging.xcodeproj/xcshareddata/xcschemes/MoltenVK Package (iOS only).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1020"
+ LastUpgradeVersion = "1030"
  version = "2.0">
  <BuildAction
  parallelizeBuildables = "YES"

diff --git a/MoltenVKPackaging.xcodeproj/xcshareddata/xcschemes/MoltenVK Package (macOS only).xcscheme b/MoltenVKPackaging.xcodeproj/xcshareddata/xcschemes/MoltenVK Package (macOS only).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1020"
+ LastUpgradeVersion = "1030"
  version = "2.0">
  <BuildAction
  parallelizeBuildables = "YES"

diff --git a/MoltenVKPackaging.xcodeproj/xcshareddata/xcschemes/MoltenVK Package.xcscheme b/MoltenVKPackaging.xcodeproj/xcshareddata/xcschemes/MoltenVK Package.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1020"
+ LastUpgradeVersion = "1030"
  version = "2.0">
  <BuildAction
  parallelizeBuildables = "NO"

diff --git a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj
@@ -415,7 +415,7 @@
  A9F55D25198BE6A7004EC31B /* Project object */ = {
  isa = PBXProject;
  attributes = {
- LastUpgradeCheck = 1020;
+ LastUpgradeCheck = 1030;
  ORGANIZATIONNAME = "The Brenwill Workshop Ltd.";
  TargetAttributes = {
  A9092A8C1A81717B00051823 = {

diff --git a/...haderConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKGLSLToSPIRVConverter-iOS.xcscheme b/...haderConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKGLSLToSPIRVConverter-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1020"
+ LastUpgradeVersion = "1030"
  version = "2.0">
  <BuildAction
  parallelizeBuildables = "YES"

diff --git a/...derConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKGLSLToSPIRVConverter-macOS.xcscheme b/...derConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKGLSLToSPIRVConverter-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1020"
+ LastUpgradeVersion = "1030"
  version = "2.0">
  <BuildAction
  parallelizeBuildables = "YES"

diff --git a/...ShaderConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKSPIRVToMSLConverter-iOS.xcscheme b/...ShaderConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKSPIRVToMSLConverter-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1020"
+ LastUpgradeVersion = "1030"
  version = "2.0">
  <BuildAction
  parallelizeBuildables = "YES"

diff --git a/...aderConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKSPIRVToMSLConverter-macOS.xcscheme b/...aderConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKSPIRVToMSLConverter-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1020"
+ LastUpgradeVersion = "1030"
  version = "2.0">
  <BuildAction
  parallelizeBuildables = "YES"

diff --git a/...MoltenVKShaderConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKShaderConverter.xcscheme b/...MoltenVKShaderConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKShaderConverter.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1020"
+ LastUpgradeVersion = "1030"
  version = "2.0">
  <BuildAction
  parallelizeBuildables = "YES"