diff --git a/rpcs3/Emu/RSX/Common/surface_store.h b/rpcs3/Emu/RSX/Common/surface_store.h
index e76321afc8..f91fc10556 100644
--- a/rpcs3/Emu/RSX/Common/surface_store.h
+++ b/rpcs3/Emu/RSX/Common/surface_store.h
@@ -202,6 +202,18 @@ namespace rsx
 			}
 		}
 
+		constexpr u32 get_aa_factor_v(surface_antialiasing aa_mode)
+		{
+			switch (aa_mode)
+			{
+			case surface_antialiasing::center_1_sample:
+			case surface_antialiasing::diagonal_centered_2_samples:
+				return 1;
+			default:
+				return 2;
+			};
+		}
+
 	public:
 		using surface_storage_type = typename Traits::surface_storage_type;
 		using surface_type = typename Traits::surface_type;
@@ -324,6 +336,7 @@ namespace rsx
 			command_list_type command_list,
 			u32 address,
 			surface_color_format color_format,
+			surface_antialiasing antialias,
 			size_t width, size_t height, size_t pitch,
 			Args&&... extra_params)
 		{
@@ -362,7 +375,8 @@ namespace rsx
 			}
 
 			// Range test
-			rsx::address_range range = rsx::address_range::start_length(address, u32(pitch * height));
+			const auto aa_factor_v = get_aa_factor_v(antialias);
+			rsx::address_range range = rsx::address_range::start_length(address, u32(pitch * height * aa_factor_v));
 			m_render_targets_memory_range = range.get_min_max(m_render_targets_memory_range);
 
 			// Select source of original data if any
@@ -416,6 +430,7 @@ namespace rsx
 			command_list_type command_list,
 			u32 address,
 			surface_depth_format depth_format,
+			surface_antialiasing antialias,
 			size_t width, size_t height, size_t pitch,
 			Args&&... extra_params)
 		{
@@ -452,7 +467,8 @@ namespace rsx
 			}
 
 			// Range test
-			rsx::address_range range = rsx::address_range::start_length(address, u32(pitch * height));
+			const auto aa_factor_v = get_aa_factor_v(antialias);
+			rsx::address_range range = rsx::address_range::start_length(address, u32(pitch * height * aa_factor_v));
 			m_depth_stencil_memory_range = range.get_min_max(m_depth_stencil_memory_range);
 
 			// Select source of original data if any
@@ -510,7 +526,9 @@ namespace rsx
 			surface_color_format color_format, surface_depth_format depth_format,
 			u32 clip_horizontal_reg, u32 clip_vertical_reg,
 			surface_target set_surface_target,
+			surface_antialiasing antialias,
 			const std::array<u32, 4> &surface_addresses, u32 address_z,
+			const std::array<u32, 4> &surface_pitch, u32 zeta_pitch,
 			Args&&... extra_params)
 		{
 			u32 clip_width = clip_horizontal_reg;
@@ -535,9 +553,9 @@ namespace rsx
 				if (surface_addresses[surface_index] == 0)
 					continue;
 
-				const auto pitch = clip_width * 4; // TODO
 				m_bound_render_targets[surface_index] = std::make_tuple(surface_addresses[surface_index],
-					bind_address_as_render_targets(command_list, surface_addresses[surface_index], color_format, clip_width, clip_height, pitch, std::forward<Args>(extra_params)...));
+					bind_address_as_render_targets(command_list, surface_addresses[surface_index], color_format, antialias,
+						clip_width, clip_height, surface_pitch[surface_index], std::forward<Args>(extra_params)...));
 			}
 
 			// Same for depth buffer
@@ -549,10 +567,9 @@ namespace rsx
 			if (!address_z)
 				return;
 
