early-access version 3451

2023-03-12 04:52:03 +01:00
parent c6d18cc49a
commit 1d9cd8d5e7
122 changed files with 2394 additions and 2500 deletions
--- a/src/video_core/texture_cache/util.cpp
+++ b/src/video_core/texture_cache/util.cpp
@@ -1075,6 +1075,9 @@ 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;