diff --git a/src/video_core/rasterizer_cache/rasterizer_cache.h b/src/video_core/rasterizer_cache/rasterizer_cache.h index 113680187..842b4010c 100644 --- a/src/video_core/rasterizer_cache/rasterizer_cache.h +++ b/src/video_core/rasterizer_cache/rasterizer_cache.h @@ -15,6 +15,15 @@ namespace VideoCore { +MICROPROFILE_DECLARE(RasterizerCache_BlitSurface); +MICROPROFILE_DECLARE(RasterizerCache_CopySurface); +MICROPROFILE_DECLARE(RasterizerCache_SurfaceLoad); +MICROPROFILE_DECLARE(RasterizerCache_SurfaceFlush); + +inline auto RangeFromInterval(auto& map, const auto& interval) { + return boost::make_iterator_range(map.equal_range(interval)); +} + template RasterizerCache::RasterizerCache(Memory::MemorySystem& memory_, TextureRuntime& runtime_) : memory{memory_}, runtime{runtime_}, resolution_scale_factor{ @@ -154,7 +163,6 @@ auto RasterizerCache::FindMatch(const SurfaceParams& params, ScaleMatch match return match_surface; } -MICROPROFILE_DECLARE(RasterizerCache_BlitSurface); template bool RasterizerCache::BlitSurfaces(const Surface& src_surface, Common::Rectangle src_rect, const Surface& dst_surface, Common::Rectangle dst_rect) { @@ -194,7 +202,6 @@ bool RasterizerCache::BlitSurfaces(const Surface& src_surface, Common::Rectan } } -MICROPROFILE_DECLARE(RasterizerCache_CopySurface); template void RasterizerCache::CopySurface(const Surface& src_surface, const Surface& dst_surface, SurfaceInterval copy_interval) { @@ -767,7 +774,6 @@ void RasterizerCache::ValidateSurface(const Surface& surface, PAddr addr, u32 } } -MICROPROFILE_DECLARE(RasterizerCache_SurfaceLoad); template void RasterizerCache::UploadSurface(const Surface& surface, SurfaceInterval interval) { const SurfaceParams load_info = surface->FromInterval(interval); @@ -796,7 +802,6 @@ void RasterizerCache::UploadSurface(const Surface& surface, SurfaceInterval i surface->Upload(upload, staging); } -MICROPROFILE_DECLARE(RasterizerCache_SurfaceFlush); template void RasterizerCache::DownloadSurface(const Surface& surface, SurfaceInterval interval) { const SurfaceParams flush_info = surface->FromInterval(interval); diff --git a/src/video_core/rasterizer_cache/rasterizer_cache_base.h b/src/video_core/rasterizer_cache/rasterizer_cache_base.h index a05b3b271..b140a2a72 100644 --- a/src/video_core/rasterizer_cache/rasterizer_cache_base.h +++ b/src/video_core/rasterizer_cache/rasterizer_cache_base.h @@ -20,10 +20,6 @@ class MemorySystem; namespace VideoCore { -inline auto RangeFromInterval(auto& map, const auto& interval) { - return boost::make_iterator_range(map.equal_range(interval)); -} - enum class ScaleMatch { Exact, ///< Only accept same res scale Upscale, ///< Only allow higher scale than params