diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index cf0d33a45c..c885586e8f 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -221,7 +221,6 @@ void TextureCache
::UpdateRenderTargets(bool is_clear) { scale_rating = 0; bool any_rescaled = false; bool can_rescale = true; - bool any_blacklisted = false; const auto check_rescale = [&](ImageViewId view_id, ImageId& id_save) { if (view_id != NULL_IMAGE_VIEW_ID && view_id != ImageViewId{}) { const auto& view = slot_image_views[view_id]; @@ -229,7 +228,6 @@ void TextureCache
::UpdateRenderTargets(bool is_clear) {
id_save = image_id;
auto& image = slot_images[image_id];
can_rescale &= ImageCanRescale(image);
- any_blacklisted |= True(image.flags & ImageFlagBits::Blacklisted);
any_rescaled |= True(image.flags & ImageFlagBits::Rescaled) ||
GetFormatType(image.info.format) != SurfaceType::ColorTexture;
scale_rating = std::max ::UpdateRenderTargets(bool is_clear) {
}
} else {
rescaled = false;
- const auto scale_down = [this, any_blacklisted](ImageId image_id) {
+ const auto scale_down = [this](ImageId image_id) {
if (image_id != CORRUPT_ID) {
Image& image = slot_images[image_id];
ScaleDown(image);
- if (any_blacklisted) {
- image.flags |= ImageFlagBits::Blacklisted;
- }
}
};
for (size_t index = 0; index < NUM_RT; ++index) {
scale_down(tmp_color_images[index]);
}
scale_down(tmp_depth_image);
- scale_rating = 0;
+ scale_rating = 1;
}
} while (has_deleted_images);
// Rescale End
@@ -352,7 +347,10 @@ void TextureCache ::FillImageViews(DescriptorTable ::FindImage(const ImageInfo& info, GPUVAddr gpu_addr,
return image_id;
}
-template ::BlackListImage(ImageId image_id) {
- auto& image = slot_images[image_id];
- if (True(image.flags & ImageFlagBits::Blacklisted)) {
- return false;
- }
- image.flags |= ImageFlagBits::Blacklisted;
- ScaleDown(image);
- return true;
-}
-
template ::ImageCanRescale(ImageBase& image) {
- if (!image.info.rescaleable || True(image.flags & ImageFlagBits::Blacklisted)) {
+ if (!image.info.rescaleable) {
return false;
}
if (Settings::values.resolution_info.downscale && !image.info.downscaleable) {
diff --git a/src/video_core/texture_cache/texture_cache_base.h b/src/video_core/texture_cache/texture_cache_base.h
index e210393ba1..4f876b2f41 100644
--- a/src/video_core/texture_cache/texture_cache_base.h
+++ b/src/video_core/texture_cache/texture_cache_base.h
@@ -166,8 +166,6 @@ public:
[[nodiscard]] bool IsRescaling(const ImageViewBase& image_view) const noexcept;
- [[nodiscard]] bool BlackListImage(ImageId image_id);
-
std::mutex mutex;
private: