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

rasterizer_cache: Move microprofile to the top

Browse Source
This commit is contained in:
GPUCode
2023-02-13 21:42:56 +02:00
parent 9662425337
commit 274f6093f3
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,15 @@
namespace VideoCore { 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 <class T> template <class T>
RasterizerCache<T>::RasterizerCache(Memory::MemorySystem& memory_, TextureRuntime& runtime_) RasterizerCache<T>::RasterizerCache(Memory::MemorySystem& memory_, TextureRuntime& runtime_)
: memory{memory_}, runtime{runtime_}, resolution_scale_factor{ : memory{memory_}, runtime{runtime_}, resolution_scale_factor{
@ -154,7 +163,6 @@ auto RasterizerCache<T>::FindMatch(const SurfaceParams& params, ScaleMatch match
return match_surface; return match_surface;
} }
MICROPROFILE_DECLARE(RasterizerCache_BlitSurface);
template <class T> template <class T>
bool RasterizerCache<T>::BlitSurfaces(const Surface& src_surface, Common::Rectangle<u32> src_rect, bool RasterizerCache<T>::BlitSurfaces(const Surface& src_surface, Common::Rectangle<u32> src_rect,
const Surface& dst_surface, Common::Rectangle<u32> dst_rect) { const Surface& dst_surface, Common::Rectangle<u32> dst_rect) {
@ -194,7 +202,6 @@ bool RasterizerCache<T>::BlitSurfaces(const Surface& src_surface, Common::Rectan
} }
} }
MICROPROFILE_DECLARE(RasterizerCache_CopySurface);
template <class T> template <class T>
void RasterizerCache<T>::CopySurface(const Surface& src_surface, const Surface& dst_surface, void RasterizerCache<T>::CopySurface(const Surface& src_surface, const Surface& dst_surface,
SurfaceInterval copy_interval) { SurfaceInterval copy_interval) {
@ -767,7 +774,6 @@ void RasterizerCache<T>::ValidateSurface(const Surface& surface, PAddr addr, u32
} }
} }
MICROPROFILE_DECLARE(RasterizerCache_SurfaceLoad);
template <class T> template <class T>
void RasterizerCache<T>::UploadSurface(const Surface& surface, SurfaceInterval interval) { void RasterizerCache<T>::UploadSurface(const Surface& surface, SurfaceInterval interval) {
const SurfaceParams load_info = surface->FromInterval(interval); const SurfaceParams load_info = surface->FromInterval(interval);
@ -796,7 +802,6 @@ void RasterizerCache<T>::UploadSurface(const Surface& surface, SurfaceInterval i
surface->Upload(upload, staging); surface->Upload(upload, staging);
} }
MICROPROFILE_DECLARE(RasterizerCache_SurfaceFlush);
template <class T> template <class T>
void RasterizerCache<T>::DownloadSurface(const Surface& surface, SurfaceInterval interval) { void RasterizerCache<T>::DownloadSurface(const Surface& surface, SurfaceInterval interval) {
const SurfaceParams flush_info = surface->FromInterval(interval); const SurfaceParams flush_info = surface->FromInterval(interval);

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

@ -20,10 +20,6 @@ class MemorySystem;
namespace VideoCore { namespace VideoCore {
inline auto RangeFromInterval(auto& map, const auto& interval) {
return boost::make_iterator_range(map.equal_range(interval));
}
enum class ScaleMatch { enum class ScaleMatch {
Exact, ///< Only accept same res scale Exact, ///< Only accept same res scale
Upscale, ///< Only allow higher scale than params Upscale, ///< Only allow higher scale than params