diff options
| author | 2022-04-01 17:19:55 +0200 | |
|---|---|---|
| committer | 2022-04-01 17:19:55 +0200 | |
| commit | 550844e5e8e52edfb88bffefc4663d64b9b49b88 (patch) | |
| tree | 9b861bfc6acb65fe52b03f974db80a0857d6a225 /src/video_core/texture_cache | |
| parent | Merge pull request #8079 from lat9nq/applet-typo (diff) | |
| parent | GPU Garbage Collection: Fix regressions. (diff) | |
| download | yuzu-550844e5e8e52edfb88bffefc4663d64b9b49b88.tar.gz yuzu-550844e5e8e52edfb88bffefc4663d64b9b49b88.tar.xz yuzu-550844e5e8e52edfb88bffefc4663d64b9b49b88.zip | |
Merge pull request #8128 from FernandoS27/gc-fixes
GPU Garbage Collection: Fix regressions.
Diffstat (limited to 'src/video_core/texture_cache')
| -rw-r--r-- | src/video_core/texture_cache/texture_cache.h | 2 |
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"); |