Merge pull request #5133 from lioncash/video-shadow2

video_core: Resolve more variable shadowing scenarios pt.2

1 files changed, 7 insertions, 5 deletions

diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.h b/src/video_core/renderer_vulkan/vk_rasterizer.h
index 237e51fa4..1789fb285 100644
--- a/src/video_core/renderer_vulkan/vk_rasterizer.h
+++ b/src/video_core/renderer_vulkan/vk_rasterizer.h
@@ -160,6 +160,9 @@ private:
         bool is_indexed = 0;
     };
 
+    using ColorAttachments = std::array<View, Maxwell::NumRenderTargets>;
+    using ZetaAttachment = View;
+
     using Texceptions = std::bitset<Maxwell::NumRenderTargets + 1>;
 
     static constexpr std::size_t ZETA_TEXCEPTION_INDEX = 8;
@@ -181,9 +184,8 @@ private:
     /// Setup descriptors in the graphics pipeline.
     void SetupShaderDescriptors(const std::array<Shader*, Maxwell::MaxShaderProgram>& shaders);
 
-    void SetupImageTransitions(Texceptions texceptions,
-                               const std::array<View, Maxwell::NumRenderTargets>& color_attachments,
-                               const View& zeta_attachment);
+    void SetupImageTransitions(Texceptions texceptions, const ColorAttachments& color,
+                               const ZetaAttachment& zeta);
 
     void UpdateDynamicStates();
 
@@ -308,8 +310,8 @@ private:
     vk::Event wfi_event;
     VideoCommon::Shader::AsyncShaders async_shaders;
 
-    std::array<View, Maxwell::NumRenderTargets> color_attachments;
-    View zeta_attachment;
+    ColorAttachments color_attachments;
+    ZetaAttachment zeta_attachment;
 
     std::vector<ImageView> sampled_views;
     std::vector<ImageView> image_views;