diff --git a/External/SPIRV-Cross b/External/SPIRV-Cross
index 33c5cd9b..6a0f6980 160000
--- a/External/SPIRV-Cross
+++ b/External/SPIRV-Cross
@@ -1 +1 @@
-Subproject commit 33c5cd9b19295f94702c8c3002283fb4b55f47ab
+Subproject commit 6a0f6980ef851c3973f8e723737aa764b04b18ca
diff --git a/MoltenVK/MoltenVK/Commands/MVKCmdPipeline.mm b/MoltenVK/MoltenVK/Commands/MVKCmdPipeline.mm
index 9c2d8b1b..8383d653 100644
--- a/MoltenVK/MoltenVK/Commands/MVKCmdPipeline.mm
+++ b/MoltenVK/MoltenVK/Commands/MVKCmdPipeline.mm
@@ -159,7 +159,7 @@ void MVKCmdPushConstants::setContent(VkPipelineLayout layout,
 	_stageFlags = stageFlags;
 	_offset = offset;
 
-    mvkEnsureSize(_pushConstants, size);
+	_pushConstants.resize(size);
 	copy_n((char*)pValues, size, _pushConstants.begin());
 }
 
diff --git a/MoltenVK/MoltenVK/Commands/MVKCommandResourceFactory.mm b/MoltenVK/MoltenVK/Commands/MVKCommandResourceFactory.mm
index 3c0986ae..09019c45 100644
--- a/MoltenVK/MoltenVK/Commands/MVKCommandResourceFactory.mm
+++ b/MoltenVK/MoltenVK/Commands/MVKCommandResourceFactory.mm
@@ -200,23 +200,12 @@ MVKImage* MVKCommandResourceFactory::newMVKImage(MVKImageDescriptorData& imgData
 }
 
 string MVKCommandResourceFactory::getFragFunctionSuffix(MTLPixelFormat mtlPixFmt) {
-    string suffix;
     switch (mvkFormatTypeFromMTLPixelFormat(mtlPixFmt)) {
-        case kMVKFormatDepthStencil:
-            suffix = "DS";
-            break;
-        case kMVKFormatColorUInt:
-            suffix = "U";
-            break;
-        case kMVKFormatColorInt:
-            suffix = "I";
-            break;
-        default:
-            suffix = "F";
-            break;
+        case kMVKFormatDepthStencil:	return "DS";
+        case kMVKFormatColorUInt:		return "U";
+        case kMVKFormatColorInt:		return "I";
+        default:						return "F";
     }
-
-    return suffix;
 }
 
 string MVKCommandResourceFactory::getFragFunctionSuffix(MVKRPSKeyClearAtt& attKey) {
diff --git a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKShaderConverter.xcscheme b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKShaderConverter.xcscheme
index e5328ef7..d9a7a70d 100644
--- a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKShaderConverter.xcscheme
+++ b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/xcshareddata/xcschemes/MoltenVKShaderConverter.xcscheme
@@ -74,19 +74,19 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "-gi"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "/Users/bill/Documents/Dev/iOSProjects/Molten/MoltenVK-bh/External/SPIRV-Cross/shaders-msl/comp/functions.comp"
-            isEnabled = "YES">
+            argument = "/Users/bill/Documents/Dev/iOSProjects/Molten/MoltenVK-bh/External/SPIRV-Cross/shaders-msl/vert/pointsize.vert"
+            isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "-si"
-            isEnabled = "NO">
+            isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "/Users/bill/Documents/Dev/iOSProjects/Molten/Support/Valve/Dota2/shader-issues/spv_cross_bug/spv_cross_bug.spv"
-            isEnabled = "NO">
+            argument = "/Users/bill/Documents/Dev/iOSProjects/Molten/Support/Valve/Dota2/shader-issues/sample_mask/sample_mask.spv"
+            isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "-mo"