summaryrefslogtreecommitdiff
path: root/src/video_core/texture_cache
diff options
context:
space:
mode:
authorGravatar Fernando Sahmkow2022-04-01 01:32:41 +0200
committerGravatar Fernando Sahmkow2022-04-01 01:36:24 +0200
commite9e671d101d6ca5e0dc19b13e3aba95af65dd5cc (patch)
tree0bd69b24309bffd7b8a708b876762b43d0524485 /src/video_core/texture_cache
parentMerge pull request #8116 from ameerj/nvhost_ctrl_bad_param (diff)
downloadyuzu-e9e671d101d6ca5e0dc19b13e3aba95af65dd5cc.tar.gz
yuzu-e9e671d101d6ca5e0dc19b13e3aba95af65dd5cc.tar.xz
yuzu-e9e671d101d6ca5e0dc19b13e3aba95af65dd5cc.zip
GPU Garbage Collection: Fix regressions.
Diffstat (limited to 'src/video_core/texture_cache')
-rw-r--r--src/video_core/texture_cache/texture_cache.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h
index efc1c4525..8fef74117 100644
--- a/src/video_core/texture_cache/texture_cache.h
+++ b/src/video_core/texture_cache/texture_cache.h
@@ -1080,8 +1080,6 @@ ImageId TextureCache<P>::JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, VA
1080 Image& overlap = slot_images[overlap_id]; 1080 Image& overlap = slot_images[overlap_id];
1081 if (True(overlap.flags & ImageFlagBits::GpuModified)) { 1081 if (True(overlap.flags & ImageFlagBits::GpuModified)) {
1082 new_image.flags |= ImageFlagBits::GpuModified; 1082 new_image.flags |= ImageFlagBits::GpuModified;
1083 new_image.modification_tick =
1084 std::max(overlap.modification_tick, new_image.modification_tick);
1085 } 1083 }
1086 if (overlap.info.num_samples != new_image.info.num_samples) { 1084 if (overlap.info.num_samples != new_image.info.num_samples) {
1087 LOG_WARNING(HW_GPU, "Copying between images with different samples is not implemented"); 1085 LOG_WARNING(HW_GPU, "Copying between images with different samples is not implemented");