diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
index 7d6f72351..c12fbbf5b 100644
--- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
+++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
@@ -91,12 +91,8 @@ bool GraphicsPipeline::TryBuild(bool wait_built) {
     }
 
     // Fallback to (a)synchronous compilation
-    if (worker) {
-        worker->QueueWork([this] { Build(); });
-        is_pending = true;
-    } else {
-        Build();
-    }
+    worker->QueueWork([this] { Build(); });
+    is_pending = true;
     return true;
 }
 
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
index 4bac4c707..54e693068 100644
--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
@@ -185,7 +185,7 @@ bool PipelineCache::BindPipeline(const PipelineInfo& info, bool wait_built) {
     if (new_pipeline) {
         it.value() = std::make_unique<GraphicsPipeline>(
             instance, renderpass_cache, info, *pipeline_cache, *pipeline_layout, current_shaders,
-            wait_built ? nullptr : &workers);
+            &workers);
     }
 
     GraphicsPipeline* const pipeline{it->second.get()};
diff --git a/src/video_core/renderer_vulkan/vk_renderpass_cache.h b/src/video_core/renderer_vulkan/vk_renderpass_cache.h
index 820738cc4..64cb960b8 100644
--- a/src/video_core/renderer_vulkan/vk_renderpass_cache.h
+++ b/src/video_core/renderer_vulkan/vk_renderpass_cache.h
@@ -35,7 +35,7 @@ struct RenderPass {
 };
 
 class RenderpassCache {
-    static constexpr size_t MAX_COLOR_FORMATS = 5;
+    static constexpr size_t MAX_COLOR_FORMATS = 13;
     static constexpr size_t MAX_DEPTH_FORMATS = 4;
 
 public: