From 6e1db6b7038329a9716763c8bdf14cc5b578fec1 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Sat, 29 Jun 2019 20:47:46 -0300
Subject: [PATCH] texture_cache: Pack sibling queries inside a method

---
 src/video_core/texture_cache/texture_cache.h | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h
index 8edae3d97d..c9e72531a5 100644
--- a/src/video_core/texture_cache/texture_cache.h
+++ b/src/video_core/texture_cache/texture_cache.h
@@ -421,8 +421,7 @@ private:
         const auto& cr_params = current_surface->GetSurfaceParams();
         TSurface new_surface;
         if (cr_params.pixel_format != params.pixel_format && !is_render &&
-            siblings_table[static_cast<std::size_t>(cr_params.pixel_format)] ==
-                params.pixel_format) {
+            GetSiblingFormat(cr_params.pixel_format) == params.pixel_format) {
             SurfaceParams new_params = params;
             new_params.pixel_format = cr_params.pixel_format;
             new_params.component_type = cr_params.component_type;
@@ -459,17 +458,16 @@ private:
                                                      const SurfaceParams& params, bool is_render) {
         const bool is_mirage = !current_surface->MatchFormat(params.pixel_format);
         const bool matches_target = current_surface->MatchTarget(params.target);
-        const auto match_check = ([&]() -> std::pair<TSurface, TView> {
+        const auto match_check = [&]() -> std::pair<TSurface, TView> {
             if (matches_target) {
                 return {current_surface, current_surface->GetMainView()};
             }
             return {current_surface, current_surface->EmplaceOverview(params)};
-        });
+        };
         if (!is_mirage) {
             return match_check();
         }
-        if (!is_render && siblings_table[static_cast<std::size_t>(current_surface->GetFormat())] ==
-                              params.pixel_format) {
+        if (!is_render && GetSiblingFormat(current_surface->GetFormat()) == params.pixel_format) {
             return match_check();
         }
         return RebuildSurface(current_surface, params, is_render);
@@ -766,6 +764,10 @@ private:
         return {};
     }
 
+    constexpr PixelFormat GetSiblingFormat(PixelFormat format) const {
+        return siblings_table[static_cast<std::size_t>(format)];
+    }
+
     struct FramebufferTargetInfo {
         TSurface target;
         TView view;