From 7fd9b4b057c1aa38067be1c983bb06002108480a Mon Sep 17 00:00:00 2001 From: psucien Date: Sun, 24 Nov 2024 16:41:12 +0100 Subject: [PATCH] remove `virtual` flag leftover --- src/video_core/renderer_vulkan/vk_rasterizer.cpp | 1 - src/video_core/texture_cache/image.cpp | 5 ----- src/video_core/texture_cache/image.h | 1 - src/video_core/texture_cache/image_info.h | 1 - 4 files changed, 8 deletions(-) diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index ba605831f..98e41fea7 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -558,7 +558,6 @@ void Rasterizer::BindTextures(const Shader::Info& stage, Shader::Backend::Bindin std::tuple{tsharp, image_desc}); image_id = texture_cache.FindImage(desc); auto& image = texture_cache.GetImage(image_id); - ASSERT(False(image.flags & VideoCore::ImageFlagBits::Virtual)); if (image.binding.is_bound) { // The image is already bound. In case if it is about to be used as storage we need // to force general layout on it. diff --git a/src/video_core/texture_cache/image.cpp b/src/video_core/texture_cache/image.cpp index a17c353d1..dc43036c6 100644 --- a/src/video_core/texture_cache/image.cpp +++ b/src/video_core/texture_cache/image.cpp @@ -146,11 +146,6 @@ Image::Image(const Vulkan::Instance& instance_, Vulkan::Scheduler& scheduler_, : instance{&instance_}, scheduler{&scheduler_}, info{info_}, image{instance->GetDevice(), instance->GetAllocator()}, cpu_addr{info.guest_address}, cpu_addr_end{cpu_addr + info.guest_size_bytes} { - if (info.props.is_virtual) { - flags |= ImageFlagBits::Virtual; - return; - } - mip_hashes.resize(info.resources.levels); ASSERT(info.pixel_format != vk::Format::eUndefined); // Here we force `eExtendedUsage` as don't know all image usage cases beforehand. In normal case diff --git a/src/video_core/texture_cache/image.h b/src/video_core/texture_cache/image.h index a9e6f45f3..8d84277d8 100644 --- a/src/video_core/texture_cache/image.h +++ b/src/video_core/texture_cache/image.h @@ -22,7 +22,6 @@ VK_DEFINE_HANDLE(VmaAllocator) namespace VideoCore { enum ImageFlagBits : u32 { - Virtual = 1 << 0, ///< Image doesn't have Vk object representation and used only for tracking CpuDirty = 1 << 1, ///< Contents have been modified from the CPU GpuDirty = 1 << 2, ///< Contents have been modified from the GPU (valid data in buffer cache) Dirty = CpuDirty | GpuDirty, diff --git a/src/video_core/texture_cache/image_info.h b/src/video_core/texture_cache/image_info.h index d052e13a9..e12ae3be1 100644 --- a/src/video_core/texture_cache/image_info.h +++ b/src/video_core/texture_cache/image_info.h @@ -66,7 +66,6 @@ struct ImageInfo { u32 is_tiled : 1; u32 is_pow2 : 1; u32 is_block : 1; - u32 is_virtual : 1; } props{}; // Surface properties with impact on various calculation factors vk::Format pixel_format = vk::Format::eUndefined;