diff options
| author |  Ameer J | 2021-07-04 13:20:40 -0400 |
|---|---|---|
| committer |  GitHub | 2021-07-04 13:20:40 -0400 |
| commit | eb0e10cff2496fbf91362aa1e399b1d0b9a1d808 (patch) | |
| tree | 55a2fe0e232aa29390326d6d57d1bf3c4cb1a7b4 /src/video_core/texture_cache | |
| parent | Merge pull request #6498 from Kelebek1/Audio (diff) | |
| parent | TextureCacheOGL: Implement Image Copies for 1D and 1D Array. (diff) | |
| download | yuzu-eb0e10cff2496fbf91362aa1e399b1d0b9a1d808.tar.gz yuzu-eb0e10cff2496fbf91362aa1e399b1d0b9a1d808.tar.xz yuzu-eb0e10cff2496fbf91362aa1e399b1d0b9a1d808.zip | |
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')
| -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 c7cfd02b6..d8dbd3824 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 | |||
| 1057 | std::vector<ImageId> right_aliased_ids; | 1057 | std::vector<ImageId> right_aliased_ids; |
| 1058 | std::vector<ImageId> bad_overlap_ids; | 1058 | std::vector<ImageId> bad_overlap_ids; |
| 1059 | ForEachImageInRegion(cpu_addr, size_bytes, [&](ImageId overlap_id, ImageBase& overlap) { | 1059 | ForEachImageInRegion(cpu_addr, size_bytes, [&](ImageId overlap_id, ImageBase& overlap) { |
| 1060 | if (info.type != overlap.info.type) { | ||
| 1061 | return; | ||
| 1062 | } | ||
| 1063 | if (info.type == ImageType::Linear) { | 1060 | if (info.type == ImageType::Linear) { |
| 1064 | if (info.pitch == overlap.info.pitch && gpu_addr == overlap.gpu_addr) { | 1061 | if (info.pitch == overlap.info.pitch && gpu_addr == overlap.gpu_addr) { |
| 1065 | // Alias linear images with the same pitch | 1062 | // Alias linear images with the same pitch |