summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fernando Sahmkow2021-07-03 14:01:54 +0200
committerGravatar Fernando Sahmkow2021-07-03 14:01:54 +0200
commitebaa7e391c9631e92ff290318ffd58d808b76f87 (patch)
tree87b90af48e66ef2221673dada4ca930631d2621c
parentMerge pull request #6498 from Kelebek1/Audio (diff)
downloadyuzu-ebaa7e391c9631e92ff290318ffd58d808b76f87.tar.gz
yuzu-ebaa7e391c9631e92ff290318ffd58d808b76f87.tar.xz
yuzu-ebaa7e391c9631e92ff290318ffd58d808b76f87.zip
TextureCache: Fix 1D to 2D overlapps.
Diffstat (limited to '')
-rw-r--r--src/video_core/texture_cache/texture_cache.h3
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