diff options
| author | Stenzek <stenzek@gmail.com> | 2017-07-27 13:15:38 +1000 |
|---|---|---|
| committer | Stenzek <stenzek@gmail.com> | 2017-07-30 17:43:59 +1000 |
| commit | c8f31656cb1c5f5e3c83a5b977fd822e987cb596 (patch) | |
| tree | 533941c3211604f5550bffb9b56930c141efd6ae /Source/Core/VideoBackends/D3D/VertexShaderCache.cpp | |
| parent | e17efb1d8dcff32e7db915a53dc95df0bf329692 (diff) | |
VideoBackends: Support a different number of threads for precompiling
At runtime, we only really want a single shader compiler thread.
However, for initial boots, we can use a higher number to speed things
up.
Diffstat (limited to 'Source/Core/VideoBackends/D3D/VertexShaderCache.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/VertexShaderCache.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/Source/Core/VideoBackends/D3D/VertexShaderCache.cpp b/Source/Core/VideoBackends/D3D/VertexShaderCache.cpp index 8df1ec718f..a90de7c105 100644 --- a/Source/Core/VideoBackends/D3D/VertexShaderCache.cpp +++ b/Source/Core/VideoBackends/D3D/VertexShaderCache.cpp @@ -174,11 +174,12 @@ void VertexShaderCache::Init() LoadShaderCache(); g_async_compiler = std::make_unique<VideoCommon::AsyncShaderCompiler>(); - if (g_ActiveConfig.GetShaderCompilerThreads() > 0) - g_async_compiler->StartWorkerThreads(g_ActiveConfig.GetShaderCompilerThreads()); + g_async_compiler->ResizeWorkerThreads(g_ActiveConfig.CanPrecompileUberShaders() ? + g_ActiveConfig.GetShaderPrecompilerThreads() : + g_ActiveConfig.GetShaderCompilerThreads()); if (g_ActiveConfig.CanPrecompileUberShaders()) - PrecompileUberShaders(); + QueueUberShaderCompiles(); } void VertexShaderCache::LoadShaderCache() @@ -206,7 +207,7 @@ void VertexShaderCache::Reload() LoadShaderCache(); if (g_ActiveConfig.CanPrecompileUberShaders()) - PrecompileUberShaders(); + QueueUberShaderCompiles(); } void VertexShaderCache::Clear() @@ -426,7 +427,7 @@ void VertexShaderCache::RetreiveAsyncShaders() g_async_compiler->RetrieveWorkItems(); } -void VertexShaderCache::PrecompileUberShaders() +void VertexShaderCache::QueueUberShaderCompiles() { UberShader::EnumerateVertexShaderUids([&](const UberShader::VertexShaderUid& uid) { if (ubervshaders.find(uid) != ubervshaders.end()) @@ -435,13 +436,19 @@ void VertexShaderCache::PrecompileUberShaders() g_async_compiler->QueueWorkItem( g_async_compiler->CreateWorkItem<UberVertexShaderCompilerWorkItem>(uid)); }); +} +void VertexShaderCache::WaitForBackgroundCompilesToComplete() +{ g_async_compiler->WaitUntilCompletion([](size_t completed, size_t total) { Host_UpdateProgressDialog(GetStringT("Compiling shaders...").c_str(), static_cast<int>(completed), static_cast<int>(total)); }); g_async_compiler->RetrieveWorkItems(); Host_UpdateProgressDialog("", -1, -1); + + // Switch from precompile -> runtime compiler threads. + g_async_compiler->ResizeWorkerThreads(g_ActiveConfig.GetShaderCompilerThreads()); } VertexShaderCache::VertexShaderCompilerWorkItem::VertexShaderCompilerWorkItem( |
