aboutsummaryrefslogtreecommitdiff
path: root/src/video_core/texture_cache/texture_cache.h
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-05-24 11:59:23 -0400
committerReinUsesLisp <reinuseslisp@airmail.cc>2019-06-20 21:38:33 -0300
commit92513541529e90f4f79a1f2c3f8ccf5a199e4c20 (patch)
treed686a78d8af4e41bf6a7c3fc2136e146b98f42e4 /src/video_core/texture_cache/texture_cache.h
parent0966665fc225eee29b3ed87baefd74f79c19d307 (diff)
texture_cache: Correct copying between compressed and uncompressed formats
Diffstat (limited to 'src/video_core/texture_cache/texture_cache.h')
-rw-r--r--src/video_core/texture_cache/texture_cache.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h
index 685bd28f4..d2093e581 100644
--- a/src/video_core/texture_cache/texture_cache.h
+++ b/src/video_core/texture_cache/texture_cache.h
@@ -444,11 +444,9 @@ private:
}
modified |= surface->IsModified();
// Now we got all the data set up
- const u32 dst_width{params.GetMipWidth(mipmap)};
- const u32 dst_height{params.GetMipHeight(mipmap)};
- const CopyParams copy_params(0, 0, 0, 0, 0, layer, 0, mipmap,
- std::min(src_params.width, dst_width),
- std::min(src_params.height, dst_height), 1);
+ const u32 width = SurfaceParams::IntersectWidth(src_params, params, 0, mipmap);
+ const u32 height = SurfaceParams::IntersectHeight(src_params, params, 0, mipmap);
+ const CopyParams copy_params(0, 0, 0, 0, 0, layer, 0, mipmap, width, height, 1);
passed_tests++;
ImageCopy(surface, new_surface, copy_params);
}