diff options
author | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2023-07-19 01:31:35 +0200 |
---|---|---|
committer | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2023-07-19 01:31:35 +0200 |
commit | 71b3b2a2f0f0ec5d0a0061d3d7ea42a1f63ae1de (patch) | |
tree | 023ef7def25a0bf79ae1556fa9fc0178bf980d2b /src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | |
parent | Merge pull request #11109 from Morph1984/net (diff) | |
download | yuzu-71b3b2a2f0f0ec5d0a0061d3d7ea42a1f63ae1de.tar yuzu-71b3b2a2f0f0ec5d0a0061d3d7ea42a1f63ae1de.tar.gz yuzu-71b3b2a2f0f0ec5d0a0061d3d7ea42a1f63ae1de.tar.bz2 yuzu-71b3b2a2f0f0ec5d0a0061d3d7ea42a1f63ae1de.tar.lz yuzu-71b3b2a2f0f0ec5d0a0061d3d7ea42a1f63ae1de.tar.xz yuzu-71b3b2a2f0f0ec5d0a0061d3d7ea42a1f63ae1de.tar.zst yuzu-71b3b2a2f0f0ec5d0a0061d3d7ea42a1f63ae1de.zip |
Diffstat (limited to 'src/video_core/renderer_vulkan/vk_pipeline_cache.cpp')
-rw-r--r-- | src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp index d600c4e61..4f84d8497 100644 --- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp @@ -469,9 +469,9 @@ void PipelineCache::LoadDiskResources(u64 title_id, std::stop_token stop_loading ComputePipelineCacheKey key; file.read(reinterpret_cast<char*>(&key), sizeof(key)); - workers.QueueWork([this, key, env = std::move(env), &state, &callback]() mutable { + workers.QueueWork([this, key, env_ = std::move(env), &state, &callback]() mutable { ShaderPools pools; - auto pipeline{CreateComputePipeline(pools, key, env, state.statistics.get(), false)}; + auto pipeline{CreateComputePipeline(pools, key, env_, state.statistics.get(), false)}; std::scoped_lock lock{state.mutex}; if (pipeline) { compute_cache.emplace(key, std::move(pipeline)); @@ -500,10 +500,10 @@ void PipelineCache::LoadDiskResources(u64 title_id, std::stop_token stop_loading (key.state.dynamic_vertex_input != 0) != dynamic_features.has_dynamic_vertex_input) { return; } - workers.QueueWork([this, key, envs = std::move(envs), &state, &callback]() mutable { + workers.QueueWork([this, key, envs_ = std::move(envs), &state, &callback]() mutable { ShaderPools pools; boost::container::static_vector<Shader::Environment*, 5> env_ptrs; - for (auto& env : envs) { + for (auto& env : envs_) { env_ptrs.push_back(&env); } auto pipeline{CreateGraphicsPipeline(pools, key, MakeSpan(env_ptrs), @@ -702,8 +702,8 @@ std::unique_ptr<ComputePipeline> PipelineCache::CreateComputePipeline( if (!pipeline || pipeline_cache_filename.empty()) { return pipeline; } - serialization_thread.QueueWork([this, key, env = std::move(env)] { - SerializePipeline(key, std::array<const GenericEnvironment*, 1>{&env}, + serialization_thread.QueueWork([this, key, env_ = std::move(env)] { + SerializePipeline(key, std::array<const GenericEnvironment*, 1>{&env_}, pipeline_cache_filename, CACHE_VERSION); }); return pipeline; |