summaryrefslogtreecommitdiffstats
path: root/src/video_core/texture_cache
diff options
context:
space:
mode:
authorAmeer J <52414509+ameerj@users.noreply.github.com>2021-07-04 19:20:40 +0200
committerGitHub <noreply@github.com>2021-07-04 19:20:40 +0200
commiteb0e10cff2496fbf91362aa1e399b1d0b9a1d808 (patch)
tree55a2fe0e232aa29390326d6d57d1bf3c4cb1a7b4 /src/video_core/texture_cache
parentMerge pull request #6498 from Kelebek1/Audio (diff)
parentTextureCacheOGL: Implement Image Copies for 1D and 1D Array. (diff)
downloadyuzu-eb0e10cff2496fbf91362aa1e399b1d0b9a1d808.tar
yuzu-eb0e10cff2496fbf91362aa1e399b1d0b9a1d808.tar.gz
yuzu-eb0e10cff2496fbf91362aa1e399b1d0b9a1d808.tar.bz2
yuzu-eb0e10cff2496fbf91362aa1e399b1d0b9a1d808.tar.lz
yuzu-eb0e10cff2496fbf91362aa1e399b1d0b9a1d808.tar.xz
yuzu-eb0e10cff2496fbf91362aa1e399b1d0b9a1d808.tar.zst
yuzu-eb0e10cff2496fbf91362aa1e399b1d0b9a1d808.zip
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
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