dahjah/yuzu
1
0
Fork 0
mirror of https://codeberg.org/yuzu-emu/yuzu.git synced 2025-12-16 12:09:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vulkan: Rename resolve_image to resolve_image_holder

Browse Source 
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.
This commit is contained in:
Zephyron 2025-02-09 18:22:36 +10:00 committed by Mike Lothian
parent d2a0de0cef
commit fb8c9af17f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/video_core/renderer_vulkan/vk_texture_cache.cpp
View File

@ -1490,10 +1490,10 @@ void TextureCacheRuntime::CopyImageMSAA(Image& dst, Image& src, std::span<const
.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED, .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.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) { copies, aspect_mask](vk::CommandBuffer cmdbuf) {
for (const auto& copy : copies) { for (const auto& copy : copies) {
const VkExtent3D extent{ const VkExtent3D extent{