diff options
| author | Ameer J <52414509+ameerj@users.noreply.github.com> | 2021-07-04 13:20:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-04 13:20:40 -0400 |
| commit | 57dbb34afa9182b5be6daed7f0ed71aac457a3b5 (patch) | |
| tree | 55a2fe0e232aa29390326d6d57d1bf3c4cb1a7b4 /src/video_core/texture_cache/texture_cache.h | |
| parent | 4168a4d5716ccb538fc7bf1a8b2d5b00eaba3e83 (diff) | |
| parent | e30d18801da649dfdc1f42f5dcb12a6de453813c (diff) | |
Merge pull request #6553 from FernandoS27/bite-a-bat-change-the-world
TextureCache: Fix 1D to 2D overlapps.
Diffstat (limited to 'src/video_core/texture_cache/texture_cache.h')
| -rw-r--r-- | src/video_core/texture_cache/texture_cache.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index c7cfd02b6c..d8dbd38242 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -1057,9 +1057,6 @@ ImageId TextureCache<P>::JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, VA std::vector<ImageId> right_aliased_ids; std::vector<ImageId> bad_overlap_ids; ForEachImageInRegion(cpu_addr, size_bytes, [&](ImageId overlap_id, ImageBase& overlap) { - if (info.type != overlap.info.type) { - return; - } if (info.type == ImageType::Linear) { if (info.pitch == overlap.info.pitch && gpu_addr == overlap.gpu_addr) { // Alias linear images with the same pitch |