summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2022-02-01 07:58:38 +0100
committerGitHub <noreply@github.com>2022-02-01 07:58:38 +0100
commit26a9dc3f65824d9d3b1a8da17f204edb083c9b99 (patch)
tree083c76d53f755b1bef3623a0d0215bbc89fb627a
parentMerge pull request #7822 from zhaobot/tx-update-20220201021425 (diff)
parentvideo_core/shader_cache: Remove unused algorithm include (diff)
downloadyuzu-26a9dc3f65824d9d3b1a8da17f204edb083c9b99.tar
yuzu-26a9dc3f65824d9d3b1a8da17f204edb083c9b99.tar.gz
yuzu-26a9dc3f65824d9d3b1a8da17f204edb083c9b99.tar.bz2
yuzu-26a9dc3f65824d9d3b1a8da17f204edb083c9b99.tar.lz
yuzu-26a9dc3f65824d9d3b1a8da17f204edb083c9b99.tar.xz
yuzu-26a9dc3f65824d9d3b1a8da17f204edb083c9b99.tar.zst
yuzu-26a9dc3f65824d9d3b1a8da17f204edb083c9b99.zip
-rw-r--r--src/video_core/shader_cache.cpp4
-rw-r--r--src/video_core/shader_cache.h3
2 files changed, 3 insertions, 4 deletions
diff --git a/src/video_core/shader_cache.cpp b/src/video_core/shader_cache.cpp
index 78bf90c48..87636857d 100644
--- a/src/video_core/shader_cache.cpp
+++ b/src/video_core/shader_cache.cpp
@@ -170,7 +170,7 @@ void ShaderCache::RemovePendingShaders() {
marked_for_removal.clear();
if (!removed_shaders.empty()) {
- RemoveShadersFromStorage(std::move(removed_shaders));
+ RemoveShadersFromStorage(removed_shaders);
}
}
@@ -213,7 +213,7 @@ void ShaderCache::UnmarkMemory(Entry* entry) {
rasterizer.UpdatePagesCachedCount(addr, size, -1);
}
-void ShaderCache::RemoveShadersFromStorage(std::vector<ShaderInfo*> removed_shaders) {
+void ShaderCache::RemoveShadersFromStorage(std::span<ShaderInfo*> removed_shaders) {
// Remove them from the cache
std::erase_if(storage, [&removed_shaders](const std::unique_ptr<ShaderInfo>& shader) {
return std::ranges::find(removed_shaders, shader.get()) != removed_shaders.end();
diff --git a/src/video_core/shader_cache.h b/src/video_core/shader_cache.h
index 136fe294c..8836bc8c6 100644
--- a/src/video_core/shader_cache.h
+++ b/src/video_core/shader_cache.h
@@ -4,7 +4,6 @@
#pragma once
-#include <algorithm>
#include <array>
#include <memory>
#include <mutex>
@@ -138,7 +137,7 @@ private:
/// @param removed_shaders Shaders to be removed from the storage
/// @pre invalidation_mutex is locked
/// @pre lookup_mutex is locked
- void RemoveShadersFromStorage(std::vector<ShaderInfo*> removed_shaders);
+ void RemoveShadersFromStorage(std::span<ShaderInfo*> removed_shaders);
/// @brief Creates a new entry in the lookup cache and returns its pointer
/// @pre lookup_mutex is locked