early-access version 3452

This commit is contained in:
pineappleEA
2023-03-13 03:21:42 +01:00
parent 1d9cd8d5e7
commit 5e818ba7dd
5 changed files with 68 additions and 36 deletions

View File

@@ -1306,6 +1306,7 @@ ImageId TextureCache<P>::JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, VA
auto copies = MakeShrinkImageCopies(new_info, overlap.info, base, up_scale, down_shift);
if (overlap.info.num_samples != new_image.info.num_samples) {
runtime.CopyImageMSAA(new_image, overlap, std::move(copies));
continue;
} else {
runtime.CopyImage(new_image, overlap, std::move(copies));
}

View File

@@ -1075,9 +1075,6 @@ std::optional<OverlapResult> ResolveOverlap(const ImageInfo& new_info, GPUVAddr
return std::nullopt;
}
if (gpu_addr == overlap.gpu_addr) {
if (new_info.num_samples != overlap.info.num_samples) {
return std::nullopt;
}
const std::optional solution = ResolveOverlapEqualAddress(new_info, overlap, strict_size);
if (!solution) {
return std::nullopt;