From 234cfd25ed6acd330ef16f18137e1de20a9f80f5 Mon Sep 17 00:00:00 2001
From: GPUCode <geoster3d@gmail.com>
Date: Wed, 15 Feb 2023 21:24:34 +0200
Subject: [PATCH] rasterizer_cache: Explicit type in traits

---
 src/video_core/rasterizer_cache/rasterizer_cache.h      | 6 +++---
 src/video_core/rasterizer_cache/rasterizer_cache_base.h | 8 ++++----
 src/video_core/renderer_opengl/gl_texture_runtime.h     | 8 ++++----
 src/video_core/renderer_vulkan/vk_texture_runtime.h     | 8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/video_core/rasterizer_cache/rasterizer_cache.h b/src/video_core/rasterizer_cache/rasterizer_cache.h
index f5993e0cb..246b3534a 100644
--- a/src/video_core/rasterizer_cache/rasterizer_cache.h
+++ b/src/video_core/rasterizer_cache/rasterizer_cache.h
@@ -25,7 +25,7 @@ inline auto RangeFromInterval(auto& map, const auto& interval) {
 }
 
 template <class T>
-RasterizerCache<T>::RasterizerCache(Memory::MemorySystem& memory_, TextureRuntime& runtime_)
+RasterizerCache<T>::RasterizerCache(Memory::MemorySystem& memory_, Runtime& runtime_)
     : memory{memory_}, runtime{runtime_}, resolution_scale_factor{
                                               VideoCore::GetResolutionScaleFactor()} {
     using TextureConfig = Pica::TexturingRegs::TextureConfig;
@@ -198,7 +198,7 @@ bool RasterizerCache<T>::AccelerateFill(const GPU::Regs::MemoryFillConfig& confi
     params.type = SurfaceType::Fill;
     params.res_scale = std::numeric_limits<u16>::max();
 
-    Surface fill_surface = std::make_shared<typename T::SurfaceType>(params, runtime);
+    Surface fill_surface = std::make_shared<typename T::Surface>(params, runtime);
 
     std::memcpy(&fill_surface->fill_data[0], &config.value_32bit, 4);
     if (config.fill_32bit) {
@@ -1146,7 +1146,7 @@ void RasterizerCache<T>::InvalidateRegion(PAddr addr, u32 size, const Surface& r
 
 template <class T>
 auto RasterizerCache<T>::CreateSurface(SurfaceParams& params) -> Surface {
-    Surface surface = std::make_shared<typename T::SurfaceType>(params, runtime);
+    Surface surface = std::make_shared<typename T::Surface>(params, runtime);
     surface->invalid_regions.insert(surface->GetInterval());
     return surface;
 }
diff --git a/src/video_core/rasterizer_cache/rasterizer_cache_base.h b/src/video_core/rasterizer_cache/rasterizer_cache_base.h
index d3b39bece..c4acfeae8 100644
--- a/src/video_core/rasterizer_cache/rasterizer_cache_base.h
+++ b/src/video_core/rasterizer_cache/rasterizer_cache_base.h
@@ -44,8 +44,8 @@ class RasterizerCache : NonCopyable {
     /// Address shift for caching surfaces into a hash table
     static constexpr u64 CITRA_PAGEBITS = 18;
 
-    using TextureRuntime = typename T::RuntimeType;
-    using Surface = std::shared_ptr<typename T::SurfaceType>;
+    using Runtime = typename T::Runtime;
+    using Surface = std::shared_ptr<typename T::Surface>;
     using Sampler = typename T::Sampler;
     using Framebuffer = typename T::Framebuffer;
 
@@ -58,7 +58,7 @@ class RasterizerCache : NonCopyable {
     using PageMap = boost::icl::interval_map<u32, int>;
 
 public:
-    RasterizerCache(Memory::MemorySystem& memory, TextureRuntime& runtime);
+    RasterizerCache(Memory::MemorySystem& memory, Runtime& runtime);
     ~RasterizerCache();
 
     /// Perform hardware accelerated texture copy according to the provided configuration
@@ -184,7 +184,7 @@ private:
 
 private:
     Memory::MemorySystem& memory;
-    TextureRuntime& runtime;
+    Runtime& runtime;
     PageMap cached_pages;
     SurfaceMap dirty_regions;
     std::vector<Surface> remove_surfaces;
diff --git a/src/video_core/renderer_opengl/gl_texture_runtime.h b/src/video_core/renderer_opengl/gl_texture_runtime.h
index e4aa362eb..0e352d41d 100644
--- a/src/video_core/renderer_opengl/gl_texture_runtime.h
+++ b/src/video_core/renderer_opengl/gl_texture_runtime.h
@@ -179,10 +179,10 @@ private:
 };
 
 struct Traits {
-    using RuntimeType = TextureRuntime;
-    using SurfaceType = Surface;
-    using Sampler = Sampler;
-    using Framebuffer = Framebuffer;
+    using Runtime = OpenGL::TextureRuntime;
+    using Surface = OpenGL::Surface;
+    using Sampler = OpenGL::Sampler;
+    using Framebuffer = OpenGL::Framebuffer;
 };
 
 using RasterizerCache = VideoCore::RasterizerCache<Traits>;
diff --git a/src/video_core/renderer_vulkan/vk_texture_runtime.h b/src/video_core/renderer_vulkan/vk_texture_runtime.h
index 191def652..1e7d62066 100644
--- a/src/video_core/renderer_vulkan/vk_texture_runtime.h
+++ b/src/video_core/renderer_vulkan/vk_texture_runtime.h
@@ -299,10 +299,10 @@ private:
 };
 
 struct Traits {
-    using RuntimeType = TextureRuntime;
-    using SurfaceType = Surface;
-    using Sampler = Sampler;
-    using Framebuffer = Framebuffer;
+    using Runtime = Vulkan::TextureRuntime;
+    using Surface = Vulkan::Surface;
+    using Sampler = Vulkan::Sampler;
+    using Framebuffer = Vulkan::Framebuffer;
 };
 
 using RasterizerCache = VideoCore::RasterizerCache<Traits>;