From b17b4ab787f315d5464022fca1e9d0a015f906e9 Mon Sep 17 00:00:00 2001 From: psucien Date: Fri, 7 Jun 2024 00:12:15 +0200 Subject: [PATCH] texture_cache: detiler: redundant flag removed --- src/video_core/texture_cache/image.cpp | 1 - src/video_core/texture_cache/image_view.h | 1 - src/video_core/texture_cache/texture_cache.cpp | 6 +++--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/video_core/texture_cache/image.cpp b/src/video_core/texture_cache/image.cpp index 99475124..e9f96257 100644 --- a/src/video_core/texture_cache/image.cpp +++ b/src/video_core/texture_cache/image.cpp @@ -186,7 +186,6 @@ Image::Image(const Vulkan::Instance& instance_, Vulkan::Scheduler& scheduler_, if (info.is_tiled) { ImageViewInfo view_info; view_info.format = DemoteImageFormatForDetiling(info.pixel_format); - view_info.used_for_detiling = true; view_for_detiler.emplace(*instance, view_info, image); } diff --git a/src/video_core/texture_cache/image_view.h b/src/video_core/texture_cache/image_view.h index aa4ec8ee..ae1f9ba0 100644 --- a/src/video_core/texture_cache/image_view.h +++ b/src/video_core/texture_cache/image_view.h @@ -24,7 +24,6 @@ struct ImageViewInfo { vk::Format format = vk::Format::eR8G8B8A8Unorm; SubresourceRange range; vk::ComponentMapping mapping{}; - bool used_for_detiling = false; auto operator<=>(const ImageViewInfo&) const = default; }; diff --git a/src/video_core/texture_cache/texture_cache.cpp b/src/video_core/texture_cache/texture_cache.cpp index 998723c0..f0c437f3 100644 --- a/src/video_core/texture_cache/texture_cache.cpp +++ b/src/video_core/texture_cache/texture_cache.cpp @@ -146,10 +146,10 @@ ImageView& TextureCache::RegisterImageView(Image& image, const ImageViewInfo& vi } // All tiled images are created with storage usage flag. This makes set of formats (e.g. sRGB) - // impossible to use. However, during view creation, if an image isn't used as storage and not a - // target for the detiler, we can temporary remove its storage bit. + // impossible to use. However, during view creation, if an image isn't used as storage we can + // temporary remove its storage bit. std::optional usage_override; - if (!image.info.is_storage && !view_info.used_for_detiling) { + if (!image.info.is_storage) { usage_override = image.info.usage & ~vk::ImageUsageFlagBits::eStorage; }