From 85dd604a7e6baf91c1df2afa346c54ccb8ba02f2 Mon Sep 17 00:00:00 2001 From: GPUCode Date: Fri, 11 Aug 2023 03:33:15 +0300 Subject: [PATCH] vk_renderpass_cache: Bump pixel format count --- src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp | 8 ++------ src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | 2 +- src/video_core/renderer_vulkan/vk_renderpass_cache.h | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) 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( 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: