summaryrefslogtreecommitdiffstats
path: root/src/video_core/texture_cache
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2019-06-29 22:29:39 +0200
committerReinUsesLisp <reinuseslisp@airmail.cc>2019-06-29 22:29:39 +0200
commit3f3c3ca5f96fd5742524703f20b531338fa2e5f7 (patch)
tree8d1cbe2d6c6c565cd239aaddf7bb5f97b4aba09f /src/video_core/texture_cache
parenttexture_cache: Correct variable naming. (diff)
downloadyuzu-3f3c3ca5f96fd5742524703f20b531338fa2e5f7.tar
yuzu-3f3c3ca5f96fd5742524703f20b531338fa2e5f7.tar.gz
yuzu-3f3c3ca5f96fd5742524703f20b531338fa2e5f7.tar.bz2
yuzu-3f3c3ca5f96fd5742524703f20b531338fa2e5f7.tar.lz
yuzu-3f3c3ca5f96fd5742524703f20b531338fa2e5f7.tar.xz
yuzu-3f3c3ca5f96fd5742524703f20b531338fa2e5f7.tar.zst
yuzu-3f3c3ca5f96fd5742524703f20b531338fa2e5f7.zip
Diffstat (limited to 'src/video_core/texture_cache')
-rw-r--r--src/video_core/texture_cache/surface_base.h2
-rw-r--r--src/video_core/texture_cache/texture_cache.h21
2 files changed, 12 insertions, 11 deletions
diff --git a/src/video_core/texture_cache/surface_base.h b/src/video_core/texture_cache/surface_base.h
index d632630ce..eaed6545d 100644
--- a/src/video_core/texture_cache/surface_base.h
+++ b/src/video_core/texture_cache/surface_base.h
@@ -294,8 +294,8 @@ protected:
virtual TView CreateView(const ViewParams& view_key) = 0;
- std::unordered_map<ViewParams, TView> views;
TView main_view;
+ std::unordered_map<ViewParams, TView> views;
private:
TView GetView(const ViewParams& key) {
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h
index b5b0e91ef..9436a5ff2 100644
--- a/src/video_core/texture_cache/texture_cache.h
+++ b/src/video_core/texture_cache/texture_cache.h
@@ -79,10 +79,9 @@ public:
if (surfaces.empty()) {
return;
}
- std::sort(surfaces.begin(), surfaces.end(),
- [](const TSurface& a, const TSurface& b) -> bool {
- return a->GetModificationTick() < b->GetModificationTick();
- });
+ std::sort(surfaces.begin(), surfaces.end(), [](const TSurface& a, const TSurface& b) {
+ return a->GetModificationTick() < b->GetModificationTick();
+ });
for (const auto& surface : surfaces) {
FlushSurface(surface);
}
@@ -181,13 +180,15 @@ public:
}
void MarkColorBufferInUse(std::size_t index) {
- if (render_targets[index].target)
- render_targets[index].target->MarkAsModified(true, Tick());
+ if (auto& render_target = render_targets[index].target) {
+ render_target->MarkAsModified(true, Tick());
+ }
}
void MarkDepthBufferInUse() {
- if (depth_buffer.target)
+ if (depth_buffer.target) {
depth_buffer.target->MarkAsModified(true, Tick());
+ }
}
void SetEmptyDepthBuffer() {
@@ -245,11 +246,11 @@ protected:
}
SetEmptyDepthBuffer();
staging_cache.SetSize(2);
- auto make_siblings = ([this](PixelFormat a, PixelFormat b) {
+ const auto make_siblings = [this](PixelFormat a, PixelFormat b) {
siblings_table[a] = b;
siblings_table[b] = a;
- });
- const u32 max_formats = static_cast<u32>(PixelFormat::Max);
+ };
+ const auto max_formats = static_cast<u32>(PixelFormat::Max);
siblings_table.reserve(max_formats);
for (u32 i = 0; i < max_formats; i++) {
siblings_table[static_cast<PixelFormat>(i)] = PixelFormat::Invalid;