From b3c60b4cbe88d76a9999d25b1e742dbcd4992b53 Mon Sep 17 00:00:00 2001
From: Zephyron <zephyron@citron-emu.org>
Date: Sun, 9 Feb 2025 18:22:36 +1000
Subject: [PATCH] vulkan: Rename resolve_image to resolve_image_holder

Fix Android compilation with latest NDK (28.0.13004108) and Java JDK 21 by
renaming the resolve_image variable to resolve_image_holder to avoid potential
naming conflicts. This change helps maintain compatibility with the updated
build toolchain while keeping the core functionality intact.

The change affects the MSAA image copy operation in the Vulkan texture cache
implementation.
---
 src/video_core/renderer_vulkan/vk_texture_cache.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp
index 70b50e69d..bcccb0af8 100644
--- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp
@@ -1490,10 +1490,10 @@ void TextureCacheRuntime::CopyImageMSAA(Image& dst, Image& src, std::span<const
         .initialLayout = VK_IMAGE_LAYOUT_UNDEFINED,
     };
 
-    const auto resolve_image = memory_allocator.CreateImage(resolve_ci);
+    const auto resolve_image_holder = memory_allocator.CreateImage(resolve_ci);
 
     scheduler.RequestOutsideRenderPassOperationContext();
-    scheduler.Record([src_image, dst_image, resolve_image = *resolve_image,
+    scheduler.Record([src_image, dst_image, resolve_image = *resolve_image_holder,
                      copies, aspect_mask](vk::CommandBuffer cmdbuf) {
         for (const auto& copy : copies) {
             const VkExtent3D extent{