Merge pull request #457 from billhollings/master

Update to latest dependency libraries for Vulkan SDK 1.1.97.
KhronosGroup · Jan 17, 2019 · 519b594 · 519b594
2 parents f7336d8 + 991a194
commit 519b594
Show file tree

Hide file tree

Showing 12 changed files with 2,139 additions and 1,882 deletions.
diff --git a/Docs/Whats_New.md b/Docs/Whats_New.md
@@ -16,7 +16,7 @@ For best results, use a Markdown reader.*
 MoltenVK 1.0.31
 ---------------
 
-Released 2019/01/16
+Released 2019/01/17
 
 - Support runtime config via runtime environment variables
 - Add full ImageView swizzling to config, and disable it by default.
@@ -32,6 +32,7 @@ Released 2019/01/16
 - Advertise the `VK_AMD_gpu_shader_half_float` extension.
 - Support the `VK_KHR_variable_pointers` extension.
 - MoltenVKShaderConverter tool exit with fail code on any file conversion fail.
+- Update to latest dependency libraries for Vulkan SDK 1.1.97.
 - Update to latest SPIRV-Cross version:
  - MSL: Support SPV_KHR_variable_pointers.
  - MSL: Workaround missing gradient2d() on macOS for typical cascaded shadow mapping.
@@ -40,6 +41,8 @@ Released 2019/01/16
  - MSL: Fix case where we pass arrays to functions by value.
  - MSL: Add option to pad fragment outputs.
  - MSL: Fix passing a sampled image to a function.
+ - MSL: Support std140 packing rules for float[] and float2[].
+ - MSL: Fix image load/store for short vectors.
  - Performance improvements on iterating internal constructs.
  - Update copyright to 2019.
 

diff --git a/ExternalDependencies.xcodeproj/project.pbxproj b/ExternalDependencies.xcodeproj/project.pbxproj
diff --git a/ExternalRevisions/SPIRV-Cross_repo_revision b/ExternalRevisions/SPIRV-Cross_repo_revision
@@ -1 +1 @@
-9e3a41ad00ca48b9119d805cd96f337984458fe7
+1040cf6cc1e677c179488753dfb78e7326fd759a
diff --git a/ExternalRevisions/Vulkan-Headers_repo_revision b/ExternalRevisions/Vulkan-Headers_repo_revision
@@ -1 +1 @@
-add65b83415824f59041486d4903ee1909dc6ee2
+c200cb25db0f47364d3318d92c1d8e9dfff2fef1
diff --git a/ExternalRevisions/Vulkan-Tools_repo_revision b/ExternalRevisions/Vulkan-Tools_repo_revision
@@ -1 +1 @@
-d74a02234851dfacf6b140c1ab4d81becf704098
+ff56a741b1cce8ae20ff6276f51100e668e9c4f5
diff --git a/ExternalRevisions/VulkanSamples_repo_revision b/ExternalRevisions/VulkanSamples_repo_revision
@@ -1 +1 @@
-1a849458db984f77c9ecfa79041ede550094c2f2
+5810b01149ef4f76fd92d7e085d980017379a93b
diff --git a/ExternalRevisions/glslang_repo_revision b/ExternalRevisions/glslang_repo_revision
@@ -1 +1 @@
-1bc601c674aecc2fee0dee8ff7a118db76b4c439
+2898223375d57fb3974f24e1e944bb624f67cb73
diff --git a/MoltenVK/MoltenVK/Commands/MVKCmdRenderPass.h b/MoltenVK/MoltenVK/Commands/MVKCmdRenderPass.h
@@ -115,7 +115,7 @@ class MVKCmdSetViewport : public MVKCommand {
 
 private:
  uint32_t _firstViewport;
- MVKVectorInline<MTLViewport, 8> _mtlViewports;
+ MVKVectorInline<MTLViewport, kMVKCachedViewportCount> _mtlViewports;
 };
 
 
@@ -134,7 +134,7 @@ class MVKCmdSetScissor : public MVKCommand {
 
 private:
  uint32_t _firstScissor;
- MVKVectorInline<MTLScissorRect, 8> _mtlScissors;
+ MVKVectorInline<MTLScissorRect, kMVKCachedScissorCount> _mtlScissors;
 };
 
 

diff --git a/MoltenVK/MoltenVK/Commands/MVKCommandEncoderState.h b/MoltenVK/MoltenVK/Commands/MVKCommandEncoderState.h
@@ -147,7 +147,7 @@ class MVKViewportCommandEncoderState : public MVKCommandEncoderState {
  void encodeImpl() override;
  void resetImpl() override;
 
- MVKVectorInline<MTLViewport, 8> _mtlViewports;
+ MVKVectorInline<MTLViewport, kMVKCachedViewportCount> _mtlViewports;
 };
 
 
@@ -176,7 +176,7 @@ class MVKScissorCommandEncoderState : public MVKCommandEncoderState {
  void encodeImpl() override;
  void resetImpl() override;
 
- MVKVectorInline<MTLScissorRect, 8> _mtlScissors;
+ MVKVectorInline<MTLScissorRect, kMVKCachedScissorCount> _mtlScissors;
 };
 
 

diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.h b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.h
@@ -65,6 +65,10 @@ class MVKCommandResourceFactory;
 /** The buffer index to use for vertex content. */
 const static uint32_t kMVKVertexContentBufferIndex = 0;
 
+// Parameters to define the sizing of inline collections
+const static uint32_t kMVKCachedViewportCount = 16;
+const static uint32_t kMVKCachedScissorCount = 16;
+
 
 #pragma mark -
 #pragma mark MVKPhysicalDevice

diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKImage.h b/MoltenVK/MoltenVK/GPUObjects/MVKImage.h
@@ -20,8 +20,8 @@
 
 #include "MVKResource.h"
 #include "MVKSync.h"
-#include "MVKVector.h"
 #include <mutex>
+#include <list>
 
 #import <IOSurface/IOSurfaceRef.h>
 
@@ -396,7 +396,7 @@ class MVKSwapchainImage : public MVKImage {
  uint32_t _swapchainIndex;
  id<CAMetalDrawable> _mtlDrawable;
  std::mutex _availabilityLock;
- MVKVectorInline<MVKSwapchainSignaler, 4> _availabilitySignalers;
+ std::list<MVKSwapchainSignaler> _availabilitySignalers;
  MVKSwapchainSignaler _preSignaled;
  MVKSwapchainImageAvailability _availability;
 };

diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKPipeline.h b/MoltenVK/MoltenVK/GPUObjects/MVKPipeline.h
@@ -142,8 +142,8 @@ class MVKGraphicsPipeline : public MVKPipeline {
  VkPipelineRasterizationStateCreateInfo _rasterInfo;
  VkPipelineDepthStencilStateCreateInfo _depthStencilInfo;
 
- MVKVectorInline<MTLViewport, 8> _mtlViewports;
- MVKVectorInline<MTLScissorRect, 8> _mtlScissors;
+ MVKVectorInline<MTLViewport, kMVKCachedViewportCount> _mtlViewports;
+ MVKVectorInline<MTLScissorRect, kMVKCachedScissorCount> _mtlScissors;
 
  id<MTLRenderPipelineState> _mtlPipelineState;
  MTLCullMode _mtlCullMode;