diff --git a/renderdoc/Makefile b/renderdoc/Makefile
index 75221e1e1..eb16d15a0 100644
--- a/renderdoc/Makefile
+++ b/renderdoc/Makefile
@@ -63,9 +63,9 @@ data/glsl/quadoverdraw.frago \
 data/glsl/histogram.compo \
 data/glsl/arraymscopy.compo \
 data/glsl/outline.frago \
-data/spv/blitvs.spv \
-data/spv/checkerboardfs.spv \
-data/spv/texdisplayfs.spv \
+data/spv/blitvs.spvo \
+data/spv/checkerboardfs.spvo \
+data/spv/texdisplayfs.spvo \
 data/sourcecodepro.ttfo
 
 .PHONY: all
diff --git a/renderdoc/driver/vulkan/vk_resources.cpp b/renderdoc/driver/vulkan/vk_resources.cpp
index 134aaeb34..27d054f06 100644
--- a/renderdoc/driver/vulkan/vk_resources.cpp
+++ b/renderdoc/driver/vulkan/vk_resources.cpp
@@ -117,13 +117,13 @@ ResourceFormat MakeResourceFormat(VkFormat fmt)
 	ret.special = false;
 	ret.specialFormat = eSpecial_Unknown;
 	ret.strname = ToStr::Get(fmt).substr(10); // 3 == strlen("VK_FORMAT_")
+	ret.compByteWidth = 0;
+	ret.compCount = 0;
+	ret.compType = eCompType_None;
+	ret.srgbCorrected = false;
 
 	if(fmt == VK_FORMAT_UNDEFINED)
 	{
-		ret.compCount = 0;
-		ret.compByteWidth = 0;
-		ret.compType = eCompType_None;
-		ret.srgbCorrected = false;
 		return ret;
 	}
 
@@ -258,6 +258,8 @@ ResourceFormat MakeResourceFormat(VkFormat fmt)
 			ret.special = true;
 			ret.specialFormat = eSpecial_B8G8R8A8;
 			break;
+		default:
+			break;
 	}
 
 	switch(fmt)
@@ -415,6 +417,8 @@ ResourceFormat MakeResourceFormat(VkFormat fmt)
 		case VK_FORMAT_B10G10R10A2_SINT:
 			ret.compCount = 4;
 			break;
+		default:
+			break;
 	}
 
 	switch(fmt)
@@ -449,6 +453,8 @@ ResourceFormat MakeResourceFormat(VkFormat fmt)
 		case VK_FORMAT_B8G8R8A8_SRGB:
 			ret.srgbCorrected = true;
 			break;
+		default:
+			break;
 	}
 
 	switch(fmt)
@@ -642,6 +648,8 @@ ResourceFormat MakeResourceFormat(VkFormat fmt)
 		case VK_FORMAT_D32_SFLOAT:
 			ret.compType = eCompType_Depth;
 			break;
+		default:
+			break;
 	}
 
 	switch(fmt)
@@ -746,6 +754,8 @@ ResourceFormat MakeResourceFormat(VkFormat fmt)
 		case VK_FORMAT_R64G64B64A64_SFLOAT:
 			ret.compByteWidth = 8;
 			break;
+		default:
+			break;
 	}
 
 	return ret;