ShuriZma
/
suyu
mirror of https://git.suyu.dev/suyu/suyu
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7824 from lioncash/scache 

video_core/shader_cache: Take std::span in RemoveShadersFromStorage()
This commit is contained in:
Morph 2022-02-01 01:58:38 -05:00 committed by GitHub
parent c81793029d 360a97ab54
commit 26a9dc3f65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/video_core/shader_cache.cpp
View File

@ -170,7 +170,7 @@ void ShaderCache::RemovePendingShaders() {
marked_for_removal.clear(); marked_for_removal.clear();
if (!removed_shaders.empty()) { 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); 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 // Remove them from the cache
std::erase_if(storage, [&removed_shaders](const std::unique_ptr<ShaderInfo>& shader) { std::erase_if(storage, [&removed_shaders](const std::unique_ptr<ShaderInfo>& shader) {
return std::ranges::find(removed_shaders, shader.get()) != removed_shaders.end(); return std::ranges::find(removed_shaders, shader.get()) != removed_shaders.end();

3
src/video_core/shader_cache.h
View File

@ -4,7 +4,6 @@
#pragma once #pragma once
#include <algorithm>
#include <array> #include <array>
#include <memory> #include <memory>
#include <mutex> #include <mutex>
@ -138,7 +137,7 @@ private:
/// @param removed_shaders Shaders to be removed from the storage /// @param removed_shaders Shaders to be removed from the storage
/// @pre invalidation_mutex is locked /// @pre invalidation_mutex is locked
/// @pre lookup_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 /// @brief Creates a new entry in the lookup cache and returns its pointer
/// @pre lookup_mutex is locked /// @pre lookup_mutex is locked