ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Vulkan: Multithreaded creation of UID pipeline caches 

Should give a decent speedup to boot time.
This commit is contained in:
Stenzek 2017-07-20 15:25:38 +10:00
parent 81b4ed2a81
commit 33f6668544
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/VideoBackends/Vulkan/Renderer.cpp
View File

@ -113,9 +113,6 @@ bool Renderer::Initialize()
m_bounding_box->GetGPUBufferSize()); m_bounding_box->GetGPUBufferSize());
} }
// Ensure all pipelines previously used by the game have been created.
StateTracker::GetInstance()->ReloadPipelineUIDCache();
// Initialize post processing. // Initialize post processing.
m_post_processor = std::make_unique<VulkanPostProcessing>(); m_post_processor = std::make_unique<VulkanPostProcessing>();
if (!static_cast<VulkanPostProcessing*>(m_post_processor.get()) if (!static_cast<VulkanPostProcessing*>(m_post_processor.get())

20
Source/Core/VideoBackends/Vulkan/StateTracker.cpp
View File

@ -156,6 +156,10 @@ void StateTracker::ReloadPipelineUIDCache()
PipelineInserter inserter(this); PipelineInserter inserter(this);
m_uid_cache.OpenAndRead(filename, inserter); m_uid_cache.OpenAndRead(filename, inserter);
} }
// If we were using background compilation, ensure everything is ready before continuing.
if (g_ActiveConfig.bBackgroundShaderCompiling)
g_shader_cache->WaitForBackgroundCompilesToComplete();
} }
void StateTracker::AppendToPipelineUIDCache(const PipelineInfo& info) void StateTracker::AppendToPipelineUIDCache(const PipelineInfo& info)
@ -212,11 +216,19 @@ bool StateTracker::PrecachePipelineUID(const SerializedPipelineUID& uid)
pinfo.blend_state.hex = uid.blend_state_bits; pinfo.blend_state.hex = uid.blend_state_bits;
pinfo.primitive_topology = uid.primitive_topology; pinfo.primitive_topology = uid.primitive_topology;
VkPipeline pipeline = g_shader_cache->GetPipeline(pinfo); if (g_ActiveConfig.bBackgroundShaderCompiling)
if (pipeline == VK_NULL_HANDLE)
{ {
WARN_LOG(VIDEO, "Failed to get pipeline from cached UID."); // Use async for multithreaded compilation.
return false; g_shader_cache->GetPipelineWithCacheResultAsync(pinfo);
}
else
{
VkPipeline pipeline = g_shader_cache->GetPipeline(pinfo);
if (pipeline == VK_NULL_HANDLE)
{
WARN_LOG(VIDEO, "Failed to get pipeline from cached UID.");
return false;
}
} }
// We don't need to do anything with this pipeline, just make sure it exists. // We don't need to do anything with this pipeline, just make sure it exists.

3
Source/Core/VideoBackends/Vulkan/main.cpp
View File

@ -263,6 +263,9 @@ bool VideoBackend::Initialize(void* window_handle)
return false; return false;
} }
// Ensure all pipelines previously used by the game have been created.
StateTracker::GetInstance()->ReloadPipelineUIDCache();
// Lastly, precompile ubershaders, if requested. // Lastly, precompile ubershaders, if requested.
// This has to be done after the texture cache and shader cache are initialized. // This has to be done after the texture cache and shader cache are initialized.
if (g_ActiveConfig.CanPrecompileUberShaders()) if (g_ActiveConfig.CanPrecompileUberShaders())