summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2021-04-03 10:19:13 +0200
committerameerj <52414509+ameerj@users.noreply.github.com>2021-07-23 03:51:26 +0200
commit6ff2e9ba097f3619c21d2e547570e1fbaae8d6ee (patch)
tree985d61c5679d7c03d80d808e7d72cfacfdfd4e8b
parentshader: Rework global memory tracking to use breadth-first search (diff)
downloadyuzu-6ff2e9ba097f3619c21d2e547570e1fbaae8d6ee.tar
yuzu-6ff2e9ba097f3619c21d2e547570e1fbaae8d6ee.tar.gz
yuzu-6ff2e9ba097f3619c21d2e547570e1fbaae8d6ee.tar.bz2
yuzu-6ff2e9ba097f3619c21d2e547570e1fbaae8d6ee.tar.lz
yuzu-6ff2e9ba097f3619c21d2e547570e1fbaae8d6ee.tar.xz
yuzu-6ff2e9ba097f3619c21d2e547570e1fbaae8d6ee.tar.zst
yuzu-6ff2e9ba097f3619c21d2e547570e1fbaae8d6ee.zip
-rw-r--r--src/video_core/renderer_vulkan/vk_pipeline_cache.cpp27
1 files changed, 12 insertions, 15 deletions
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
index 3111165fb..f88ab67ae 100644
--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
@@ -539,13 +539,11 @@ void PipelineCache::LoadDiskResources(u64 title_id, std::stop_token stop_loading
ShaderPools pools;
auto pipeline{CreateComputePipeline(pools, key, envs.front(), false)};
- {
- std::lock_guard lock{state.mutex};
- compute_cache.emplace(key, std::move(pipeline));
- ++state.built;
- if (state.has_loaded) {
- callback(VideoCore::LoadCallbackStage::Build, state.built, state.total);
- }
+ std::lock_guard lock{state.mutex};
+ compute_cache.emplace(key, std::move(pipeline));
+ ++state.built;
+ if (state.has_loaded) {
+ callback(VideoCore::LoadCallbackStage::Build, state.built, state.total);
}
});
} else {
@@ -560,13 +558,11 @@ void PipelineCache::LoadDiskResources(u64 title_id, std::stop_token stop_loading
}
auto pipeline{CreateGraphicsPipeline(pools, key, MakeSpan(env_ptrs), false)};
- {
- std::lock_guard lock{state.mutex};
- graphics_cache.emplace(key, std::move(pipeline));
- ++state.built;
- if (state.has_loaded) {
- callback(VideoCore::LoadCallbackStage::Build, state.built, state.total);
- }
+ std::lock_guard lock{state.mutex};
+ graphics_cache.emplace(key, std::move(pipeline));
+ ++state.built;
+ if (state.has_loaded) {
+ callback(VideoCore::LoadCallbackStage::Build, state.built, state.total);
}
});
}
@@ -635,7 +631,8 @@ PipelineCache::PipelineCache(RasterizerVulkan& rasterizer_, Tegra::GPU& gpu_,
float_control.shaderSignedZeroInfNanPreserveFloat64 != VK_FALSE,
.support_explicit_workgroup_layout = device.IsKhrWorkgroupMemoryExplicitLayoutSupported(),
.support_vote = true,
- .support_viewport_index_layer_non_geometry = device.IsExtShaderViewportIndexLayerSupported(),
+ .support_viewport_index_layer_non_geometry =
+ device.IsExtShaderViewportIndexLayerSupported(),
.warp_size_potentially_larger_than_guest = device.IsWarpSizePotentiallyBiggerThanGuest(),
.has_broken_spirv_clamp = driver_id == VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS_KHR,
.generic_input_types{},