diff --git a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp
index 9027bc21d5..f6751b085f 100644
--- a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp
+++ b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp
@@ -45,7 +45,7 @@ D3DTexture2D* &FramebufferManager::GetResolvedEFBDepthTexture()
 	if (g_ActiveConfig.iMultisampleMode)
 	{
 		for (int i = 0; i < m_efb.slices; i++)
-			D3D::context->ResolveSubresource(m_efb.resolved_depth_tex->GetTex(), D3D11CalcSubresource(0, i, 1), m_efb.depth_tex->GetTex(), D3D11CalcSubresource(0, i, 1), DXGI_FORMAT_R8G8B8A8_UNORM);
+			D3D::context->ResolveSubresource(m_efb.resolved_depth_tex->GetTex(), D3D11CalcSubresource(0, i, 1), m_efb.depth_tex->GetTex(), D3D11CalcSubresource(0, i, 1), DXGI_FORMAT_R24_UNORM_X8_TYPELESS);
 		return m_efb.resolved_depth_tex;
 	}
 	else
diff --git a/Source/Core/VideoCommon/TextureConversionShader.cpp b/Source/Core/VideoCommon/TextureConversionShader.cpp
index 87e222c37f..99559db08b 100644
--- a/Source/Core/VideoCommon/TextureConversionShader.cpp
+++ b/Source/Core/VideoCommon/TextureConversionShader.cpp
@@ -78,7 +78,7 @@ static void WriteSwizzler(char*& p, u32 format, API_TYPE ApiType)
 	else // D3D
 	{
 		WRITE(p, "sampler samp0 : register(s0);\n");
-		WRITE(p, "Texture2D Tex0 : register(t0);\n");
+		WRITE(p, "Texture2DArray Tex0 : register(t0);\n");
 
 		WRITE(p, "void main(\n");
 		WRITE(p, "  out float4 ocol0 : SV_Target, in float4 rawpos : SV_Position)\n");
@@ -126,7 +126,7 @@ static void WriteSampleColor(char*& p, const char* colorComp, const char* dest,
 	}
 	else
 	{
-		WRITE(p, "  %s = Tex0.Sample(samp0, uv0 + float2(%d, 0) * sample_offset).%s;\n",
+		WRITE(p, "  %s = Tex0.Sample(samp0, float3(uv0 + float2(%d, 0) * sample_offset, 0.0)).%s;\n",
 			dest, xoffset, colorComp
 			);
 	}