From ea68f787eb6b8054805502a8b4aabae08ae59d94 Mon Sep 17 00:00:00 2001
From: Exzap <13877693+Exzap@users.noreply.github.com>
Date: Fri, 8 Mar 2024 14:41:01 +0100
Subject: [PATCH] Vulkan: For MSAA surface copies make the target MSAA too

Fixes #1108
---
 src/Cafe/HW/Latte/Core/LatteSurfaceCopy.cpp | 2 +-
 src/Cafe/HW/Latte/ISA/LatteReg.h            | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Cafe/HW/Latte/Core/LatteSurfaceCopy.cpp b/src/Cafe/HW/Latte/Core/LatteSurfaceCopy.cpp
index 4f5b24ad..45be6843 100644
--- a/src/Cafe/HW/Latte/Core/LatteSurfaceCopy.cpp
+++ b/src/Cafe/HW/Latte/Core/LatteSurfaceCopy.cpp
@@ -37,7 +37,7 @@ void LatteSurfaceCopy_copySurfaceNew(MPTR srcPhysAddr, MPTR srcMipAddr, uint32 s
 	if (!destinationTexture)
 	{
 		LatteTexture* renderTargetConf = nullptr;
-		destinationView = LatteTexture_CreateMapping(dstPhysAddr, dstMipAddr, dstWidth, dstHeight, dstDepth, dstPitch, dstTilemode, dstSwizzle, dstLevel, 1, dstSlice, 1, dstSurfaceFormat, dstDim, Latte::E_DIM::DIM_2D, false);
+		destinationView = LatteTexture_CreateMapping(dstPhysAddr, dstMipAddr, dstWidth, dstHeight, dstDepth, dstPitch, dstTilemode, dstSwizzle, dstLevel, 1, dstSlice, 1, dstSurfaceFormat, dstDim, Latte::IsMSAA(dstDim) ? Latte::E_DIM::DIM_2D_MSAA : Latte::E_DIM::DIM_2D, false);
 		destinationTexture = destinationView->baseTexture;
 	}
 	// copy texture
diff --git a/src/Cafe/HW/Latte/ISA/LatteReg.h b/src/Cafe/HW/Latte/ISA/LatteReg.h
index d571dc6e..d1a2a028 100644
--- a/src/Cafe/HW/Latte/ISA/LatteReg.h
+++ b/src/Cafe/HW/Latte/ISA/LatteReg.h
@@ -345,6 +345,11 @@ namespace Latte
 		return IsCompressedFormat((Latte::E_HWSURFFMT)((uint32)format & 0x3F));
 	}
 
+	inline bool IsMSAA(Latte::E_DIM dim)
+	{
+		return dim == E_DIM::DIM_2D_MSAA || dim == E_DIM::DIM_2D_ARRAY_MSAA;
+	}
+
 	enum GPU_LIMITS
 	{
 		NUM_VERTEX_BUFFERS = 16,