mirror of
https://git.citron-emu.org/Citron/Citron.git
synced 2025-03-15 05:34:49 +00:00
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.
This commit is contained in:
parent
dcf6f9a071
commit
b3c60b4cbe
1 changed files with 2 additions and 2 deletions
|
@ -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{
|
||||||
|
|
Loading…
Add table
Reference in a new issue