From a657cf53a15b79e2852a4c0eccfae1d781343f17 Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Sun, 28 Nov 2021 01:00:11 +0100 Subject: [PATCH] early-access version 2249 --- README.md | 2 +- src/video_core/texture_cache/texture_cache.h | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 0fd38d153..808ba9280 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 2248. +This is the source code for early-access 2249. ## Legal Notice diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 756b6135e..cdc8891fc 100755 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -725,11 +725,7 @@ ImageViewId TextureCache

::CreateImageView(const TICEntry& config) { } const u32 layer_offset = config.BaseLayer() * info.layer_stride; const GPUVAddr image_gpu_addr = config.Address() - layer_offset; - ImageId image_id{}; - do { - has_deleted_images = false; - image_id = FindOrInsertImage(info, image_gpu_addr); - } while (has_deleted_images); + const ImageId image_id = FindOrInsertImage(info, image_gpu_addr); if (!image_id) { return NULL_IMAGE_VIEW_ID; } @@ -1204,10 +1200,11 @@ ImageViewId TextureCache

::FindRenderTargetView(const ImageInfo& info, GPUVAdd bool is_clear) { const auto options = is_clear ? RelaxedOptions::Samples : RelaxedOptions{}; ImageId image_id{}; + bool delete_state = false; do { - has_deleted_images = false; + delete_state = has_deleted_images; image_id = FindOrInsertImage(info, gpu_addr, options); - } while (has_deleted_images); + } while (delete_state != has_deleted_images); if (!image_id) { return NULL_IMAGE_VIEW_ID; }