octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rasterizer_cache: Remove expanded surface immediately

Browse Source 
* Since allocations are recycled under the hood there's not risk of a texture being in use
This commit is contained in:
GPUCode
2023-02-15 21:54:33 +02:00
parent 234cfd25ed
commit 65d9ba7db5
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/video_core/rasterizer_cache/rasterizer_cache.h
View File

@ -11,6 +11,7 @@
#include "core/memory.h" #include "core/memory.h"
#include "video_core/pica_state.h" #include "video_core/pica_state.h"
#include "video_core/rasterizer_cache/rasterizer_cache_base.h" #include "video_core/rasterizer_cache/rasterizer_cache_base.h"
#include "video_core/rasterizer_cache/surface_base.h"
#include "video_core/video_core.h" #include "video_core/video_core.h"
namespace VideoCore { namespace VideoCore {
@ -495,10 +496,7 @@ auto RasterizerCache<T>::GetSurfaceSubRect(const SurfaceParams& params, ScaleMat
Surface new_surface = CreateSurface(new_params); Surface new_surface = CreateSurface(new_params);
DuplicateSurface(surface, new_surface); DuplicateSurface(surface, new_surface);
UnregisterSurface(surface);
// Delete the expanded surface, this can't be done safely yet
// because it may still be in use
remove_surfaces.push_back(surface);
surface = new_surface; surface = new_surface;
RegisterSurface(new_surface); RegisterSurface(new_surface);
@ -1127,18 +1125,7 @@ void RasterizerCache<T>::InvalidateRegion(PAddr addr, u32 size, const Surface& r
dirty_regions.erase(invalid_interval); dirty_regions.erase(invalid_interval);
} }
for (const auto& remove_surface : remove_surfaces) { for (Surface remove_surface : remove_surfaces) {
if (remove_surface == region_owner) {
Surface expanded_surface =
FindMatch<MatchFlags::SubRect>(*region_owner, ScaleMatch::Ignore);
ASSERT(expanded_surface);
if ((region_owner->invalid_regions - expanded_surface->invalid_regions).empty()) {
DuplicateSurface(region_owner, expanded_surface);
} else {
continue;
}
}
UnregisterSurface(remove_surface); UnregisterSurface(remove_surface);
} }
remove_surfaces.clear(); remove_surfaces.clear();

1
src/video_core/rasterizer_cache/rasterizer_cache_base.h
View File

@ -10,7 +10,6 @@
#include <boost/icl/interval_map.hpp> #include <boost/icl/interval_map.hpp>
#include <boost/range/iterator_range.hpp> #include <boost/range/iterator_range.hpp>
#include "video_core/rasterizer_cache/sampler_params.h" #include "video_core/rasterizer_cache/sampler_params.h"
#include "video_core/rasterizer_cache/surface_base.h"
#include "video_core/rasterizer_cache/surface_params.h" #include "video_core/rasterizer_cache/surface_params.h"
#include "video_core/rasterizer_cache/utils.h" #include "video_core/rasterizer_cache/utils.h"
#include "video_core/texture/texture_decode.h" #include "video_core/texture/texture_decode.h"