-			// TODO
-			const auto pitch = (depth_format == rsx::surface_depth_format::z16) ? clip_width * 2 : clip_width * 4;
 			m_bound_depth_stencil = std::make_tuple(address_z,
-				bind_address_as_depth_stencil(command_list, address_z, depth_format, clip_width, clip_height, pitch, std::forward<Args>(extra_params)...));
+				bind_address_as_depth_stencil(command_list, address_z, depth_format, antialias,
+					clip_width, clip_height, zeta_pitch, std::forward<Args>(extra_params)...));
 		}
 
 		/**
diff --git a/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp b/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp
index 847e6f82cf..e89caeb9d6 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp
+++ b/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp
@@ -1,4 +1,4 @@
-#ifdef _MSC_VER
+#ifdef _MSC_VER
 #include "stdafx.h"
 #include "stdafx_d3d12.h"
 #include "D3D12RenderTargetSets.h"
@@ -177,21 +177,18 @@ void D3D12GSRender::prepare_render_targets(ID3D12GraphicsCommandList *copycmdlis
 		rsx::method_registers.clear_color_a() / 255.f,
 	};
 
-	u32 clip_width = rsx::method_registers.surface_clip_width();
-	u32 clip_height = rsx::method_registers.surface_clip_height();
-
-	if (clip_height == 0 || clip_width == 0)
+	const auto layout = get_framebuffer_layout(rsx::framebuffer_creation_context::context_draw);
+	if (!framebuffer_status_valid)
 		return;
 
 	m_rtts.prepare_render_target(copycmdlist,
-		rsx::method_registers.surface_color(), rsx::method_registers.surface_depth_fmt(),
-		clip_width, clip_height,
-		rsx::method_registers.surface_color_target(),
-		get_color_surface_addresses(), get_zeta_surface_address(),
+		layout.color_format, layout.depth_format,
+		layout.width, layout.height,
+		layout.target, layout.aa_mode,
+		layout.color_addresses, layout.zeta_address,
+		layout.actual_color_pitch, layout.actual_zeta_pitch,
 		m_device.Get(), clear_color, 1.f, 0);
 
-	framebuffer_status_valid = true;
-
 	// write descriptors
 	DXGI_FORMAT dxgi_format = get_color_surface_format(rsx::method_registers.surface_color());
 	D3D12_RENDER_TARGET_VIEW_DESC rtt_view_desc = {};
diff --git a/rpcs3/Emu/RSX/GL/GLRenderTargets.cpp b/rpcs3/Emu/RSX/GL/GLRenderTargets.cpp
index 23b371bd40..c3ae4f6415 100644
--- a/rpcs3/Emu/RSX/GL/GLRenderTargets.cpp
+++ b/rpcs3/Emu/RSX/GL/GLRenderTargets.cpp
@@ -215,8 +215,12 @@ void GLGSRender::init_buffers(rsx::framebuffer_creation_context context, bool sk
 		return;
 	}
 
-	m_rtts.prepare_render_target(nullptr, layout.color_format, layout.depth_format, layout.width, layout.height,
-		layout.target, layout.color_addresses, layout.zeta_address);
+	m_rtts.prepare_render_target(nullptr,
+		layout.color_format, layout.depth_format,
+		layout.width, layout.height,
+		layout.target, layout.aa_mode,
+		layout.color_addresses, layout.zeta_address,
+		layout.actual_color_pitch, layout.actual_zeta_pitch);
 
 	bool old_format_found = false;
 	gl::texture::format old_format;
diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp
index de18f08098..0712b06a7e 100644
--- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp
+++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp
@@ -2893,8 +2893,9 @@ void VKGSRender::prepare_rtts(rsx::framebuffer_creation_context context)
 	m_rtts.prepare_render_target(&*m_current_command_buffer,
 		layout.color_format, layout.depth_format,
 		layout.width, layout.height,
-		layout.target,
+		layout.target, layout.aa_mode,
 		layout.color_addresses, layout.zeta_address,
+		layout.actual_color_pitch, layout.actual_zeta_pitch,
 		(*m_device), &*m_current_command_buffer);
 
 	// Reset framebuffer information