diff options
author | bunnei <bunneidev@gmail.com> | 2019-03-22 02:41:14 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2019-03-22 02:56:56 +0100 |
commit | d0dddb3e9d79c423a72144b66e290e170cd29432 (patch) | |
tree | 900b609da5e97a99ade548832d717a1c3ea86885 | |
parent | Merge pull request #2275 from lioncash/memflags (diff) | |
download | yuzu-d0dddb3e9d79c423a72144b66e290e170cd29432.tar yuzu-d0dddb3e9d79c423a72144b66e290e170cd29432.tar.gz yuzu-d0dddb3e9d79c423a72144b66e290e170cd29432.tar.bz2 yuzu-d0dddb3e9d79c423a72144b66e290e170cd29432.tar.lz yuzu-d0dddb3e9d79c423a72144b66e290e170cd29432.tar.xz yuzu-d0dddb3e9d79c423a72144b66e290e170cd29432.tar.zst yuzu-d0dddb3e9d79c423a72144b66e290e170cd29432.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/rasterizer_cache.h | 4 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 8 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer_cache.h | 8 |
3 files changed, 12 insertions, 8 deletions
diff --git a/src/video_core/rasterizer_cache.h b/src/video_core/rasterizer_cache.h index ecd9986a0..9fc9f3056 100644 --- a/src/video_core/rasterizer_cache.h +++ b/src/video_core/rasterizer_cache.h @@ -132,7 +132,7 @@ protected: } /// Register an object into the cache - void Register(const T& object) { + virtual void Register(const T& object) { std::lock_guard<std::recursive_mutex> lock{mutex}; object->SetIsRegistered(true); @@ -142,7 +142,7 @@ protected: } /// Unregisters an object from the cache - void Unregister(const T& object) { + virtual void Unregister(const T& object) { std::lock_guard<std::recursive_mutex> lock{mutex}; object->SetIsRegistered(false); diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index 57329cd61..7bd0daa57 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp @@ -941,7 +941,7 @@ Surface RasterizerCacheOpenGL::GetSurface(const SurfaceParams& params, bool pres // If surface parameters changed and we care about keeping the previous data, recreate // the surface from the old one Surface new_surface{RecreateSurface(surface, params)}; - UnregisterSurface(surface); + Unregister(surface); Register(new_surface); if (new_surface->IsUploaded()) { RegisterReinterpretSurface(new_surface); @@ -949,7 +949,7 @@ Surface RasterizerCacheOpenGL::GetSurface(const SurfaceParams& params, bool pres return new_surface; } else { // Delete the old surface before creating a new one to prevent collisions. - UnregisterSurface(surface); + Unregister(surface); } } @@ -1304,12 +1304,12 @@ static bool IsReinterpretInvalidSecond(const Surface render_surface, bool RasterizerCacheOpenGL::PartialReinterpretSurface(Surface triggering_surface, Surface intersect) { if (IsReinterpretInvalid(triggering_surface, intersect)) { - UnregisterSurface(intersect); + Unregister(intersect); return false; } if (!LayerFitReinterpretSurface(*this, triggering_surface, intersect)) { if (IsReinterpretInvalidSecond(triggering_surface, intersect)) { - UnregisterSurface(intersect); + Unregister(intersect); return false; } FlushObject(intersect); diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.h b/src/video_core/renderer_opengl/gl_rasterizer_cache.h index 9366f47f2..c919dd29b 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.h +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.h @@ -533,13 +533,17 @@ private: return nullptr; } + void Register(const Surface& object) { + RasterizerCache<Surface>::Register(object); + } + /// Unregisters an object from the cache - void UnregisterSurface(const Surface& object) { + void Unregister(const Surface& object) { if (object->IsReinterpreted()) { auto interval = GetReinterpretInterval(object); reinterpreted_surfaces.erase(interval); } - Unregister(object); + RasterizerCache<Surface>::Unregister(object); } }; |