diff options
| author | Zephyron <zephyron@citron-emu.org> | 2025-02-09 18:22:36 +1000 |
|---|---|---|
| committer | Mike Lothian <mike@fireburn.co.uk> | 2025-05-11 16:25:13 +0100 |
| commit | fb8c9af17f0855351da3e605d139b2e6b0d0302f (patch) | |
| tree | 2ee232dc370a0021e7d17cdc28bc784d3c45b950 /src | |
| parent | d2a0de0cef7e49a83be0c1763f758709dc99d711 (diff) | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_texture_cache.cpp | 4 |
1 files 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 30e309d8d..d2644f031 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{ |