sadfs

README.md

@@ -36,10 +36,10 @@ _Note: Recommended GPU is based on 3x Internal, ~1080p resolution requirements.
 
 ### Technical Notes
 
--   You need the [Visual C++ 2019 x64 Redistributables](https://support.microsoft.com/en-us/help/2977003/) to run PCSX2 on Windows.
+-   You need the [Visual C++ 2019 x64 Redistributables](https://support.microsoft.com/en-us/help/2977003/) to run PCSX2.
 -   Windows XP and Direct3D9 support was dropped after stable release 1.4.0.
 -   Windows 7, Windows 8.0, and Windows 8.1 support was dropped after stable release 1.6.0.
--   32-bit and wxWidgets support was dropped after stable release 1.6.0, with the wxWidgets code being removed completely on 25th December 2022.
+-   32-bit and wxwidgets support was dropped after stable release 1.6.0, with the wxwidgets code being removed completely on 25th December 2022.
 -   Make sure to update your operating system and drivers to ensure you have the best experience possible. Having a newer GPU is also recommended so you have the latest supported drivers.
 -   Because of copyright issues, and the complexity of trying to work around it, you need a BIOS dump extracted from a legitimately-owned PS2 console to use the emulator. For more information about the BIOS and how to get it from your console, visit [this page](pcsx2/Docs/PCSX2_FAQ.md#question-13-where-do-i-get-a-ps2-bios).
 -   PCSX2 uses two CPU cores for emulation by default. A third core can be used via the MTVU speed hack, which is compatible with most games. This can be a significant speedup on CPUs with 3+ cores, but it may be a slowdown on GS-limited games (or on CPUs with fewer than 2 cores). Software renderers will then additionally use however many rendering threads it is set to and will need higher core counts to run efficiently.

bin/resources/game_controller_db.txt

@@ -992,7 +992,6 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000005e040000130b000011050000,Xbox One Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
 030000005e040000200b000011050000,Xbox One Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
 030000005e040000200b000013050000,Xbox One Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
-030000005e040000200b000015050000,Xbox One Controller,a:b0,b:b1,x:b3,y:b4,back:b10,guide:b12,start:b11,leftstick:b13,rightstick:b14,leftshoulder:b6,rightshoulder:b7,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a5,righttrigger:a4,platform:Mac OS X,
 030000005e040000d102000000000000,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
 030000005e040000dd02000000000000,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
 030000005e040000e002000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Mac OS X,
@@ -1273,7 +1272,6 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000030000000300000002000000,Miroof,a:b1,b:b0,back:b6,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b3,y:b2,platform:Linux,
 050000004d4f435554452d3035335800,Mocute 053X,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
 050000004d4f435554452d3035305800,Mocute 054X,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
-05000000e80400006e0400001b010000,Mocute 053X M59,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 05000000d6200000e589000001000000,Moga 2,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Linux,
 05000000d6200000ad0d000001000000,Moga Pro,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Linux,
 05000000d62000007162000001000000,Moga Pro 2,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Linux,

bin/resources/shaders/dx11/tfx.fx

@@ -38,6 +38,7 @@
 #define PS_POINT_SAMPLER 0
 #define PS_SHUFFLE 0
 #define PS_READ_BA 0
+#define PS_SWAP_GA 0
 #define PS_DFMT 0
 #define PS_DEPTH_FMT 0
 #define PS_PAL_FMT 0
@@ -875,28 +876,37 @@ PS_OUTPUT ps_main(PS_INPUT input)
 
 	if (PS_SHUFFLE)
 	{
-		uint4 denorm_c = uint4(C);
-		uint2 denorm_TA = uint2(float2(TA.xy) * 255.0f + 0.5f);
-
-		// Mask will take care of the correct destination
-		if (PS_READ_BA)
-			C.rb = C.bb;
-		else
-			C.rb = C.rr;
-
-		if (PS_READ_BA)
+		if(PS_SWAP_GA)
 		{
-			if (denorm_c.a & 0x80u)
-				C.ga = (float2)(float((denorm_c.a & 0x7Fu) | (denorm_TA.y & 0x80u)));
-			else
-				C.ga = (float2)(float((denorm_c.a & 0x7Fu) | (denorm_TA.x & 0x80u)));
+			float4 RT = trunc(RtTexture.Load(int3(input.p.xy, 0)) * 255.0f + 0.1f);
+			C.a = C.g;
+			C.g = C.a;
 		}
 		else
 		{
-			if (denorm_c.g & 0x80u)
-				C.ga = (float2)(float((denorm_c.g & 0x7Fu) | (denorm_TA.y & 0x80u)));
+			uint4 denorm_c = uint4(C);
+			uint2 denorm_TA = uint2(float2(TA.xy) * 255.0f + 0.5f);
+
+			// Mask will take care of the correct destination
+			if (PS_READ_BA)
+				C.rb = C.bb;
 			else
-				C.ga = (float2)(float((denorm_c.g & 0x7Fu) | (denorm_TA.x & 0x80u)));
+				C.rb = C.rr;
+
+			if (PS_READ_BA)
+			{
+				if (denorm_c.a & 0x80u)
+					C.ga = (float2)(float((denorm_c.a & 0x7Fu) | (denorm_TA.y & 0x80u)));
+				else
+					C.ga = (float2)(float((denorm_c.a & 0x7Fu) | (denorm_TA.x & 0x80u)));
+			}
+			else
+			{
+				if (denorm_c.g & 0x80u)
+					C.ga = (float2)(float((denorm_c.g & 0x7Fu) | (denorm_TA.y & 0x80u)));
+				else
+					C.ga = (float2)(float((denorm_c.g & 0x7Fu) | (denorm_TA.x & 0x80u)));
+			}
 		}
 	}
 

bin/resources/shaders/vulkan/tfx.glsl

@@ -347,6 +347,7 @@ void main()
 #define PS_ZCLAMP 0
 #define PS_FEEDBACK_LOOP 0
 #define PS_TEX_IS_FB 0
+#define PS_SWAP_GA 0
 #endif
 
 #define SW_BLEND (PS_BLEND_A || PS_BLEND_B || PS_BLEND_D)
@@ -1173,26 +1174,32 @@ void main()
 	vec4 C = ps_color();
 
 	#if PS_SHUFFLE
-		uvec4 denorm_c = uvec4(C);
-		uvec2 denorm_TA = uvec2(vec2(TA.xy) * 255.0f + 0.5f);
-
-		// Mask will take care of the correct destination
-		#if PS_READ_BA
-			C.rb = C.bb;
+		#if PS_SWAP_GA
+			vec4 RT = trunc(subpassLoad(RtSampler) * 255.0f + 0.1f);
+			C.a = RT.g;
+			C.g = RT.a;
 		#else
-			C.rb = C.rr;
-		#endif
+			uvec4 denorm_c = uvec4(C);
+			uvec2 denorm_TA = uvec2(vec2(TA.xy) * 255.0f + 0.5f);
 
-		#if PS_READ_BA
-			if ((denorm_c.a & 0x80u) != 0u)
-				C.ga = vec2(float((denorm_c.a & 0x7Fu) | (denorm_TA.y & 0x80u)));
-			else
-				C.ga = vec2(float((denorm_c.a & 0x7Fu) | (denorm_TA.x & 0x80u)));
-		#else
-			if ((denorm_c.g & 0x80u) != 0u)
-				C.ga = vec2(float((denorm_c.g & 0x7Fu) | (denorm_TA.y & 0x80u)));
-			else
-				C.ga = vec2(float((denorm_c.g & 0x7Fu) | (denorm_TA.x & 0x80u)));
+			// Mask will take care of the correct destination
+			#if PS_READ_BA
+				C.rb = C.bb;
+			#else
+				C.rb = C.rr;
+			#endif
+
+			#if PS_READ_BA
+				if ((denorm_c.a & 0x80u) != 0u)
+					C.ga = vec2(float((denorm_c.a & 0x7Fu) | (denorm_TA.y & 0x80u)));
+				else
+					C.ga = vec2(float((denorm_c.a & 0x7Fu) | (denorm_TA.x & 0x80u)));
+			#else
+				if ((denorm_c.g & 0x80u) != 0u)
+					C.ga = vec2(float((denorm_c.g & 0x7Fu) | (denorm_TA.y & 0x80u)));
+				else
+					C.ga = vec2(float((denorm_c.g & 0x7Fu) | (denorm_TA.x & 0x80u)));
+			#endif
 		#endif
 	#endif
 

cmake/Pcsx2Utils.cmake

@@ -10,9 +10,8 @@ function(detectOperatingSystem)
 	if(WIN32)
 		set(Windows TRUE PARENT_SCOPE)
 	elseif(UNIX AND APPLE)
-		if(IOS)
-			message(WARNING "iOS isn't supported, the build will most likely fail")
-		endif()
+		# No easy way to filter out iOS.
+		message(WARNING "OS X/iOS isn't supported, the build will most likely fail")
 		set(MacOSX TRUE PARENT_SCOPE)
 	elseif(UNIX)
 		if(CMAKE_SYSTEM_NAME MATCHES "Linux")

common/D3D12/Context.cpp

@@ -445,7 +445,7 @@ ID3D12GraphicsCommandList4* Context::GetInitCommandList()
 	return res.command_lists[0].get();
 }
 
-bool Context::ExecuteCommandList(WaitType wait_for_completion)
+void Context::ExecuteCommandList(WaitType wait_for_completion)
 {
 	CommandListResources& res = m_command_lists[m_current_command_list];
 	HRESULT hr;
@@ -463,21 +463,12 @@ bool Context::ExecuteCommandList(WaitType wait_for_completion)
 	if (res.init_command_list_used)
 	{
 		hr = res.command_lists[0]->Close();
-		if (FAILED(hr))
-		{
-			Console.Error("Closing init command list failed with HRESULT %08X", hr);
-			return false;
-		}
+		pxAssertRel(SUCCEEDED(hr), "Close init command list");
 	}
 
 	// Close and queue command list.
 	hr = res.command_lists[1]->Close();
-	if (FAILED(hr))
-	{
-		Console.Error("Closing main command list failed with HRESULT %08X", hr);
-		return false;
-	}
-
+	pxAssertRel(SUCCEEDED(hr), "Close command list");
 	if (res.init_command_list_used)
 	{
 		const std::array<ID3D12CommandList*, 2> execute_lists{res.command_lists[0].get(), res.command_lists[1].get()};
@@ -496,8 +487,6 @@ bool Context::ExecuteCommandList(WaitType wait_for_completion)
 	MoveToNextCommandList();
 	if (wait_for_completion != WaitType::None)
 		WaitForFence(res.ready_fence_value, wait_for_completion == WaitType::Spin);
-
-	return true;
 }
 
 void Context::InvalidateSamplerGroups()

common/D3D12/Context.h

@@ -130,7 +130,7 @@ namespace D3D12
 		};
 
 		/// Executes the current command list.
-		bool ExecuteCommandList(WaitType wait_for_completion);
+		void ExecuteCommandList(WaitType wait_for_completion);
 
 		/// Waits for a specific fence.
 		void WaitForFence(u64 fence, bool spin);

common/GL/Context.cpp

@@ -119,7 +119,7 @@ namespace GL
 		if (!context)
 			return nullptr;
 
-		Console.WriteLn("Created an %s context", context->IsGLES() ? "OpenGL ES" : "OpenGL");
+		Console.WriteLn("Created a %s context", context->IsGLES() ? "OpenGL ES" : "OpenGL");
 
 		// NOTE: Not thread-safe. But this is okay, since we're not going to be creating more than one context at a time.
 		static Context* context_being_created;

common/Linux/LnxHostSys.cpp

@@ -100,8 +100,6 @@ static void SysPageFaultSignalFilter(int signal, siginfo_t* siginfo, void* ctx)
 
 #if defined(__APPLE__) && defined(__x86_64__)
 	void* const exception_pc = reinterpret_cast<void*>(static_cast<ucontext_t*>(ctx)->uc_mcontext->__ss.__rip);
-#elif defined(__FreeBSD__) && defined(__x86_64__)
-	void* const exception_pc = reinterpret_cast<void*>(static_cast<ucontext_t*>(ctx)->uc_mcontext.mc_rip);
 #elif defined(__x86_64__)
 	void* const exception_pc = reinterpret_cast<void*>(static_cast<ucontext_t*>(ctx)->uc_mcontext.gregs[REG_RIP]);
 #else

common/Vulkan/Context.cpp

@@ -1122,13 +1122,9 @@ namespace Vulkan
 	void Context::WaitForCommandBufferCompletion(u32 index)
 	{
 		// Wait for this command buffer to be completed.
-		const VkResult res = vkWaitForFences(m_device, 1, &m_frame_resources[index].fence, VK_TRUE, UINT64_MAX);
+		VkResult res = vkWaitForFences(m_device, 1, &m_frame_resources[index].fence, VK_TRUE, UINT64_MAX);
 		if (res != VK_SUCCESS)
-		{
 			LOG_VULKAN_ERROR(res, "vkWaitForFences failed: ");
-			m_last_submit_failed.store(true, std::memory_order_release);
-			return;
-		}
 
 		// Clean up any resources for command buffers between the last known completed buffer and this
 		// now-completed command buffer. If we use >2 buffers, this may be more than one buffer.
@@ -1270,12 +1266,11 @@ namespace Vulkan
 			submit_info.pSignalSemaphores = &m_spin_resources[index].semaphore;
 		}
 
-		const VkResult res = vkQueueSubmit(m_graphics_queue, 1, &submit_info, resources.fence);
+		VkResult res = vkQueueSubmit(m_graphics_queue, 1, &submit_info, resources.fence);
 		if (res != VK_SUCCESS)
 		{
 			LOG_VULKAN_ERROR(res, "vkQueueSubmit failed: ");
-			m_last_submit_failed.store(true, std::memory_order_release);
-			return;
+			pxFailRel("Failed to submit command buffer.");
 		}
 
 		if (spin_cycles != 0)
@@ -1291,14 +1286,14 @@ namespace Vulkan
 
 		present_swap_chain->ReleaseCurrentImage();
 
-		const VkResult res = vkQueuePresentKHR(m_present_queue, &present_info);
+		VkResult res = vkQueuePresentKHR(m_present_queue, &present_info);
 		if (res != VK_SUCCESS)
 		{
 			// VK_ERROR_OUT_OF_DATE_KHR is not fatal, just means we need to recreate our swap chain.
 			if (res != VK_ERROR_OUT_OF_DATE_KHR && res != VK_SUBOPTIMAL_KHR)
 				LOG_VULKAN_ERROR(res, "vkQueuePresentKHR failed: ");
 
-			m_last_present_failed.store(true, std::memory_order_release);
+			m_last_present_failed.store(true);
 			return;
 		}
 
@@ -1465,9 +1460,6 @@ namespace Vulkan
 
 	void Context::ExecuteCommandBuffer(WaitType wait_for_completion)
 	{
-		if (m_last_submit_failed.load(std::memory_order_acquire))
-			return;
-
 		// If we're waiting for completion, don't bother waking the worker thread.
 		const u32 current_frame = m_current_frame;
 		SubmitCommandBuffer();
@@ -1489,12 +1481,9 @@ namespace Vulkan
 
 	bool Context::CheckLastPresentFail()
 	{
-		return m_last_present_failed.exchange(false, std::memory_order_acq_rel);
-	}
-
-	bool Context::CheckLastSubmitFail()
-	{
-		return m_last_submit_failed.load(std::memory_order_acquire);
+		bool res = m_last_present_failed;
+		m_last_present_failed = false;
+		return res;
 	}
 
 	void Context::DeferBufferDestruction(VkBuffer object)
@@ -1607,7 +1596,7 @@ namespace Vulkan
 				VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT,
 			DebugMessengerCallback, nullptr};
 
-		const VkResult res =
+		VkResult res =
 			vkCreateDebugUtilsMessengerEXT(m_instance, &messenger_info, nullptr, &m_debug_messenger_callback);
 		if (res != VK_SUCCESS)
 		{
@@ -1699,7 +1688,7 @@ namespace Vulkan
 			subpass_dependency_ptr};
 
 		VkRenderPass pass;
-		const VkResult res = vkCreateRenderPass(m_device, &pass_info, nullptr, &pass);
+		VkResult res = vkCreateRenderPass(m_device, &pass_info, nullptr, &pass);
 		if (res != VK_SUCCESS)
 		{
 			LOG_VULKAN_ERROR(res, "vkCreateRenderPass failed: ");
@@ -1905,14 +1894,9 @@ void main()
 		SpinResources& resources = m_spin_resources[index];
 		if (!resources.in_progress)
 			return;
-
-		const VkResult res = vkWaitForFences(m_device, 1, &resources.fence, VK_TRUE, UINT64_MAX);
+		VkResult res = vkWaitForFences(m_device, 1, &resources.fence, VK_TRUE, UINT64_MAX);
 		if (res != VK_SUCCESS)
-		{
 			LOG_VULKAN_ERROR(res, "vkWaitForFences failed: ");
-			m_last_submit_failed.store(true, std::memory_order_release);
-			return;
-		}
 		SpinCommandCompleted(index);
 	}
 
@@ -1922,7 +1906,7 @@ void main()
 		resources.in_progress = false;
 		const u32 timestamp_base = (index + NUM_COMMAND_BUFFERS) * 2;
 		std::array<u64, 2> timestamps;
-		const VkResult res = vkGetQueryPoolResults(m_device, m_timestamp_query_pool, timestamp_base, static_cast<u32>(timestamps.size()),
+		VkResult res = vkGetQueryPoolResults(m_device, m_timestamp_query_pool, timestamp_base, static_cast<u32>(timestamps.size()),
 			sizeof(timestamps), timestamps.data(), sizeof(u64), VK_QUERY_RESULT_64_BIT);
 		if (res == VK_SUCCESS)
 		{
@@ -2030,7 +2014,7 @@ void main()
 		constexpr u64 MAX_MAX_DEVIATION = 100000; // 100µs
 		for (int i = 0; i < 4; i++) // 4 tries to get under MAX_MAX_DEVIATION
 		{
-			const VkResult res = vkGetCalibratedTimestampsEXT(m_device, std::size(infos), infos, timestamps, &maxDeviation);
+			VkResult res = vkGetCalibratedTimestampsEXT(m_device, std::size(infos), infos, timestamps, &maxDeviation);
 			if (res != VK_SUCCESS)
 			{
 				LOG_VULKAN_ERROR(res, "vkGetCalibratedTimestampsEXT failed: ");

common/Vulkan/Context.h

@@ -209,7 +209,6 @@ namespace Vulkan
 
 		// Was the last present submitted to the queue a failure? If so, we must recreate our swapchain.
 		bool CheckLastPresentFail();
-		bool CheckLastSubmitFail();
 
 		// Schedule a vulkan resource for destruction later on. This will occur when the command buffer
 		// is next re-used, and the GPU has finished working with the specified resource.
@@ -374,7 +373,6 @@ namespace Vulkan
 
 		StreamBuffer m_texture_upload_buffer;
 
-		std::atomic_bool m_last_submit_failed{false};
 		std::atomic_bool m_last_present_failed{false};
 		std::atomic_bool m_present_done{true};
 		std::mutex m_present_mutex;

pcsx2-gsrunner/Main.cpp

@@ -280,7 +280,7 @@ void Host::ReleaseHostDisplay(bool clear_state)
 	g_host_display.reset();
 }
 
-HostDisplay::PresentResult Host::BeginPresentFrame(bool frame_skip)
+bool Host::BeginPresentFrame(bool frame_skip)
 {
 	if (s_loop_number == 0)
 	{
@@ -291,15 +291,12 @@ HostDisplay::PresentResult Host::BeginPresentFrame(bool frame_skip)
 		std::string dump_path(fmt::format("{}_frame{}.png", s_output_prefix, s_dump_frame_number));
 		GSQueueSnapshot(dump_path);
 	}
+	if (g_host_display->BeginPresent(frame_skip))
+		return true;
 
-	const HostDisplay::PresentResult result = g_host_display->BeginPresent(frame_skip);
-	if (result != HostDisplay::PresentResult::OK)
-	{
-		// don't render imgui
-		ImGuiManager::SkipFrame();
-	}
-
-	return result;
+	// don't render imgui
+	ImGuiManager::NewFrame();
+	return false;
 }
 
 void Host::EndPresentFrame()

pcsx2-qt/CMakeLists.txt

@@ -58,7 +58,6 @@ target_sources(pcsx2-qt PRIVATE
 	Settings/ControllerGlobalSettingsWidget.ui
 	Settings/ControllerMacroEditWidget.ui
 	Settings/ControllerMacroWidget.ui
-	Settings/ControllerMouseSettingsDialog.ui
 	Settings/ControllerSettingsDialog.cpp
 	Settings/ControllerSettingsDialog.h
 	Settings/ControllerSettingsDialog.ui

pcsx2-qt/QtHost.cpp

@@ -967,17 +967,17 @@ void Host::ReleaseHostDisplay(bool clear_state)
 	g_emu_thread->releaseHostDisplay(clear_state);
 }
 
-HostDisplay::PresentResult Host::BeginPresentFrame(bool frame_skip)
+bool Host::BeginPresentFrame(bool frame_skip)
 {
-	const HostDisplay::PresentResult result = g_host_display->BeginPresent(frame_skip);
-	if (result != HostDisplay::PresentResult::OK)
+	if (!g_host_display->BeginPresent(frame_skip))
 	{
 		// if we're skipping a frame, we need to reset imgui's state, since
 		// we won't be calling EndPresentFrame().
-		ImGuiManager::SkipFrame();
+		ImGuiManager::NewFrame();
+		return false;
 	}
 
-	return result;
+	return true;
 }
 
 void Host::EndPresentFrame()

pcsx2-qt/Settings/ControllerGlobalSettingsWidget.cpp

@@ -45,10 +45,10 @@ ControllerGlobalSettingsWidget::ControllerGlobalSettingsWidget(QWidget* parent,
 #endif
 
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.enableMouseMapping, "UI", "EnableMouseMapping", false);
-	connect(m_ui.mouseSettings, &QToolButton::clicked, this, &ControllerGlobalSettingsWidget::mouseSettingsClicked);
-
 	ControllerSettingWidgetBinder::BindWidgetToInputProfileBool(sif, m_ui.multitapPort1, "Pad", "MultitapPort1", false);
 	ControllerSettingWidgetBinder::BindWidgetToInputProfileBool(sif, m_ui.multitapPort2, "Pad", "MultitapPort2", false);
+	ControllerSettingWidgetBinder::BindWidgetToInputProfileFloat(sif, m_ui.pointerXScale, "Pad", "PointerXScale", 8.0f);
+	ControllerSettingWidgetBinder::BindWidgetToInputProfileFloat(sif, m_ui.pointerYScale, "Pad", "PointerYScale", 8.0f);
 
 #ifdef _WIN32
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.enableXInputSource, "InputSources", "XInput", false);
@@ -81,6 +81,13 @@ ControllerGlobalSettingsWidget::ControllerGlobalSettingsWidget(QWidget* parent,
 	for (QCheckBox* cb : {m_ui.multitapPort1, m_ui.multitapPort2})
 		connect(cb, &QCheckBox::stateChanged, this, [this]() { emit bindingSetupChanged(); });
 
+	connect(m_ui.pointerXScale, &QSlider::valueChanged, this,
+		[this](int value) { m_ui.pointerXScaleLabel->setText(QStringLiteral("%1").arg(value)); });
+	connect(m_ui.pointerYScale, &QSlider::valueChanged, this,
+		[this](int value) { m_ui.pointerYScaleLabel->setText(QStringLiteral("%1").arg(value)); });
+	m_ui.pointerXScaleLabel->setText(QStringLiteral("%1").arg(m_ui.pointerXScale->value()));
+	m_ui.pointerYScaleLabel->setText(QStringLiteral("%1").arg(m_ui.pointerYScale->value()));
+
 	updateSDLOptionsEnabled();
 }
 
@@ -121,12 +128,6 @@ void ControllerGlobalSettingsWidget::ledSettingsClicked()
 	dialog.exec();
 }
 
-void ControllerGlobalSettingsWidget::mouseSettingsClicked()
-{
-	ControllerMouseSettingsDialog dialog(this, m_dialog);
-	dialog.exec();
-}
-
 ControllerLEDSettingsDialog::ControllerLEDSettingsDialog(QWidget* parent, ControllerSettingsDialog* dialog)
 	: QDialog(parent)
 	, m_dialog(dialog)
@@ -155,35 +156,3 @@ void ControllerLEDSettingsDialog::linkButton(ColorPickerButton* button, u32 play
 	});
 #endif
 }
-
-ControllerMouseSettingsDialog::ControllerMouseSettingsDialog(QWidget* parent, ControllerSettingsDialog* dialog)
-	: QDialog(parent)
-{
-	m_ui.setupUi(this);
-
-	SettingsInterface* sif = dialog->getProfileSettingsInterface();
-
-	m_ui.icon->setPixmap(QIcon::fromTheme(QStringLiteral("mouse-line")).pixmap(32, 32));
-
-	ControllerSettingWidgetBinder::BindWidgetToInputProfileFloat(sif, m_ui.pointerXSpeedSlider, "Pad", "PointerXSpeed", 40.0f);
-	ControllerSettingWidgetBinder::BindWidgetToInputProfileFloat(sif, m_ui.pointerYSpeedSlider, "Pad", "PointerYSpeed", 40.0f);
-	ControllerSettingWidgetBinder::BindWidgetToInputProfileFloat(sif, m_ui.pointerXDeadZoneSlider, "Pad", "PointerXDeadZone", 20.0f);
-	ControllerSettingWidgetBinder::BindWidgetToInputProfileFloat(sif, m_ui.pointerYDeadZoneSlider, "Pad", "PointerYDeadZone", 20.0f);
-	ControllerSettingWidgetBinder::BindWidgetToInputProfileFloat(sif, m_ui.pointerInertiaSlider, "Pad", "PointerInertia", 10.0f);
-
-	connect(m_ui.pointerXSpeedSlider, &QSlider::valueChanged, this, [this](int value) { m_ui.pointerXSpeedVal->setText(QStringLiteral("%1").arg(value)); });
-	connect(m_ui.pointerYSpeedSlider, &QSlider::valueChanged, this, [this](int value) { m_ui.pointerYSpeedVal->setText(QStringLiteral("%1").arg(value)); });
-	connect(m_ui.pointerXDeadZoneSlider, &QSlider::valueChanged, this, [this](int value) { m_ui.pointerXDeadZoneVal->setText(QStringLiteral("%1").arg(value)); });
-	connect(m_ui.pointerYDeadZoneSlider, &QSlider::valueChanged, this, [this](int value) { m_ui.pointerYDeadZoneVal->setText(QStringLiteral("%1").arg(value)); });
-	connect(m_ui.pointerInertiaSlider, &QSlider::valueChanged, this, [this](int value) { m_ui.pointerInertiaVal->setText(QStringLiteral("%1").arg(value)); });
-
-	m_ui.pointerXSpeedVal->setText(QStringLiteral("%1").arg(m_ui.pointerXSpeedSlider->value()));
-	m_ui.pointerYSpeedVal->setText(QStringLiteral("%1").arg(m_ui.pointerYSpeedSlider->value()));
-	m_ui.pointerXDeadZoneVal->setText(QStringLiteral("%1").arg(m_ui.pointerXDeadZoneSlider->value()));
-	m_ui.pointerYDeadZoneVal->setText(QStringLiteral("%1").arg(m_ui.pointerYDeadZoneSlider->value()));
-	m_ui.pointerInertiaVal->setText(QStringLiteral("%1").arg(m_ui.pointerInertiaSlider->value()));
-
-	connect(m_ui.buttonBox->button(QDialogButtonBox::Close), &QPushButton::clicked, this, &QDialog::accept);
-}
-
-ControllerMouseSettingsDialog::~ControllerMouseSettingsDialog() = default;

pcsx2-qt/Settings/ControllerGlobalSettingsWidget.h

@@ -24,7 +24,6 @@
 
 #include "ui_ControllerGlobalSettingsWidget.h"
 #include "ui_ControllerLEDSettingsDialog.h"
-#include "ui_ControllerMouseSettingsDialog.h"
 
 class ControllerSettingsDialog;
 
@@ -45,7 +44,6 @@ Q_SIGNALS:
 private Q_SLOTS:
 	void updateSDLOptionsEnabled();
 	void ledSettingsClicked();
-	void mouseSettingsClicked();
 
 private:
 	Ui::ControllerGlobalSettingsWidget m_ui;
@@ -66,15 +64,3 @@ private:
 	Ui::ControllerLEDSettingsDialog m_ui;
 	ControllerSettingsDialog* m_dialog;
 };
-
-class ControllerMouseSettingsDialog : public QDialog
-{
-	Q_OBJECT
-
-public:
-	ControllerMouseSettingsDialog(QWidget* parent, ControllerSettingsDialog* dialog);
-	~ControllerMouseSettingsDialog();
-
-private:
-	Ui::ControllerMouseSettingsDialog m_ui;
-};

pcsx2-qt/Settings/ControllerGlobalSettingsWidget.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>902</width>
-    <height>583</height>
+    <height>677</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -26,32 +26,6 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <item row="5" column="0">
-    <widget class="QGroupBox" name="profileSettings">
-     <property name="title">
-      <string>Profile Settings</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_5">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>When this option is enabled, hotkeys can be set in this input profile, and will be used instead of the global hotkeys. By default, hotkeys are always shared between all profiles.</string>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QCheckBox" name="useProfileHotkeyBindings">
-        <property name="text">
-         <string>Use Per-Profile Hotkeys</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item row="0" column="0">
     <widget class="QGroupBox" name="sdlGroup">
      <property name="title">
@@ -91,7 +65,8 @@
           </property>
           <property name="icon">
            <iconset theme="lightbulb-line">
-            <normaloff>.</normaloff>.</iconset>
+            <normaloff>.</normaloff>.
+           </iconset>
           </property>
          </widget>
         </item>
@@ -100,19 +75,6 @@
      </layout>
     </widget>
    </item>
-   <item row="6" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>45</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
    <item row="1" column="0">
     <widget class="QGroupBox" name="xinputGroup">
      <property name="title">
@@ -139,6 +101,71 @@
      </layout>
     </widget>
    </item>
+   <item row="2" column="0">
+    <widget class="QGroupBox" name="dinputGroup">
+     <property name="title">
+      <string>DInput Source</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_6">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_9">
+        <property name="text">
+         <string>The DInput source provides support for legacy controllers which do not support XInput. Accessing these controllers via SDL instead is recommended, but DirectInput can be used if they are not compatible with SDL.</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="enableDInputSource">
+        <property name="text">
+         <string>Enable DInput Input Source</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="6" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>45</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="5" column="0">
+    <widget class="QGroupBox" name="profileSettings">
+     <property name="title">
+      <string>Profile Settings</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_5">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>When this option is enabled, hotkeys can be set in this input profile, and will be used instead of the global hotkeys. By default, hotkeys are always shared between all profiles.</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="useProfileHotkeyBindings">
+        <property name="text">
+         <string>Use Per-Profile Hotkeys</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item row="4" column="0">
     <widget class="QGroupBox" name="multitapGroup">
      <property name="title">
@@ -172,6 +199,146 @@
      </layout>
     </widget>
    </item>
+   <item row="3" column="0">
+    <widget class="QGroupBox" name="mouseGroup">
+     <property name="title">
+      <string>Mouse/Pointer Source</string>
+     </property>
+     <layout class="QFormLayout" name="formLayout">
+      <item row="0" column="0" colspan="2">
+       <widget class="QLabel" name="label_7">
+        <property name="text">
+         <string>Using raw input improves precision when you bind controller sticks to the mouse pointer. Also enables multiple mice to be used.</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_5">
+        <property name="text">
+         <string>Horizontal Sensitivity:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QSlider" name="pointerXScale">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>150</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="minimum">
+           <number>1</number>
+          </property>
+          <property name="maximum">
+           <number>30</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="pointerXScaleLabel">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>20</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>10</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_6">
+        <property name="text">
+         <string>Vertical Sensitivity:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QSlider" name="pointerYScale">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>150</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="minimum">
+           <number>1</number>
+          </property>
+          <property name="maximum">
+           <number>30</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="pointerYScaleLabel">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>20</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>10</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="3" column="0" colspan="2">
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <item>
+         <widget class="QCheckBox" name="enableMouseMapping">
+          <property name="text">
+           <string>Enable Mouse Mapping</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item row="0" column="1" rowspan="7">
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
@@ -197,72 +364,6 @@
      </layout>
     </widget>
    </item>
-   <item row="2" column="0">
-    <widget class="QGroupBox" name="dinputGroup">
-     <property name="title">
-      <string>DInput Source</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_6">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_9">
-        <property name="text">
-         <string>The DInput source provides support for legacy controllers which do not support XInput. Accessing these controllers via SDL instead is recommended, but DirectInput can be used if they are not compatible with SDL.</string>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QCheckBox" name="enableDInputSource">
-        <property name="text">
-         <string>Enable DInput Input Source</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="3" column="0">
-    <widget class="QGroupBox" name="mouseGroup">
-     <property name="title">
-      <string>Mouse/Pointer Source</string>
-     </property>
-     <layout class="QFormLayout" name="formLayout">
-      <item row="0" column="0" colspan="2">
-       <widget class="QLabel" name="label_7">
-        <property name="text">
-         <string>PCSX2 allows you to use your mouse to simulate analog stick movement.</string>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" colspan="2">
-       <layout class="QHBoxLayout" name="horizontalLayout_3" stretch="1,0">
-        <item>
-         <widget class="QCheckBox" name="enableMouseMapping">
-          <property name="text">
-           <string>Enable Mouse Mapping</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="mouseSettings">
-          <property name="toolTip">
-           <string>Controller LED Settings</string>
-          </property>
-          <property name="text">
-           <string>Settings...</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>

pcsx2-qt/Settings/ControllerMouseSettingsDialog.ui

@@ -1,417 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ControllerMouseSettingsDialog</class>
- <widget class="QDialog" name="ControllerMouseSettingsDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>654</width>
-    <height>169</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Mouse Mapping Settings</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="5" column="1">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Close</set>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <layout class="QHBoxLayout" name="pointerYSpeed">
-     <item>
-      <widget class="QLabel" name="pointerYSpeedLabel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>70</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>Y Speed</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSlider" name="pointerYSpeedSlider">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="minimum">
-        <number>0</number>
-       </property>
-       <property name="maximum">
-        <number>100</number>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="pointerYSpeedVal">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>30</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>10</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="1" column="0">
-    <layout class="QHBoxLayout" name="pointerXSpeed">
-     <item>
-      <widget class="QLabel" name="pointerXSpeedLabel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>70</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>X Speed</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSlider" name="pointerXSpeedSlider">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="minimum">
-        <number>0</number>
-       </property>
-       <property name="maximum">
-        <number>100</number>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="pointerXSpeedVal">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>30</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>10</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="0" column="0" colspan="2">
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <property name="bottomMargin">
-      <number>10</number>
-     </property>
-     <item>
-      <widget class="QLabel" name="icon">
-       <property name="minimumSize">
-        <size>
-         <width>32</width>
-         <height>32</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>32</width>
-         <height>32</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_4">
-       <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:700;&quot;&gt;Mouse Mapping Settings&lt;/span&gt;&lt;br/&gt;These settings fine-tune the behavior when mapping a mouse to the emulated controller.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::RichText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-       </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="4" column="0" colspan="2">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="3" column="0">
-    <layout class="QHBoxLayout" name="pointerInertia">
-     <item>
-      <widget class="QLabel" name="pointerInertiaLabel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>70</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>Inertia</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSlider" name="pointerInertiaSlider">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="minimum">
-        <number>0</number>
-       </property>
-       <property name="maximum">
-        <number>100</number>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="pointerInertiaVal">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>30</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>10</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="1" column="1">
-    <layout class="QHBoxLayout" name="pointerXDeadZone">
-     <item>
-      <widget class="QLabel" name="pointerXDeadZoneLabel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>70</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>X Dead Zone</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSlider" name="pointerXDeadZoneSlider">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="minimum">
-        <number>0</number>
-       </property>
-       <property name="maximum">
-        <number>100</number>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="pointerXDeadZoneVal">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>30</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>10</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="2" column="1">
-    <layout class="QHBoxLayout" name="pointerYDeadZone">
-     <item>
-      <widget class="QLabel" name="pointerYDeadZoneLabel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>70</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>Y Dead Zone</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSlider" name="pointerYDeadZoneSlider">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="minimum">
-        <number>0</number>
-       </property>
-       <property name="maximum">
-        <number>100</number>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="pointerYDeadZoneVal">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>30</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>10</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="../resources/resources.qrc"/>
- </resources>
- <connections/>
-</ui>

pcsx2-qt/Settings/GraphicsSettingsWidget.cpp

@@ -598,7 +598,7 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsDialog* dialog, QWidget*
 	// OSD tab
 	{
 		dialog->registerWidgetHelp(
-			m_ui.osdScale, tr("OSD Scale"), tr("100%"), tr("Scales the size of the onscreen OSD from 50% to 500%."));
+			m_ui.osdScale, tr("OSD Scale"), tr("100%"), tr("Scales the size of the onscreen OSD from 100% to 500%."));
 
 		dialog->registerWidgetHelp(m_ui.osdShowMessages, tr("Show OSD Messages"), tr("Checked"),
 			tr("Shows on-screen-display messages when events occur such as save states being "

pcsx2-qt/Settings/GraphicsSettingsWidget.ui

@@ -1536,7 +1536,7 @@
              <string>%</string>
             </property>
             <property name="minimum">
-             <number>50</number>
+             <number>100</number>
             </property>
             <property name="maximum">
              <number>500</number>

pcsx2-qt/Settings/InterfaceSettingsWidget.cpp

@@ -129,7 +129,7 @@ InterfaceSettingsWidget::InterfaceSettingsWidget(SettingsDialog* dialog, QWidget
 		m_ui.confirmShutdown, tr("Confirm Shutdown"), tr("Checked"),
 		tr("Determines whether a prompt will be displayed to confirm shutting down the virtual machine "
 		   "when the hotkey is pressed."));
-	dialog->registerWidgetHelp(m_ui.saveStateOnShutdown, tr("Save State On Shutdown"), tr("Unchecked"),
+	dialog->registerWidgetHelp(m_ui.saveStateOnShutdown, tr("Save State On Shutdown"), tr("Checked"),
 		tr("Automatically saves the emulator state when powering down or exiting. You can then "
 		   "resume directly from where you left off next time."));
 	dialog->registerWidgetHelp(m_ui.pauseOnStart, tr("Pause On Start"), tr("Unchecked"),

pcsx2-qt/pcsx2-qt.vcxproj

@@ -423,9 +423,6 @@
     <QtUi Include="Settings\ControllerLEDSettingsDialog.ui">
       <FileType>Document</FileType>
     </QtUi>
-    <QtUi Include="Settings\ControllerMouseSettingsDialog.ui">
-      <FileType>Document</FileType>
-    </QtUi>
     <None Include="Settings\USBBindingWidget_DrivingForce.ui" />
     <None Include="Settings\USBBindingWidget_GTForce.ui" />
     <QtUi Include="Settings\USBDeviceWidget.ui">
@@ -442,4 +439,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="$(SolutionDir)common\vsprops\QtCompile.targets" />
   <ImportGroup Label="ExtensionTargets" />
-</Project>
+</Project>

pcsx2-qt/pcsx2-qt.vcxproj.filters

@@ -583,9 +583,6 @@
     <QtUi Include="Settings\ControllerLEDSettingsDialog.ui">
       <Filter>Settings</Filter>
     </QtUi>
-    <QtUi Include="Settings\ControllerMouseSettingsDialog.ui">
-      <Filter>Settings</Filter>
-    </QtUi>
   </ItemGroup>
   <ItemGroup>
     <None Include="Settings\FolderSettingsWidget.ui">

pcsx2-qt/resources/icons/black/svg/mouse-line.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M11.141 4c-1.582 0-2.387.169-3.128.565a3.453 3.453 0 0 0-1.448 1.448C6.169 6.753 6 7.559 6 9.14v5.718c0 1.582.169 2.387.565 3.128.337.63.818 1.111 1.448 1.448.74.396 1.546.565 3.128.565h1.718c1.582 0 2.387-.169 3.128-.565a3.453 3.453 0 0 0 1.448-1.448c.396-.74.565-1.546.565-3.128V9.14c0-1.582-.169-2.387-.565-3.128a3.453 3.453 0 0 0-1.448-1.448C15.247 4.169 14.441 4 12.86 4H11.14zm0-2h1.718c2.014 0 3.094.278 4.072.801a5.452 5.452 0 0 1 2.268 2.268c.523.978.801 2.058.801 4.072v5.718c0 2.014-.278 3.094-.801 4.072a5.452 5.452 0 0 1-2.268 2.268c-.978.523-2.058.801-4.072.801H11.14c-2.014 0-3.094-.278-4.072-.801a5.452 5.452 0 0 1-2.268-2.268C4.278 17.953 4 16.873 4 14.859V9.14c0-2.014.278-3.094.801-4.072A5.452 5.452 0 0 1 7.07 2.801C8.047 2.278 9.127 2 11.141 2zM11 6h2v5h-2V6z"/></svg>

pcsx2-qt/resources/icons/white/svg/mouse-line.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M11.141 4c-1.582 0-2.387.169-3.128.565a3.453 3.453 0 0 0-1.448 1.448C6.169 6.753 6 7.559 6 9.14v5.718c0 1.582.169 2.387.565 3.128.337.63.818 1.111 1.448 1.448.74.396 1.546.565 3.128.565h1.718c1.582 0 2.387-.169 3.128-.565a3.453 3.453 0 0 0 1.448-1.448c.396-.74.565-1.546.565-3.128V9.14c0-1.582-.169-2.387-.565-3.128a3.453 3.453 0 0 0-1.448-1.448C15.247 4.169 14.441 4 12.86 4H11.14zm0-2h1.718c2.014 0 3.094.278 4.072.801a5.452 5.452 0 0 1 2.268 2.268c.523.978.801 2.058.801 4.072v5.718c0 2.014-.278 3.094-.801 4.072a5.452 5.452 0 0 1-2.268 2.268c-.978.523-2.058.801-4.072.801H11.14c-2.014 0-3.094-.278-4.072-.801a5.452 5.452 0 0 1-2.268-2.268C4.278 17.953 4 16.873 4 14.859V9.14c0-2.014.278-3.094.801-4.072A5.452 5.452 0 0 1 7.07 2.801C8.047 2.278 9.127 2 11.141 2zM11 6h2v5h-2V6z" fill="#ffffff"/></svg>

pcsx2-qt/resources/resources.qrc

@@ -40,7 +40,6 @@
 		<file>icons/black/svg/lightbulb-line.svg</file>
 		<file>icons/black/svg/list-check.svg</file>
 		<file>icons/black/svg/login-box-line.svg</file>
-		<file>icons/black/svg/mouse-line.svg</file>
 		<file>icons/black/svg/pause-line.svg</file>
 		<file>icons/black/svg/play-line.svg</file>
 		<file>icons/black/svg/price-tag-3-line.svg</file>
@@ -101,7 +100,6 @@
 		<file>icons/white/svg/lightbulb-line.svg</file>
 		<file>icons/white/svg/list-check.svg</file>
 		<file>icons/white/svg/login-box-line.svg</file>
-		<file>icons/white/svg/mouse-line.svg</file>
 		<file>icons/white/svg/pause-line.svg</file>
 		<file>icons/white/svg/play-line.svg</file>
 		<file>icons/white/svg/price-tag-3-line.svg</file>

pcsx2/CDVD/Darwin/IOCtlSrc.cpp

@@ -66,7 +66,6 @@ bool IOCtlSrc::Reopen()
 
 void IOCtlSrc::SetSpindleSpeed(bool restore_defaults) const
 {
-#ifdef __APPLE__
 	u16 speed = restore_defaults ? 0xFFFF : m_media_type >= 0 ? 5540 :
 																3600;
 	int ioctl_code = m_media_type >= 0 ? DKIOCDVDSETSPEED : DKIOCCDSETSPEED;
@@ -78,10 +77,6 @@ void IOCtlSrc::SetSpindleSpeed(bool restore_defaults) const
 	{
 		DevCon.WriteLn("CDVD: Spindle speed set to %d", speed);
 	}
-#else
-	// FIXME: FreeBSD equivalent for DKIOCDVDSETSPEED DKIOCCDSETSPEED.
-	DevCon.Warning("CDVD: Setting spindle speed not supported!");
-#endif
 }
 
 u32 IOCtlSrc::GetSectorCount() const

pcsx2/Counters.cpp

@@ -543,16 +543,12 @@ static __fi void DoFMVSwitch()
 		RendererSwitched = false;
 }
 
-// Convenience function to update UI thread and set patches. 
-static __fi void VSyncUpdateCore()
+// Convenience function to update UI thread and set patches.
+static __fi void frameLimitUpdateCore()
 {
 	DoFMVSwitch();
 
 	VMManager::Internal::VSyncOnCPUThread();
-}
-
-static __fi void VSyncCheckExit()
-{
 	if (VMManager::Internal::IsExecutionInterrupted())
 		Cpu->ExitExecution();
 }
@@ -563,7 +559,10 @@ static __fi void frameLimit()
 {
 	// Framelimiter off in settings? Framelimiter go brrr.
 	if (EmuConfig.GS.LimitScalar == 0.0f || s_use_vsync_for_timing)
+	{
+		frameLimitUpdateCore();
 		return;
+	}
 
 	const u64 uExpectedEnd = m_iStart + m_iTicks;  // Compute when we would expect this frame to end, assuming everything goes perfectly perfect.
 	const u64 iEnd = GetCPUTicks();                // The current tick we actually stopped on.
@@ -574,6 +573,7 @@ static __fi void frameLimit()
 	{
 		// ... Fudge the next frame start over a bit. Prevents fast forward zoomies.
 		m_iStart += (sDeltaTime / m_iTicks) * m_iTicks;
+		frameLimitUpdateCore();
 		return;
 	}
 
@@ -597,6 +597,7 @@ static __fi void frameLimit()
 
 	// Finally, set our next frame start to when this one ends
 	m_iStart = uExpectedEnd;
+	frameLimitUpdateCore();
 }
 
 static __fi void VSyncStart(u32 sCycle)
@@ -604,10 +605,8 @@ static __fi void VSyncStart(u32 sCycle)
 	// Update vibration at the end of a frame.
 	PAD::Update();
 
-	VSyncUpdateCore();
 	frameLimit(); // limit FPS
 	gsPostVsyncStart(); // MUST be after framelimit; doing so before causes funk with frame times!
-	VSyncCheckExit();
 
 	if(EmuConfig.Trace.Enabled && EmuConfig.Trace.EE.m_EnableAll)
 		SysTrace.EE.Counters.Write( "    ================  EE COUNTER VSYNC START (frame: %d)  ================", g_FrameCount );

pcsx2/Frontend/CommonHost.cpp

@@ -160,7 +160,7 @@ void CommonHost::SetDataDirectory()
 			EmuFolders::DataRoot = Path::Combine(StringUtil::WideStringToUTF8String(documents_directory), "PCSX2");
 		CoTaskMemFree(documents_directory);
 	}
-#elif defined(__linux__) || defined(__FreeBSD__)
+#elif defined(__linux__)
 	// Use $XDG_CONFIG_HOME/PCSX2 if it exists.
 	const char* xdg_config_home = getenv("XDG_CONFIG_HOME");
 	if (xdg_config_home && Path::IsAbsolute(xdg_config_home))

pcsx2/Frontend/D3D11HostDisplay.cpp

@@ -641,10 +641,13 @@ bool D3D11HostDisplay::UpdateImGuiFontTexture()
 	return true;
 }
 
-HostDisplay::PresentResult D3D11HostDisplay::BeginPresent(bool frame_skip)
+bool D3D11HostDisplay::BeginPresent(bool frame_skip)
 {
 	if (frame_skip || !m_swap_chain)
-		return PresentResult::FrameSkipped;
+	{
+		ImGui::EndFrame();
+		return false;
+	}
 
 	// When using vsync, the time here seems to include the time for the buffer to become available.
 	// This blows our our GPU usage number considerably, so read the timestamp before the final blit
@@ -661,7 +664,7 @@ HostDisplay::PresentResult D3D11HostDisplay::BeginPresent(bool frame_skip)
 	const CD3D11_RECT scissor(0, 0, m_window_info.surface_width, m_window_info.surface_height);
 	m_context->RSSetViewports(1, &vp);
 	m_context->RSSetScissorRects(1, &scissor);
-	return PresentResult::OK;
+	return true;
 }
 
 void D3D11HostDisplay::EndPresent()

pcsx2/Frontend/D3D11HostDisplay.h

@@ -65,7 +65,7 @@ public:
 
 	void SetVSync(VsyncMode mode) override;
 
-	PresentResult BeginPresent(bool frame_skip) override;
+	bool BeginPresent(bool frame_skip) override;
 	void EndPresent() override;
 
 	bool SetGPUTimingEnabled(bool enabled) override;

pcsx2/Frontend/D3D12HostDisplay.cpp

@@ -554,13 +554,13 @@ bool D3D12HostDisplay::UpdateImGuiFontTexture()
 	return ImGui_ImplDX12_CreateFontsTexture();
 }
 
-HostDisplay::PresentResult D3D12HostDisplay::BeginPresent(bool frame_skip)
+bool D3D12HostDisplay::BeginPresent(bool frame_skip)
 {
-	if (m_device_lost)
-		return HostDisplay::PresentResult::DeviceLost;
-
 	if (frame_skip || !m_swap_chain)
-		return PresentResult::FrameSkipped;
+	{
+		ImGui::EndFrame();
+		return false;
+	}
 
 	static constexpr std::array<float, 4> clear_color = {};
 	D3D12::Texture& swap_chain_buf = m_swap_chain_buffers[m_current_swap_chain_buffer];
@@ -574,7 +574,7 @@ HostDisplay::PresentResult D3D12HostDisplay::BeginPresent(bool frame_skip)
 	const D3D12_RECT scissor{0, 0, static_cast<LONG>(m_window_info.surface_width), static_cast<LONG>(m_window_info.surface_height)};
 	cmdlist->RSSetViewports(1, &vp);
 	cmdlist->RSSetScissorRects(1, &scissor);
-	return PresentResult::OK;
+	return true;
 }
 
 void D3D12HostDisplay::EndPresent()
@@ -586,11 +586,7 @@ void D3D12HostDisplay::EndPresent()
 	m_current_swap_chain_buffer = ((m_current_swap_chain_buffer + 1) % static_cast<u32>(m_swap_chain_buffers.size()));
 
 	swap_chain_buf.TransitionToState(g_d3d12_context->GetCommandList(), D3D12_RESOURCE_STATE_PRESENT);
-	if (!g_d3d12_context->ExecuteCommandList(D3D12::Context::WaitType::None))
-	{
-		m_device_lost = true;
-		return;
-	}
+	g_d3d12_context->ExecuteCommandList(D3D12::Context::WaitType::None);
 
 	const bool vsync = static_cast<UINT>(m_vsync_mode != VsyncMode::Off);
 	if (!vsync && m_using_allow_tearing)

pcsx2/Frontend/D3D12HostDisplay.h

@@ -71,7 +71,7 @@ public:
 
 	void SetVSync(VsyncMode mode) override;
 
-	PresentResult BeginPresent(bool frame_skip) override;
+	bool BeginPresent(bool frame_skip) override;
 	void EndPresent() override;
 
 	bool SetGPUTimingEnabled(bool enabled) override;
@@ -97,5 +97,4 @@ protected:
 
 	bool m_allow_tearing_supported = false;
 	bool m_using_allow_tearing = false;
-	bool m_device_lost = false;
 };

pcsx2/Frontend/ImGuiManager.cpp

@@ -90,7 +90,7 @@ bool ImGuiManager::Initialize()
 		return false;
 	}
 
-	s_global_scale = std::max(0.5f, g_host_display->GetWindowScale() * (EmuConfig.GS.OsdScale / 100.0f));
+	s_global_scale = std::max(1.0f, g_host_display->GetWindowScale() * (EmuConfig.GS.OsdScale / 100.0f));
 
 	ImGui::CreateContext();
 
@@ -185,7 +185,7 @@ void ImGuiManager::WindowResized()
 void ImGuiManager::UpdateScale()
 {
 	const float window_scale = g_host_display ? g_host_display->GetWindowScale() : 1.0f;
-	const float scale = std::max(window_scale * (EmuConfig.GS.OsdScale / 100.0f), 0.5f);
+	const float scale = std::max(window_scale * (EmuConfig.GS.OsdScale / 100.0f), 1.0f);
 
 	if (scale == s_global_scale && (!HasFullscreenFonts() || !ImGuiFullscreen::UpdateLayoutScale()))
 		return;
@@ -229,12 +229,6 @@ void ImGuiManager::NewFrame()
 	}
 }
 
-void ImGuiManager::SkipFrame()
-{
-	ImGui::EndFrame();
-	NewFrame();
-}
-
 void ImGuiManager::SetStyle()
 {
 	ImGuiStyle& style = ImGui::GetStyle();

pcsx2/Frontend/ImGuiManager.h

@@ -40,9 +40,6 @@ namespace ImGuiManager
 	/// Call at the beginning of the frame to set up ImGui state.
 	void NewFrame();
 
-	/// Call when skipping rendering a frame, to update internal state.
-	void SkipFrame();
-
 	/// Renders any on-screen display elements.
 	void RenderOSD();
 

pcsx2/Frontend/InputManager.cpp

@@ -160,11 +160,7 @@ struct PointerAxisState
 static std::array<std::array<float, static_cast<u8>(InputPointerAxis::Count)>, InputManager::MAX_POINTER_DEVICES> s_host_pointer_positions;
 static std::array<std::array<PointerAxisState, static_cast<u8>(InputPointerAxis::Count)>, InputManager::MAX_POINTER_DEVICES>
 	s_pointer_state;
-static std::array<float, 2> s_pointer_axis_speed;
-static std::array<float, 2> s_pointer_axis_dead_zone;
-static std::array<float, 2> s_pointer_axis_range;
-static std::array<float, 2> s_pointer_pos = {0.0f, 0.0f};
-static float s_pointer_inertia = 0.0f;
+static std::array<float, static_cast<u8>(InputPointerAxis::Count)> s_pointer_axis_scale;
 
 using PointerMoveCallback = std::function<void(InputBindingKey key, float value)>;
 using KeyboardEventCallback = std::function<void(InputBindingKey key, float value)>;
@@ -954,34 +950,15 @@ void InputManager::GenerateRelativeMouseEvents()
 	{
 		for (u32 axis = 0; axis < static_cast<u32>(static_cast<u8>(InputPointerAxis::Count)); axis++)
 		{
-			const InputBindingKey key(MakePointerAxisKey(device, static_cast<InputPointerAxis>(axis)));
-
 			PointerAxisState& state = s_pointer_state[device][axis];
 			const float delta = static_cast<float>(state.delta.exchange(0, std::memory_order_acquire)) / 65536.0f;
-			float value = 0.0f;
+			const float unclamped_value = delta * s_pointer_axis_scale[axis];
 
-			if (axis <= static_cast<u32>(InputPointerAxis::Y))
-			{
-				s_pointer_pos[axis] += delta * s_pointer_axis_speed[axis];
-				value = std::clamp(s_pointer_pos[axis], -1.0f, 1.0f);
-				s_pointer_pos[axis] -= value;
-				s_pointer_pos[axis] *= s_pointer_inertia;
-
-				value *= s_pointer_axis_range[axis];
-				if (value > 0.0f)
-					value += s_pointer_axis_dead_zone[axis];
-				else if (value < 0.0f)
-					value -= s_pointer_axis_dead_zone[axis];
-			}
-			else
-			{
-				// ImGui can consume mouse wheel events when the mouse is over a UI element.
-				if (delta != 0.0f && ImGuiManager::ProcessPointerAxisEvent(key, delta))
-					continue;
-
-				value = std::clamp(delta, -1.0f, 1.0f);
-			}
+			const InputBindingKey key(MakePointerAxisKey(device, static_cast<InputPointerAxis>(axis)));
+			if (axis >= static_cast<u32>(InputPointerAxis::WheelX) && ImGuiManager::ProcessPointerAxisEvent(key, unclamped_value))
+				continue;
 
+			const float value = std::clamp(unclamped_value, -1.0f, 1.0f);
 			if (value != state.last_value)
 			{
 				state.last_value = value;
@@ -1226,18 +1203,14 @@ void InputManager::ReloadBindings(SettingsInterface& si, SettingsInterface& bind
 	for (u32 pad = 0; pad < PAD::NUM_CONTROLLER_PORTS; pad++)
 		AddPadBindings(binding_si, pad, PAD::GetDefaultPadType(pad));
 
-	constexpr float ui_ctrl_range = 100.0f;
-	constexpr float pointer_sensitivity = 0.05f;
-	for (u32 axis = 0; axis <= static_cast<u32>(InputPointerAxis::Y); axis++)
+	for (u32 axis = 0; axis < static_cast<u32>(InputPointerAxis::Count); axis++)
 	{
-		s_pointer_axis_speed[axis] = si.GetFloatValue("Pad", fmt::format("Pointer{}Speed", s_pointer_axis_names[axis]).c_str(), 40.0f) /
-									 ui_ctrl_range * pointer_sensitivity;
-		s_pointer_axis_dead_zone[axis] = std::min(
-			si.GetFloatValue("Pad", fmt::format("Pointer{}DeadZone", s_pointer_axis_names[axis]).c_str(), 20.0f) / ui_ctrl_range, 1.0f);
-		s_pointer_axis_range[axis] = 1.0f - s_pointer_axis_dead_zone[axis];
+		// From lilypad: 1 mouse pixel = 1/8th way down.
+		const float default_scale = (axis <= static_cast<u32>(InputPointerAxis::Y)) ? 8.0f : 1.0f;
+		s_pointer_axis_scale[axis] =
+			1.0f /
+			std::max(si.GetFloatValue("Pad", fmt::format("Pointer{}Scale", s_pointer_axis_names[axis]).c_str(), default_scale), 1.0f);
 	}
-	s_pointer_inertia = si.GetFloatValue("Pad", "PointerInertia", 10.0f) / ui_ctrl_range;
-	s_pointer_pos = {};
 
 	for (u32 port = 0; port < USB::NUM_PORTS; port++)
 		AddUSBBindings(binding_si, port);

pcsx2/Frontend/MetalHostDisplay.h

@@ -81,7 +81,7 @@ public:
 	std::unique_ptr<HostDisplayTexture> CreateTexture(u32 width, u32 height, const void* data, u32 data_stride, bool dynamic = false) override;
 	void UpdateTexture(id<MTLTexture> texture, u32 x, u32 y, u32 width, u32 height, const void* data, u32 data_stride);
 	void UpdateTexture(HostDisplayTexture* texture, u32 x, u32 y, u32 width, u32 height, const void* data, u32 data_stride) override;
-	PresentResult BeginPresent(bool frame_skip) override;
+	bool BeginPresent(bool frame_skip) override;
 	void EndPresent() override;
 	void SetVSync(VsyncMode mode) override;
 

pcsx2/Frontend/MetalHostDisplay.mm

@@ -265,7 +265,7 @@ void MetalHostDisplay::UpdateTexture(HostDisplayTexture* texture, u32 x, u32 y,
 
 static bool s_capture_next = false;
 
-HostDisplay::PresentResult MetalHostDisplay::BeginPresent(bool frame_skip)
+bool MetalHostDisplay::BeginPresent(bool frame_skip)
 { @autoreleasepool {
 	GSDeviceMTL* dev = static_cast<GSDeviceMTL*>(g_gs_device.get());
 	if (dev && m_capture_start_frame && dev->FrameNo() == m_capture_start_frame)
@@ -273,7 +273,7 @@ HostDisplay::PresentResult MetalHostDisplay::BeginPresent(bool frame_skip)
 	if (frame_skip || m_window_info.type == WindowInfo::Type::Surfaceless || !g_gs_device)
 	{
 		ImGui::EndFrame();
-		return PresentResult::FrameSkipped;
+		return false;
 	}
 	id<MTLCommandBuffer> buf = dev->GetRenderCmdBuf();
 	m_current_drawable = MRCRetain([m_layer nextDrawable]);
@@ -284,13 +284,13 @@ HostDisplay::PresentResult MetalHostDisplay::BeginPresent(bool frame_skip)
 		[buf popDebugGroup];
 		dev->FlushEncoders();
 		ImGui::EndFrame();
-		return PresentResult::FrameSkipped;
+		return false;
 	}
 	[m_pass_desc colorAttachments][0].texture = [m_current_drawable texture];
 	id<MTLRenderCommandEncoder> enc = [buf renderCommandEncoderWithDescriptor:m_pass_desc];
 	[enc setLabel:@"Present"];
 	dev->m_current_render.encoder = MRCRetain(enc);
-	return PresentResult::OK;
+	return true;
 }}
 
 void MetalHostDisplay::EndPresent()

pcsx2/Frontend/OpenGLHostDisplay.cpp

@@ -335,10 +335,13 @@ bool OpenGLHostDisplay::UpdateImGuiFontTexture()
 	return ImGui_ImplOpenGL3_CreateFontsTexture();
 }
 
-HostDisplay::PresentResult OpenGLHostDisplay::BeginPresent(bool frame_skip)
+bool OpenGLHostDisplay::BeginPresent(bool frame_skip)
 {
 	if (frame_skip || m_window_info.type == WindowInfo::Type::Surfaceless)
-		return PresentResult::FrameSkipped;
+	{
+		ImGui::EndFrame();
+		return false;
+	}
 
 	glDisable(GL_SCISSOR_TEST);
 	glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
@@ -347,7 +350,7 @@ HostDisplay::PresentResult OpenGLHostDisplay::BeginPresent(bool frame_skip)
 	glClear(GL_COLOR_BUFFER_BIT);
 	glViewport(0, 0, m_window_info.surface_width, m_window_info.surface_height);
 
-	return PresentResult::OK;
+	return true;
 }
 
 void OpenGLHostDisplay::EndPresent()

pcsx2/Frontend/OpenGLHostDisplay.h

@@ -58,7 +58,7 @@ public:
 
 	void SetVSync(VsyncMode mode) override;
 
-	PresentResult BeginPresent(bool frame_skip) override;
+	bool BeginPresent(bool frame_skip) override;
 	void EndPresent() override;
 
 	bool SetGPUTimingEnabled(bool enabled) override;

pcsx2/Frontend/VulkanHostDisplay.cpp

@@ -339,18 +339,17 @@ bool VulkanHostDisplay::DoneCurrent()
 	return true;
 }
 
-HostDisplay::PresentResult VulkanHostDisplay::BeginPresent(bool frame_skip)
+bool VulkanHostDisplay::BeginPresent(bool frame_skip)
 {
 	if (frame_skip || !m_swap_chain)
-		return PresentResult::FrameSkipped;
+	{
+		ImGui::EndFrame();
+		return false;
+	}
 
 	// Previous frame needs to be presented before we can acquire the swap chain.
 	g_vulkan_context->WaitForPresentComplete();
 
-	// Check if the device was lost.
-	if (g_vulkan_context->CheckLastSubmitFail())
-		return PresentResult::DeviceLost;
-
 	VkResult res = m_swap_chain->AcquireNextImage();
 	if (res != VK_SUCCESS)
 	{
@@ -368,7 +367,7 @@ HostDisplay::PresentResult VulkanHostDisplay::BeginPresent(bool frame_skip)
 			{
 				Console.Error("Failed to recreate surface after loss");
 				g_vulkan_context->ExecuteCommandBuffer(Vulkan::Context::WaitType::None);
-				return PresentResult::FrameSkipped;
+				return false;
 			}
 
 			res = m_swap_chain->AcquireNextImage();
@@ -381,7 +380,7 @@ HostDisplay::PresentResult VulkanHostDisplay::BeginPresent(bool frame_skip)
 			// Still submit the command buffer, otherwise we'll end up with several frames waiting.
 			LOG_VULKAN_ERROR(res, "vkAcquireNextImageKHR() failed: ");
 			g_vulkan_context->ExecuteCommandBuffer(Vulkan::Context::WaitType::None);
-			return PresentResult::FrameSkipped;
+			return false;
 		}
 	}
 
@@ -402,7 +401,7 @@ HostDisplay::PresentResult VulkanHostDisplay::BeginPresent(bool frame_skip)
 	const VkRect2D scissor{{0, 0}, {static_cast<u32>(swap_chain_texture.GetWidth()), static_cast<u32>(swap_chain_texture.GetHeight())}};
 	vkCmdSetViewport(g_vulkan_context->GetCurrentCommandBuffer(), 0, 1, &vp);
 	vkCmdSetScissor(g_vulkan_context->GetCurrentCommandBuffer(), 0, 1, &scissor);
-	return PresentResult::OK;
+	return true;
 }
 
 void VulkanHostDisplay::EndPresent()

pcsx2/Frontend/VulkanHostDisplay.h

@@ -47,7 +47,7 @@ public:
 
 	void SetVSync(VsyncMode mode) override;
 
-	PresentResult BeginPresent(bool frame_skip) override;
+	bool BeginPresent(bool frame_skip) override;
 	void EndPresent() override;
 
 	bool SetGPUTimingEnabled(bool enabled) override;

pcsx2/GS/GS.cpp

@@ -209,15 +209,15 @@ static bool DoGSOpen(GSRendererType renderer, u8* basemem)
 			return false;
 	}
 
-	if (!g_gs_device->Create())
+	try
 	{
-		g_gs_device->Destroy();
-		g_gs_device.reset();
-		return false;
-	}
+		if (!g_gs_device->Create())
+		{
+			g_gs_device->Destroy();
+			g_gs_device.reset();
+			return false;
+		}
 
-	if (!g_gs_renderer)
-	{
 		if (renderer == GSRendererType::Null)
 		{
 			g_gs_renderer = std::make_unique<GSRendererNull>();
@@ -230,68 +230,55 @@ static bool DoGSOpen(GSRendererType renderer, u8* basemem)
 		{
 			g_gs_renderer = std::unique_ptr<GSRenderer>(MULTI_ISA_SELECT(makeGSRendererSW)(GSConfig.SWExtraThreads));
 		}
-
-		g_gs_renderer->SetRegsMem(basemem);
-		g_gs_renderer->ResetPCRTC();
 	}
-	else
+	catch (std::exception& ex)
 	{
-		Console.Warning("(DoGSOpen) Using existing renderer.");
+		Host::ReportFormattedErrorAsync("GS", "GS error: Exception caught in GSopen: %s", ex.what());
+		g_gs_renderer.reset();
+		g_gs_device->Destroy();
+		g_gs_device.reset();
+		return false;
 	}
 
 	GSConfig.OsdShowGPU = EmuConfig.GS.OsdShowGPU && g_host_display->SetGPUTimingEnabled(true);
 
+	g_gs_renderer->SetRegsMem(basemem);
 	g_perfmon.Reset();
 	return true;
 }
 
-bool GSreopen(bool recreate_display, bool recreate_renderer, const Pcsx2Config::GSOptions& old_config)
+bool GSreopen(bool recreate_display, const Pcsx2Config::GSOptions& old_config)
 {
 	Console.WriteLn("Reopening GS with %s display", recreate_display ? "new" : "existing");
 
-	if (recreate_renderer)
-		g_gs_renderer->Flush(GSState::GSFlushReason::GSREOPEN);
+	g_gs_renderer->Flush(GSState::GSFlushReason::GSREOPEN);
 
 	freezeData fd = {};
-	std::unique_ptr<u8[]> fd_data;
-	if (recreate_renderer)
+	if (g_gs_renderer->Freeze(&fd, true) != 0)
 	{
-		if (g_gs_renderer->Freeze(&fd, true) != 0)
-		{
-			Console.Error("(GSreopen) Failed to get GS freeze size");
-			return false;
-		}
-
-		fd_data = std::make_unique<u8[]>(fd.size);
-		fd.data = fd_data.get();
-		if (g_gs_renderer->Freeze(&fd, false) != 0)
-		{
-			Console.Error("(GSreopen) Failed to freeze GS");
-			return false;
-		}
+		Console.Error("(GSreopen) Failed to get GS freeze size");
+		return false;
 	}
-	else
+
+	std::unique_ptr<u8[]> fd_data = std::make_unique<u8[]>(fd.size);
+	fd.data = fd_data.get();
+	if (g_gs_renderer->Freeze(&fd, false) != 0)
 	{
-		// Make sure nothing is left over.
-		g_gs_renderer->PurgePool();
-		g_gs_renderer->PurgeTextureCache();
+		Console.Error("(GSreopen) Failed to freeze GS");
+		return false;
 	}
 
 	if (recreate_display)
 	{
 		g_gs_device->ResetAPIState();
-		if (Host::BeginPresentFrame(false) == HostDisplay::PresentResult::OK)
+		if (Host::BeginPresentFrame(true))
 			Host::EndPresentFrame();
 	}
 
 	u8* basemem = g_gs_renderer->GetRegsMem();
 	const u32 gamecrc = g_gs_renderer->GetGameCRC();
-	if (recreate_renderer)
-	{
-		g_gs_renderer->Destroy();
-		g_gs_renderer.reset();
-	}
-
+	g_gs_renderer->Destroy();
+	g_gs_renderer.reset();
 	g_gs_device->Destroy();
 	g_gs_device.reset();
 
@@ -340,17 +327,13 @@ bool GSreopen(bool recreate_display, bool recreate_renderer, const Pcsx2Config::
 		}
 	}
 
-	if (recreate_renderer)
+	if (g_gs_renderer->Defrost(&fd) != 0)
 	{
-		if (g_gs_renderer->Defrost(&fd) != 0)
-		{
-			Console.Error("(GSreopen) Failed to defrost");
-			return false;
-		}
-
-		g_gs_renderer->SetGameCRC(gamecrc);
+		Console.Error("(GSreopen) Failed to defrost");
+		return false;
 	}
 
+	g_gs_renderer->SetGameCRC(gamecrc);
 	return true;
 }
 
@@ -715,7 +698,7 @@ void GSUpdateConfig(const Pcsx2Config::GSOptions& new_config)
 			GSConfig.DisableShaderCache != old_config.DisableShaderCache ||
 			GSConfig.DisableThreadedPresentation != old_config.DisableThreadedPresentation
 		);
-		if (!GSreopen(do_full_restart, true, old_config))
+		if (!GSreopen(do_full_restart, old_config))
 			pxFailRel("Failed to do full GS reopen");
 		return;
 	}
@@ -726,7 +709,7 @@ void GSUpdateConfig(const Pcsx2Config::GSOptions& new_config)
 		GSConfig.SWExtraThreads != old_config.SWExtraThreads ||
 		GSConfig.SWExtraThreadsHeight != old_config.SWExtraThreadsHeight)
 	{
-		if (!GSreopen(false, true, old_config))
+		if (!GSreopen(false, old_config))
 			pxFailRel("Failed to do quick GS reopen");
 
 		return;
@@ -804,7 +787,7 @@ void GSSwitchRenderer(GSRendererType new_renderer)
 	const bool recreate_display = (!is_software_switch && existing_api != GetAPIForRenderer(new_renderer));
 	const Pcsx2Config::GSOptions old_config(GSConfig);
 	GSConfig.Renderer = new_renderer;
-	if (!GSreopen(recreate_display, true, old_config))
+	if (!GSreopen(recreate_display, old_config))
 		pxFailRel("Failed to reopen GS for renderer switch.");
 }
 

pcsx2/GS/GS.h

@@ -53,7 +53,7 @@ s16 GSLookupBeforeDrawFunctionId(const std::string_view& name);
 int GSinit();
 void GSshutdown();
 bool GSopen(const Pcsx2Config::GSOptions& config, GSRendererType renderer, u8* basemem);
-bool GSreopen(bool recreate_display, bool recreate_renderer, const Pcsx2Config::GSOptions& old_config);
+bool GSreopen(bool recreate_display, const Pcsx2Config::GSOptions& old_config);
 void GSreset(bool hardware_reset);
 void GSclose();
 void GSgifSoftReset(u32 mask);

pcsx2/GS/GSCrc.cpp

@@ -24,6 +24,15 @@ const CRC::Game CRC::m_games[] =
 {
 	// Note: IDs 0x7ACF7E03, 0x7D4EA48F, 0x37C53760 - shouldn't be added as it's from the multiloaders when packing games.
 	{0x00000000, NoTitle /* NoRegion */},
+	{0x9AAC5309, FFX2 /* EU */},
+	{0x9AAC530C, FFX2 /* FR */},
+	{0x9AAC530A, FFX2 /* ES */},
+	{0x9AAC530D, FFX2 /* DE */},
+	{0x9AAC530B, FFX2 /* IT */},
+	{0x48FE0C71, FFX2 /* US */},
+	{0x8A6D7F14, FFX2 /* JP */},
+	{0xE1FD9A2D, FFX2 /* JP */}, // int.
+	{0x11624CD6, FFX2 /* KO */},
 	{0x08C1ED4D, HauntingGround /* EU */},
 	{0x2CD5794C, HauntingGround /* EU */},
 	{0x867BB945, HauntingGround /* JP */},

pcsx2/GS/GSCrc.h

@@ -23,6 +23,7 @@ public:
 	enum Title : u32
 	{
 		NoTitle,
+		FFX2,
 		GetawayGames,
 		HauntingGround,
 		ICO,

pcsx2/GS/GSLocalMemory.h

@@ -481,7 +481,7 @@ public:
 	static psm_t m_psm[64];
 	static readImage m_readImageX;
 
-	static constexpr int m_vmsize = 1024 * 1024 * 4;
+	static const int m_vmsize = 1024 * 1024 * 4;
 
 	u8* m_vm8;
 

pcsx2/GS/GSState.cpp

@@ -26,7 +26,6 @@
 #include <iomanip> // Dump Verticles
 
 int GSState::s_n = 0;
-int GSState::s_transfer_n = 0;
 
 static __fi bool IsAutoFlushEnabled()
 {
@@ -38,61 +37,14 @@ static __fi bool IsFirstProvokingVertex()
 	return (GSConfig.Renderer != GSRendererType::SW && !g_gs_device->Features().provoking_vertex_last);
 }
 
-constexpr int GSState::GetSaveStateSize()
-{
-	int size = 0;
-
-	size += sizeof(STATE_VERSION);
-	size += sizeof(m_env.PRIM);
-	size += sizeof(m_env.PRMODECONT);
-	size += sizeof(m_env.TEXCLUT);
-	size += sizeof(m_env.SCANMSK);
-	size += sizeof(m_env.TEXA);
-	size += sizeof(m_env.FOGCOL);
-	size += sizeof(m_env.DIMX);
-	size += sizeof(m_env.DTHE);
-	size += sizeof(m_env.COLCLAMP);
-	size += sizeof(m_env.PABE);
-	size += sizeof(m_env.BITBLTBUF);
-	size += sizeof(m_env.TRXDIR);
-	size += sizeof(m_env.TRXPOS);
-	size += sizeof(m_env.TRXREG);
-	size += sizeof(m_env.TRXREG); // obsolete
-
-	for (int i = 0; i < 2; i++)
-	{
-		size += sizeof(m_env.CTXT[i].XYOFFSET);
-		size += sizeof(m_env.CTXT[i].TEX0);
-		size += sizeof(m_env.CTXT[i].TEX1);
-		size += sizeof(m_env.CTXT[i].CLAMP);
-		size += sizeof(m_env.CTXT[i].MIPTBP1);
-		size += sizeof(m_env.CTXT[i].MIPTBP2);
-		size += sizeof(m_env.CTXT[i].SCISSOR);
-		size += sizeof(m_env.CTXT[i].ALPHA);
-		size += sizeof(m_env.CTXT[i].TEST);
-		size += sizeof(m_env.CTXT[i].FBA);
-		size += sizeof(m_env.CTXT[i].FRAME);
-		size += sizeof(m_env.CTXT[i].ZBUF);
-	}
-
-	size += sizeof(m_v.RGBAQ);
-	size += sizeof(m_v.ST);
-	size += sizeof(m_v.UV);
-	size += sizeof(m_v.FOG);
-	size += sizeof(m_v.XYZ);
-	size += sizeof(GIFReg); // obsolete
-
-	size += sizeof(m_tr.x);
-	size += sizeof(m_tr.y);
-	size += GSLocalMemory::m_vmsize;
-	size += (sizeof(GIFPath::tag) + sizeof(GIFPath::reg)) * 4 /* std::size(GSState::m_path) */; // std::size won't work without an instance.
-	size += sizeof(m_q);
-
-	return size;
-}
-
 GSState::GSState()
-	: m_vt(this, IsFirstProvokingVertex())
+	: m_version(STATE_VERSION)
+	, m_q(1.0f)
+	, m_scanmask_used(0)
+	, tex_flushed(true)
+	, m_vt(this, IsFirstProvokingVertex())
+	, m_regs(NULL)
+	, m_crc(0)
 {
 	// m_nativeres seems to be a hack. Unfortunately it impacts draw call number which make debug painful in the replayer.
 	// Let's keep it disabled to ease debug.
@@ -111,6 +63,54 @@ GSState::GSState()
 
 	m_draw_transfers.clear();
 
+	m_sssize = 0;
+
+	m_sssize += sizeof(m_version);
+	m_sssize += sizeof(m_env.PRIM);
+	m_sssize += sizeof(m_env.PRMODECONT);
+	m_sssize += sizeof(m_env.TEXCLUT);
+	m_sssize += sizeof(m_env.SCANMSK);
+	m_sssize += sizeof(m_env.TEXA);
+	m_sssize += sizeof(m_env.FOGCOL);
+	m_sssize += sizeof(m_env.DIMX);
+	m_sssize += sizeof(m_env.DTHE);
+	m_sssize += sizeof(m_env.COLCLAMP);
+	m_sssize += sizeof(m_env.PABE);
+	m_sssize += sizeof(m_env.BITBLTBUF);
+	m_sssize += sizeof(m_env.TRXDIR);
+	m_sssize += sizeof(m_env.TRXPOS);
+	m_sssize += sizeof(m_env.TRXREG);
+	m_sssize += sizeof(m_env.TRXREG); // obsolete
+
+	for (int i = 0; i < 2; i++)
+	{
+		m_sssize += sizeof(m_env.CTXT[i].XYOFFSET);
+		m_sssize += sizeof(m_env.CTXT[i].TEX0);
+		m_sssize += sizeof(m_env.CTXT[i].TEX1);
+		m_sssize += sizeof(m_env.CTXT[i].CLAMP);
+		m_sssize += sizeof(m_env.CTXT[i].MIPTBP1);
+		m_sssize += sizeof(m_env.CTXT[i].MIPTBP2);
+		m_sssize += sizeof(m_env.CTXT[i].SCISSOR);
+		m_sssize += sizeof(m_env.CTXT[i].ALPHA);
+		m_sssize += sizeof(m_env.CTXT[i].TEST);
+		m_sssize += sizeof(m_env.CTXT[i].FBA);
+		m_sssize += sizeof(m_env.CTXT[i].FRAME);
+		m_sssize += sizeof(m_env.CTXT[i].ZBUF);
+	}
+
+	m_sssize += sizeof(m_v.RGBAQ);
+	m_sssize += sizeof(m_v.ST);
+	m_sssize += sizeof(m_v.UV);
+	m_sssize += sizeof(m_v.FOG);
+	m_sssize += sizeof(m_v.XYZ);
+	m_sssize += sizeof(GIFReg); // obsolete
+
+	m_sssize += sizeof(m_tr.x);
+	m_sssize += sizeof(m_tr.y);
+	m_sssize += m_mem.m_vmsize;
+	m_sssize += (sizeof(m_path[0].tag) + sizeof(m_path[0].reg)) * std::size(m_path);
+	m_sssize += sizeof(m_q);
+
 	PRIM = &m_env.PRIM;
 	//CSR->rREV = 0x20;
 	m_env.PRMODECONT.AC = 1;
@@ -285,14 +285,6 @@ void GSState::ResetHandlers()
 	m_fpGIFRegHandlers[GIF_A_D_REG_LABEL] = &GSState::GIFRegHandlerNull;
 }
 
-void GSState::ResetPCRTC()
-{
-	PCRTCDisplays.SetVideoMode(GetVideoMode());
-	PCRTCDisplays.EnableDisplays(m_regs->PMODE, m_regs->SMODE2, isReallyInterlaced());
-	PCRTCDisplays.SetRects(0, m_regs->DISP[0].DISPLAY, m_regs->DISP[0].DISPFB);
-	PCRTCDisplays.SetRects(1, m_regs->DISP[1].DISPLAY, m_regs->DISP[1].DISPFB);
-}
-
 void GSState::UpdateSettings(const Pcsx2Config::GSOptions& old_config)
 {
 	m_mipmap = GSConfig.Mipmap;
@@ -348,6 +340,264 @@ GSVideoMode GSState::GetVideoMode()
 	__assume(0); // unreachable
 }
 
+bool GSState::IsAnalogue()
+{
+	return GetVideoMode() == GSVideoMode::NTSC || GetVideoMode() == GSVideoMode::PAL || GetVideoMode() == GSVideoMode::HDTV_1080I;
+}
+
+GSVector4i GSState::GetFrameMagnifiedRect(int i)
+{
+	GSVector4i rectangle = { 0, 0, 0, 0 };
+
+	if (!IsEnabled(i))
+		return rectangle;
+
+	const int videomode = static_cast<int>(GetVideoMode()) - 1;
+	const auto& DISP = m_regs->DISP[i].DISPLAY;
+	const bool ignore_offset = !GSConfig.PCRTCOffsets;
+
+	const u32 DW = DISP.DW + 1;
+	const u32 DH = DISP.DH + 1;
+;
+	// The number of sub pixels to draw are given in DH and DW, the MAGH/V relates to the size of the original square in the FB
+	// but the size it's drawn to uses the default size of the display mode (for PAL/NTSC this is a MAGH of 3)
+	// so for example a game will have a DW of 2559 and a MAGH of 4 to make it 512 (from the FB), but because it's drawing 2560 subpixels
+	// it will cover the entire 640 wide of the screen (2560 / (3+1)).
+	int width;
+	int height;
+	if (ignore_offset)
+	{
+		width = (DW / (DISP.MAGH + 1));
+		height = (DH / (DISP.MAGV + 1));
+	}
+	else
+	{
+		width = (DW / (VideoModeDividers[videomode].x + 1));
+		height = (DH / (VideoModeDividers[videomode].y + 1));
+	}
+
+	int res_multi = 1;
+
+	if (isinterlaced() && m_regs->SMODE2.FFMD && height > 1)
+		res_multi = 2;
+
+	// Set up the display rectangle based on the values obtained from DISPLAY registers
+	rectangle.right = width;
+	rectangle.bottom = height / res_multi;
+
+	return rectangle;
+}
+
+int GSState::GetDisplayHMagnification()
+{
+	// Pick one of the DISPLAY's and hope that they are both the same. Favour DISPLAY[1]
+	for (int i = 1; i >= 0; i--)
+	{
+		if (IsEnabled(i))
+			return m_regs->DISP[i].DISPLAY.MAGH + 1;
+	}
+
+	// If neither DISPLAY is enabled, fallback to resolution offset (should never happen)
+	const int videomode = static_cast<int>(GetVideoMode()) - 1;
+	return VideoModeDividers[videomode].x + 1;
+}
+
+GSVector4i GSState::GetDisplayRect(int i)
+{
+	GSVector4i rectangle = { 0, 0, 0, 0 };
+
+	if (i == -1)
+	{
+		return GetDisplayRect(0).runion(GetDisplayRect(1));
+	}
+
+	if (!IsEnabled(i))
+		return rectangle;
+
+	const auto& DISP = m_regs->DISP[i].DISPLAY;
+
+	const u32 DW = DISP.DW + 1;
+	const u32 DH = DISP.DH + 1;
+	const u32 MAGH = DISP.MAGH + 1;
+	const u32 MAGV = DISP.MAGV + 1;
+
+	const GSVector2i magnification(MAGH, MAGV);
+
+	const int width = DW / magnification.x;
+	const int height = DH / magnification.y;
+
+	const GSVector2i offsets = GetResolutionOffset(i);
+
+	// Set up the display rectangle based on the values obtained from DISPLAY registers
+	rectangle.left = offsets.x;
+	rectangle.top = offsets.y;
+
+	rectangle.right = rectangle.left + width;
+	rectangle.bottom = rectangle.top + height;
+
+	return rectangle;
+}
+
+GSVector2i GSState::GetResolutionOffset(int i)
+{
+	GSVector2i offset = { 0, 0 };
+
+	if (!IsEnabled(i))
+		return offset;
+
+	const int videomode = static_cast<int>(GetVideoMode()) - 1;
+	const auto& DISP = m_regs->DISP[i].DISPLAY;
+
+	const auto& SMODE2 = m_regs->SMODE2;
+	const int res_multi = (SMODE2.INT + 1);
+	const GSVector4i offsets = !GSConfig.PCRTCOverscan ? VideoModeOffsets[videomode] : VideoModeOffsetsOverscan[videomode];
+
+	offset.x = (static_cast<int>(DISP.DX) - offsets.z) / (VideoModeDividers[videomode].x + 1);
+	offset.y = (static_cast<int>(DISP.DY) - (offsets.w * ((IsAnalogue() && res_multi) ? res_multi : 1))) / (VideoModeDividers[videomode].y + 1);
+
+	return offset;
+}
+
+GSVector2i GSState::GetResolution()
+{
+	const int videomode = static_cast<int>(GetVideoMode()) - 1;
+	const bool ignore_offset = !GSConfig.PCRTCOffsets;
+
+	const GSVector4i offsets = !GSConfig.PCRTCOverscan ? VideoModeOffsets[videomode] : VideoModeOffsetsOverscan[videomode];
+
+	GSVector2i resolution(offsets.x, offsets.y);
+
+	// The resolution of the framebuffer is double when in FRAME mode and interlaced.
+	// Also we need a special check because no-interlace patches like to render in the original height, but in non-interlaced mode
+	// which means it would normally go off the bottom of the screen. Advantages of emulation, i guess... Limited to Ignore Offsets + Deinterlacing = Off.
+	if ((isinterlaced() && !m_regs->SMODE2.FFMD) || (GSConfig.InterlaceMode == GSInterlaceMode::Off && !GSConfig.PCRTCOffsets && !isinterlaced()))
+		resolution.y *= 2;
+
+	if (ignore_offset)
+	{
+		// Ideally we'd just cut the width at the resolution, but of course we have to hack the hack...
+		// Some games (Mortal Kombat Armageddon) render the image at 834 pixels then shrink it to 624 pixels
+		// which does fit, but when we ignore offsets we go on framebuffer size and some other games
+		// such as Johnny Mosleys Mad Trix and Transformers render too much but design it to go off the screen.
+		int magnified_width = (VideoModeDividers[videomode].z + 1) / GetDisplayHMagnification();
+
+		// When viewing overscan allow up to the overscan size
+		if (GSConfig.PCRTCOverscan)
+			magnified_width = std::max(magnified_width, offsets.x);
+
+		GSVector4i total_rect = GetDisplayRect(0).runion(GetDisplayRect(1));
+		total_rect.z = total_rect.z - total_rect.x;
+		total_rect.w = total_rect.w - total_rect.y;
+		total_rect.z = std::min(total_rect.z, magnified_width);
+		total_rect.w = std::min(total_rect.w, resolution.y);
+		resolution.x = total_rect.z;
+		resolution.y = total_rect.w;
+	}
+
+	return resolution;
+}
+
+GSVector4i GSState::GetFrameRect(int i, bool ignore_off)
+{
+	// If no specific context is requested then pass the merged rectangle as return value
+	if (i == -1)
+		return GetFrameRect(0, ignore_off).runion(GetFrameRect(1, ignore_off));
+
+	GSVector4i rectangle = { 0, 0, 0, 0 };
+
+	if (!IsEnabled(i))
+		return rectangle;
+
+	const auto& DISP = m_regs->DISP[i].DISPLAY;
+
+	const u32 DW = DISP.DW + 1;
+	const u32 DH = DISP.DH + 1;
+	const GSVector2i magnification(DISP.MAGH+1, DISP.MAGV + 1);
+
+	const u32 DBX = m_regs->DISP[i].DISPFB.DBX;
+	int DBY = m_regs->DISP[i].DISPFB.DBY;
+
+
+	const int w = DW / magnification.x;
+	const int h = DH / magnification.y;
+
+	// If the combined height overflows 2048, it's likely adding a bit of extra data before the picture for offsetting the interlace
+	// only game known to do this is NASCAR '08
+	if (!ignore_off && (DBY + h) >= 2048)
+		DBY = DBY - 2048;
+
+	rectangle.left = (ignore_off) ? 0 : DBX;
+	rectangle.top = (ignore_off) ? 0 : DBY;
+
+	rectangle.right = rectangle.left + w;
+	rectangle.bottom = rectangle.top + h;
+
+	if (isinterlaced() && m_regs->SMODE2.FFMD && h > 1)
+	{
+		rectangle.bottom += 1;
+		rectangle.bottom >>= 1;
+	}
+
+	return rectangle;
+}
+
+int GSState::GetFramebufferHeight()
+{
+	// Framebuffer height is 11 bits max
+	constexpr int height_limit = (1 << 11);
+
+	const GSVector4i disp1_rect = GetFrameRect(0, true);
+	const GSVector4i disp2_rect = GetFrameRect(1, true);
+	const GSVector4i combined = disp1_rect.runion(disp2_rect);
+
+	// DBY isn't an offset to the frame memory but rather an offset to read output circuit inside
+	// the frame memory, hence the top offset should also be calculated for the total height of the
+	// frame memory. Also we need to wrap the value only when we're dealing with values with range of the
+	// frame memory (offset + read output circuit height, IOW bottom of merged_output)
+	const int max_height = std::max(disp1_rect.height(), disp2_rect.height());
+	const int frame_memory_height = std::max(max_height, combined.bottom % height_limit);
+
+	if (frame_memory_height > 1024)
+		GL_PERF("Massive framebuffer height detected! (height:%d)", frame_memory_height);
+
+	return frame_memory_height;
+}
+
+int GSState::GetFramebufferBitDepth()
+{
+	if (IsEnabled(0))
+		return GSLocalMemory::m_psm[m_regs->DISP[0].DISPFB.PSM].bpp;
+	else if (IsEnabled(1))
+		return GSLocalMemory::m_psm[m_regs->DISP[1].DISPFB.PSM].bpp;
+
+	return 32;
+}
+
+int GSState::GetFramebufferWidth()
+{
+	const GSVector4i disp1_rect = GetFrameRect(0, true);
+	const GSVector4i disp2_rect = GetFrameRect(1, true);
+
+	const int max_width = std::max(disp1_rect.width(), disp2_rect.width());
+
+	return max_width;
+}
+
+bool GSState::IsEnabled(int i)
+{
+	ASSERT(i >= 0 && i < 2);
+
+	const auto& DISP = m_regs->DISP[i].DISPLAY;
+
+	const bool disp1_enabled = m_regs->PMODE.EN1;
+	const bool disp2_enabled = m_regs->PMODE.EN2;
+
+	if ((i == 0 && disp1_enabled) || (i == 1 && disp2_enabled))
+		return DISP.DW && DISP.DH;
+
+	return false;
+}
+
 float GSState::GetTvRefreshRate()
 {
 	const GSVideoMode videomode = GetVideoMode();
@@ -1521,7 +1771,6 @@ void GSState::FlushWrite()
 	m_tr.start += len;
 
 	g_perfmon.Put(GSPerfMon::Swizzle, len);
-	s_transfer_n++;
 }
 
 // This function decides if the context has changed in a way which warrants flushing the draw.
@@ -1758,18 +2007,14 @@ void GSState::Write(const u8* mem, int len)
 	// Invalid the CLUT if it crosses paths.
 	m_mem.m_clut.InvalidateRange(write_start_bp, write_end_bp);
 
-	GSVector4i r;
-
-	r.left = m_env.TRXPOS.DSAX;
-	r.top = m_env.TRXPOS.DSAY;
-	r.right = r.left + m_env.TRXREG.RRW;
-	r.bottom = r.top + m_env.TRXREG.RRH;
-
-	// Store the transfer for preloading new RT's.
-	if (m_draw_transfers.size() == 0 || (m_draw_transfers.size() > 0 && blit.DBP != m_draw_transfers.back().blit.DBP))
+	if (GSConfig.PreloadFrameWithGSData)
 	{
-		GSUploadQueue new_transfer = { blit, r, s_n };
-		m_draw_transfers.push_back(new_transfer);
+		// Store the transfer for preloading new RT's.
+		if (m_draw_transfers.size() == 0 || (m_draw_transfers.size() > 0 && blit.DBP != m_draw_transfers.back().blit.DBP))
+		{
+			GSUploadQueue new_transfer = { blit, s_n };
+			m_draw_transfers.push_back(new_transfer);
+		}
 	}
 
 	GL_CACHE("Write! ...  => 0x%x W:%d F:%s (DIR %d%d), dPos(%d %d) size(%d %d)",
@@ -1780,6 +2025,12 @@ void GSState::Write(const u8* mem, int len)
 	if (m_tr.end == 0 && len >= m_tr.total)
 	{
 		// received all data in one piece, no need to buffer it
+		GSVector4i r;
+
+		r.left = m_env.TRXPOS.DSAX;
+		r.top = m_env.TRXPOS.DSAY;
+		r.right = r.left + m_env.TRXREG.RRW;
+		r.bottom = r.top + m_env.TRXREG.RRH;
 		ExpandTarget(m_env.BITBLTBUF, r);
 		InvalidateVideoMem(blit, r, true);
 
@@ -1788,7 +2039,6 @@ void GSState::Write(const u8* mem, int len)
 		m_tr.start = m_tr.end = m_tr.total;
 
 		g_perfmon.Put(GSPerfMon::Swizzle, len);
-		s_transfer_n++;
 	}
 	else
 	{
@@ -1855,7 +2105,6 @@ void GSState::Move()
 {
 	// ffxii uses this to move the top/bottom of the scrolling menus offscreen and then blends them back over the text to create a shading effect
 	// guitar hero copies the far end of the board to do a similar blend too
-	s_transfer_n++;
 
 	int sx = m_env.TRXPOS.SSAX;
 	int sy = m_env.TRXPOS.SSAY;
@@ -1915,20 +2164,15 @@ void GSState::Move()
 		Flush(GSFlushReason::LOCALTOLOCALMOVE);
 	}
 
-	// Store the transfer for preloading new RT's.
-	if (m_draw_transfers.size() == 0 || (m_draw_transfers.size() > 0 && dbp != m_draw_transfers.back().blit.DBP))
+	if (GSConfig.PreloadFrameWithGSData)
 	{
-		GSVector4i r;
-
-		r.left = m_env.TRXPOS.DSAX;
-		r.top = m_env.TRXPOS.DSAY;
-		r.right = r.left + m_env.TRXREG.RRW;
-		r.bottom = r.top + m_env.TRXREG.RRH;
-
-		GSUploadQueue new_transfer = { m_env.BITBLTBUF, r, s_n };
-		m_draw_transfers.push_back(new_transfer);
+		// Store the transfer for preloading new RT's.
+		if (m_draw_transfers.size() == 0 || (m_draw_transfers.size() > 0 && dbp != m_draw_transfers.back().blit.DBP))
+		{
+			GSUploadQueue new_transfer = { m_env.BITBLTBUF, s_n };
+			m_draw_transfers.push_back(new_transfer);
+		}
 	}
-
 	// Invalid the CLUT if it crosses paths.
 	m_mem.m_clut.InvalidateRange(write_start_bp, write_end_bp);
 
@@ -2336,19 +2580,18 @@ int GSState::Freeze(freezeData* fd, bool sizeonly)
 {
 	if (sizeonly)
 	{
-		fd->size = GetSaveStateSize();
+		fd->size = m_sssize;
 		return 0;
 	}
 
-	if (!fd->data || fd->size < GetSaveStateSize())
+	if (!fd->data || fd->size < m_sssize)
 		return -1;
 
 	Flush(GSFlushReason::SAVESTATE);
 
 	u8* data = fd->data;
-	const u32 version = STATE_VERSION;
 
-	WriteState(data, &version);
+	WriteState(data, &m_version);
 	WriteState(data, &m_env.PRIM);
 	WriteState(data, &m_env.PRMODECONT);
 	WriteState(data, &m_env.TEXCLUT);
@@ -2416,7 +2659,7 @@ int GSState::Defrost(const freezeData* fd)
 	if (!fd || !fd->data || fd->size == 0)
 		return -1;
 
-	if (fd->size < GetSaveStateSize())
+	if (fd->size < m_sssize)
 		return -1;
 
 	u8* data = fd->data;
@@ -2425,7 +2668,7 @@ int GSState::Defrost(const freezeData* fd)
 
 	ReadState(&version, data);
 
-	if (version > STATE_VERSION)
+	if (version > m_version)
 	{
 		Console.Error("GS: Savestate version is incompatible.  Load aborted.");
 		return -1;
@@ -2532,8 +2775,6 @@ int GSState::Defrost(const freezeData* fd)
 
 	g_perfmon.SetFrame(5000);
 
-	ResetPCRTC();
-
 	return 0;
 }
 
@@ -2923,7 +3164,7 @@ __forceinline void GSState::HandleAutoFlush()
 
 				const GSVector2i offset = GSVector2i(m_context->XYOFFSET.OFX, m_context->XYOFFSET.OFY);
 				const GSVector4i scissor = GSVector4i(m_context->scissor.in);
-				GSVector4i old_tex_rect = GSVector4i::zero();
+				GSVector4i old_tex_rect = GSVector4i(0, 0, 0, 0);
 				int current_draw_end = m_index.tail;
 
 				while (current_draw_end >= n)
@@ -3276,6 +3517,13 @@ __forceinline void GSState::VertexKick(u32 skip)
 	}
 
 	CLUTAutoFlush(prim);
+
+	if (GSLocalMemory::m_psm[m_prev_env.CTXT[m_prev_env.PRIM.CTXT].FRAME.PSM].bpp == 16 && GSLocalMemory::m_psm[m_prev_env.CTXT[m_prev_env.PRIM.CTXT].TEX0.PSM].bpp == 16
+		&& m_prev_env.CTXT[m_prev_env.PRIM.CTXT].FRAME.FBMSK == 0x3FFF && m_prev_env.CTXT[m_prev_env.PRIM.CTXT].ALPHA.IsOpaque())
+	{
+		DevCon.Warning("Shuffle flush %d", s_n+1);
+		Flush(AUTOFLUSH);
+	}
 }
 
 /// Checks if region repeat is used (applying it does something to at least one of the values in min...max)
@@ -3857,6 +4105,9 @@ GIFRegTEX0 GSState::GetTex0Layer(u32 lod)
 
 GSState::GSTransferBuffer::GSTransferBuffer()
 {
+	x = y = 0;
+	start = end = total = 0;
+
 	constexpr size_t alloc_size = 1024 * 1024 * 4;
 	buff = reinterpret_cast<u8*>(_aligned_malloc(alloc_size, 32));
 }

pcsx2/GS/GSState.h

@@ -35,15 +35,13 @@ public:
 	GSState();
 	virtual ~GSState();
 
-	static constexpr int GetSaveStateSize();
-
 private:
 	// RESTRICT prevents multiple loads of the same part of the register when accessing its bitfields (the compiler is happy to know that memory writes in-between will not go there)
 
 	typedef void (GSState::*GIFPackedRegHandler)(const GIFPackedReg* RESTRICT r);
 
-	GIFPackedRegHandler m_fpGIFPackedRegHandlers[16] = {};
-	GIFPackedRegHandler m_fpGIFPackedRegHandlerXYZ[8][4] = {};
+	GIFPackedRegHandler m_fpGIFPackedRegHandlers[16];
+	GIFPackedRegHandler m_fpGIFPackedRegHandlerXYZ[8][4];
 
 	void CheckFlushes();
 
@@ -60,14 +58,14 @@ private:
 
 	typedef void (GSState::*GIFRegHandler)(const GIFReg* RESTRICT r);
 
-	GIFRegHandler m_fpGIFRegHandlers[256] = {};
-	GIFRegHandler m_fpGIFRegHandlerXYZ[8][4] = {};
+	GIFRegHandler m_fpGIFRegHandlers[256];
+	GIFRegHandler m_fpGIFRegHandlerXYZ[8][4];
 
 	typedef void (GSState::*GIFPackedRegHandlerC)(const GIFPackedReg* RESTRICT r, u32 size);
 
-	GIFPackedRegHandlerC m_fpGIFPackedRegHandlersC[2] = {};
-	GIFPackedRegHandlerC m_fpGIFPackedRegHandlerSTQRGBAXYZF2[8] = {};
-	GIFPackedRegHandlerC m_fpGIFPackedRegHandlerSTQRGBAXYZ2[8] = {};
+	GIFPackedRegHandlerC m_fpGIFPackedRegHandlersC[2];
+	GIFPackedRegHandlerC m_fpGIFPackedRegHandlerSTQRGBAXYZF2[8];
+	GIFPackedRegHandlerC m_fpGIFPackedRegHandlerSTQRGBAXYZ2[8];
 
 	template<u32 prim, bool auto_flush, bool index_swap> void GIFPackedRegHandlerSTQRGBAXYZF2(const GIFPackedReg* RESTRICT r, u32 size);
 	template<u32 prim, bool auto_flush, bool index_swap> void GIFPackedRegHandlerSTQRGBAXYZ2(const GIFPackedReg* RESTRICT r, u32 size);
@@ -119,12 +117,15 @@ private:
 	template<bool auto_flush, bool index_swap>
 	void SetPrimHandlers();
 
+	u32 m_version;
+	int m_sssize;
+
 	struct GSTransferBuffer
 	{
-		int x = 0, y = 0;
-		int start = 0, end = 0, total = 0;
-		u8* buff = nullptr;
-		GIFRegBITBLTBUF m_blit = {};
+		int x, y;
+		int start, end, total;
+		u8* buff;
+		GIFRegBITBLTBUF m_blit;
 
 		GSTransferBuffer();
 		virtual ~GSTransferBuffer();
@@ -138,14 +139,14 @@ private:
 	void CalcAlphaMinMax();
 
 protected:
-	GSVertex m_v = {};
-	float m_q = 1.0f;
-	GSVector4i m_scissor = {};
-	GSVector4i m_ofxy = {};
+	GSVertex m_v;
+	float m_q;
+	GSVector4i m_scissor;
+	GSVector4i m_ofxy;
 
-	u8 m_scanmask_used = 0;
-	bool tex_flushed = true;
-	bool m_isPackedUV_HackFlag = false;
+	u8 m_scanmask_used;
+	bool tex_flushed;
+	bool m_isPackedUV_HackFlag;
 
 	struct
 	{
@@ -153,13 +154,13 @@ protected:
 		u32 head, tail, next, maxcount; // head: first vertex, tail: last vertex + 1, next: last indexed + 1
 		u32 xy_tail;
 		u64 xy[4];
-	} m_vertex = {};
+	} m_vertex;
 
 	struct
 	{
 		u32* buff;
 		u32 tail;
-	} m_index = {};
+	} m_index;
 
 	void UpdateContext();
 	void UpdateScissor();
@@ -209,31 +210,29 @@ public:
 	struct GSUploadQueue
 	{
 		GIFRegBITBLTBUF blit;
-		GSVector4i rect;
 		int draw;
 	};
 
-	GIFPath m_path[4] = {};
-	GIFRegPRIM* PRIM = nullptr;
-	GSPrivRegSet* m_regs = nullptr;
+	GIFPath m_path[4];
+	GIFRegPRIM* PRIM;
+	GSPrivRegSet* m_regs;
 	GSLocalMemory m_mem;
-	GSDrawingEnvironment m_env = {};
-	GSDrawingEnvironment m_backup_env = {};
-	GSDrawingEnvironment m_prev_env = {};
-	GSVector4i temp_draw_rect = {};
-	GSDrawingContext* m_context = nullptr;
-	u32 m_crc = 0;
-	CRC::Game m_game = {};
+	GSDrawingEnvironment m_env;
+	GSDrawingEnvironment m_backup_env;
+	GSDrawingEnvironment m_prev_env;
+	GSVector4i temp_draw_rect;
+	GSDrawingContext* m_context;
+	u32 m_crc;
+	CRC::Game m_game;
 	std::unique_ptr<GSDumpBase> m_dump;
-	bool m_nativeres = false;
-	bool m_mipmap = false;
-	u8 m_force_preload = 0;
-	u32 m_dirty_gs_regs = 0;
-	int m_backed_up_ctx = 0;
+	bool m_nativeres;
+	bool m_mipmap;
+	u32 m_dirty_gs_regs;
+	int m_backed_up_ctx;
 	std::vector<GSUploadQueue> m_draw_transfers;
+	bool m_force_preload;
 
 	static int s_n;
-	static int s_transfer_n;
 
 	static constexpr u32 STATE_VERSION = 8;
 
@@ -279,7 +278,7 @@ public:
 		GSREOPEN = 1 << 13,
 	};
 
-	GSFlushReason m_state_flush_reason = UNKNOWN;
+	GSFlushReason m_state_flush_reason;
 
 	enum PRIM_OVERLAP
 	{
@@ -288,562 +287,62 @@ public:
 		PRIM_OVERLAP_NO
 	};
 
-	PRIM_OVERLAP m_prim_overlap = PRIM_OVERLAP_UNKNOW;
+	PRIM_OVERLAP m_prim_overlap;
 	std::vector<size_t> m_drawlist;
 
-	struct GSPCRTCRegs
-	{
-		// The horizontal offset values (under z) for PAL and NTSC have been tweaked
-		// they should be apparently 632 and 652 respectively, but that causes a thick black line on the left
-		// these values leave a small black line on the right in a bunch of games, but it's not so bad.
-		// The only conclusion I can come to is there is horizontal overscan expected so there would normally
-		// be black borders either side anyway, or both sides slightly covered.
-		static inline constexpr GSVector4i VideoModeOffsets[6] = {
-			GSVector4i::cxpr(640, 224, 642, 25),
-			GSVector4i::cxpr(640, 256, 676, 36),
-			GSVector4i::cxpr(640, 480, 276, 34),
-			GSVector4i::cxpr(720, 480, 232, 35),
-			GSVector4i::cxpr(1280, 720, 302, 24),
-			GSVector4i::cxpr(1920, 540, 238, 40)
-		};
-
-		static inline constexpr GSVector4i VideoModeOffsetsOverscan[6] = {
-			GSVector4i::cxpr(711, 243, 498, 12),
-			GSVector4i::cxpr(702, 288, 532, 18),
-			GSVector4i::cxpr(640, 480, 276, 34),
-			GSVector4i::cxpr(720, 480, 232, 35),
-			GSVector4i::cxpr(1280, 720, 302, 24),
-			GSVector4i::cxpr(1920, 540, 238, 40)
-		};
-
-		static inline constexpr GSVector4i VideoModeDividers[6] = {
-			GSVector4i::cxpr(3, 0, 2559, 239),
-			GSVector4i::cxpr(3, 0, 2559, 287),
-			GSVector4i::cxpr(1, 0, 1279, 479),
-			GSVector4i::cxpr(1, 0, 1439, 479),
-			GSVector4i::cxpr(0, 0, 1279, 719),
-			GSVector4i::cxpr(0, 0, 1919, 1079)
-		};
-
-		struct PCRTCDisplay
-		{
-			bool enabled;
-			int FBP;
-			int FBW;
-			int PSM;
-			GSRegDISPFB prevFramebufferReg;
-			GSVector2i prevDisplayOffset;
-			GSVector2i displayOffset;
-			GSVector4i displayRect;
-			GSVector2i magnification;
-			GSVector2i prevFramebufferOffsets;
-			GSVector2i framebufferOffsets;
-			GSVector4i framebufferRect;
-
-			int Block()
-			{
-				return FBP << 5;
-			}
-		};
-
-		int videomode = 0;
-		int interlaced = 0;
-		int FFMD = 0;
-		bool PCRTCSameSrc = false;
-		bool toggling_field = false;
-		PCRTCDisplay PCRTCDisplays[2] = {};
-
-		bool IsAnalogue()
-		{
-			const GSVideoMode video = static_cast<GSVideoMode>(videomode + 1);
-			return video == GSVideoMode::NTSC || video == GSVideoMode::PAL || video == GSVideoMode::HDTV_1080I;
-		}
-
-		// Calculates which display is closest to matching zero offsets in either direction.
-		GSVector2i NearestToZeroOffset()
-		{
-			GSVector2i returnValue = { 1, 1 };
-
-			if (!PCRTCDisplays[0].enabled && !PCRTCDisplays[1].enabled)
-				return returnValue;
-
-			for (int i = 0; i < 2; i++)
-			{
-				if (!PCRTCDisplays[i].enabled)
-				{
-					returnValue.x = 1 - i;
-					returnValue.y = 1 - i;
-					return returnValue;
-				}
-			}
-
-			if (abs(PCRTCDisplays[0].displayOffset.x - VideoModeOffsets[videomode].z) <
-				abs(PCRTCDisplays[1].displayOffset.x - VideoModeOffsets[videomode].z))
-				returnValue.x = 0;
-
-			// When interlaced, the vertical base offset is doubled
-			const int verticalOffset = VideoModeOffsets[videomode].w * (1 << interlaced);
-
-			if (abs(PCRTCDisplays[0].displayOffset.y - verticalOffset) <
-				abs(PCRTCDisplays[1].displayOffset.y - verticalOffset))
-				returnValue.y = 0;
-
-			return returnValue;
-		}
-
-		void SetVideoMode(GSVideoMode videoModeIn)
-		{
-			videomode = static_cast<int>(videoModeIn) - 1;
-		}
-
-		// Enable each of the displays.
-		void EnableDisplays(GSRegPMODE pmode, GSRegSMODE2 smode2, bool smodetoggle)
-		{
-			PCRTCDisplays[0].enabled = pmode.EN1;
-			PCRTCDisplays[1].enabled = pmode.EN2;
-
-			interlaced = smode2.INT && IsAnalogue();
-			FFMD = smode2.FFMD;
-			toggling_field = smodetoggle && IsAnalogue();
-		}
-
-		void CheckSameSource()
-		{
-			if (PCRTCDisplays[0].enabled != PCRTCDisplays[1].enabled || (PCRTCDisplays[0].enabled | PCRTCDisplays[1].enabled) == false)
-			{
-				PCRTCSameSrc = false;
-				return;
-			}
-
-			PCRTCSameSrc = PCRTCDisplays[0].FBP == PCRTCDisplays[1].FBP &&
-			PCRTCDisplays[0].FBW == PCRTCDisplays[1].FBW &&
-			GSUtil::HasCompatibleBits(PCRTCDisplays[0].PSM, PCRTCDisplays[1].PSM);
-		}
-		
-		bool FrameWrap()
-		{
-			const GSVector4i combined_rect = GSVector4i(PCRTCDisplays[0].framebufferRect.runion(PCRTCDisplays[1].framebufferRect));
-			return combined_rect.w >= 2048 || combined_rect.z >= 2048;
-		}
-
-		// If the start point of both frames match, we can do a single read
-		bool FrameRectMatch()
-		{
-			return PCRTCSameSrc;
-		}
-
-		GSVector2i GetResolution()
-		{
-			GSVector2i resolution;
-
-			const GSVector4i offsets = !GSConfig.PCRTCOverscan ? VideoModeOffsets[videomode] : VideoModeOffsetsOverscan[videomode];
-			const bool is_full_height = interlaced || (toggling_field && GSConfig.InterlaceMode != GSInterlaceMode::Off) || GSConfig.InterlaceMode == GSInterlaceMode::Off;
-
-			if (!GSConfig.PCRTCOffsets)
-			{
-				if (PCRTCDisplays[0].enabled && PCRTCDisplays[1].enabled)
-				{
-					const GSVector4i combined_size = PCRTCDisplays[0].displayRect.runion(PCRTCDisplays[1].displayRect);
-					resolution = { combined_size.width(), combined_size.height() };
-				}
-				else if (PCRTCDisplays[0].enabled)
-				{
-					resolution = { PCRTCDisplays[0].displayRect.width(), PCRTCDisplays[0].displayRect.height() };
-				}
-				else
-				{
-					resolution = { PCRTCDisplays[1].displayRect.width(), PCRTCDisplays[1].displayRect.height() };
-				}
-			}
-			else
-			{
-				const int shift = is_full_height ? 1 : 0;
-				resolution = { offsets.x, offsets.y << shift };
-			}
-
-			resolution.x = std::min(resolution.x, offsets.x);
-			resolution.y = std::min(resolution.y, is_full_height ? offsets.y << 1 : offsets.y);
-
-			return resolution;
-		}
-
-		GSVector4i GetFramebufferRect(int display)
-		{
-			if (display == -1)
-			{
-				return GSVector4i(PCRTCDisplays[0].framebufferRect.runion(PCRTCDisplays[1].framebufferRect));
-			}
-			else
-			{
-				return PCRTCDisplays[display].framebufferRect;
-			}
-		}
-
-		int GetFramebufferBitDepth()
-		{
-			if (PCRTCDisplays[0].enabled)
-				return GSLocalMemory::m_psm[PCRTCDisplays[0].PSM].bpp;
-			else if (PCRTCDisplays[1].enabled)
-				return GSLocalMemory::m_psm[PCRTCDisplays[1].PSM].bpp;
-
-			return 32;
-		}
-
-		GSVector2i GetFramebufferSize(int display)
-		{
-			int max_height = VideoModeOffsets[videomode].y;
-
-			if (!(FFMD && interlaced))
-			{
-				max_height *= 2;
-			}
-
-			if (display == -1)
-			{
-				GSVector4i combined_rect = PCRTCDisplays[0].framebufferRect.runion(PCRTCDisplays[1].framebufferRect);
-
-				if (combined_rect.z >= 2048)
-				{
-					const int high_x = (PCRTCDisplays[0].framebufferRect.x > PCRTCDisplays[1].framebufferRect.x) ? PCRTCDisplays[0].framebufferRect.x : PCRTCDisplays[1].framebufferRect.x;
-					combined_rect.z -= GSConfig.UseHardwareRenderer() ? 2048 : high_x;
-					combined_rect.x = 0;
-				}
-
-				if (combined_rect.w >= 2048)
-				{
-					const int high_y = (PCRTCDisplays[0].framebufferRect.y > PCRTCDisplays[1].framebufferRect.y) ? PCRTCDisplays[0].framebufferRect.y : PCRTCDisplays[1].framebufferRect.y;
-					combined_rect.w -= GSConfig.UseHardwareRenderer() ? 2048 : high_y;
-					combined_rect.y = 0;
-				}
-
-				// Cap the framebuffer read to the maximum display height, otherwise the hardware renderer gets messy.
-				const int min_mag = std::max(1, std::min(PCRTCDisplays[0].magnification.y, PCRTCDisplays[1].magnification.y));
-				combined_rect.w = std::min(combined_rect.w, combined_rect.y + (max_height / min_mag));
-				return GSVector2i(combined_rect.z, combined_rect.w);
-			}
-			else
-			{
-				GSVector4i out_rect = PCRTCDisplays[display].framebufferRect;
-
-				if (out_rect.z >= 2048)
-				{
-					out_rect.z -= GSConfig.UseHardwareRenderer() ? 2048 : out_rect.x;
-					out_rect.x = 0;
-				}
-
-				if (out_rect.w >= 2048)
-				{
-					out_rect.w -= GSConfig.UseHardwareRenderer() ? 2048 : out_rect.y;
-					out_rect.y = 0;
-				}
-
-				// Cap the framebuffer read to the maximum display height, otherwise the hardware renderer gets messy.
-				out_rect.w = std::min(out_rect.w, out_rect.y + (max_height * PCRTCDisplays[display].magnification.y));
-				return GSVector2i(out_rect.z, out_rect.w);
-			}
-		}
-
-		// Sets up the rectangles for both the framebuffer read and the displays for the merge circuit.
-		void SetRects(int display, GSRegDISPLAY displayReg, GSRegDISPFB framebufferReg)
-		{
-			// Save framebuffer information first, while we're here.
-			PCRTCDisplays[display].FBP = framebufferReg.FBP;
-			PCRTCDisplays[display].FBW = framebufferReg.FBW;
-			PCRTCDisplays[display].PSM = framebufferReg.PSM;
-			PCRTCDisplays[display].prevFramebufferReg = framebufferReg;
-			// Probably not really enabled but will cause a mess.
-			// Q-Ball Billiards enables both circuits but doesn't set one of them up.
-			if (PCRTCDisplays[display].FBW == 0 && displayReg.DW == 0 && displayReg.DH == 0 && displayReg.MAGH == 0)
-			{
-				PCRTCDisplays[display].enabled = false;
-				return;
-			}
-			PCRTCDisplays[display].magnification = GSVector2i(displayReg.MAGH + 1, displayReg.MAGV + 1);
-			const u32 DW = displayReg.DW + 1;
-			const u32 DH = displayReg.DH + 1;
-
-			const int renderWidth = DW / PCRTCDisplays[display].magnification.x;
-			const int renderHeight = DH / PCRTCDisplays[display].magnification.y;
-
-			u32 finalDisplayWidth = renderWidth;
-			u32 finalDisplayHeight = renderHeight;
-			// When using screen offsets the screen gets squashed/resized in to the actual screen size.
-			if (GSConfig.PCRTCOffsets)
-			{
-				finalDisplayWidth = DW / (VideoModeDividers[videomode].x + 1);
-				finalDisplayHeight = DH / (VideoModeDividers[videomode].y + 1);
-			}
-			else
-			{
-				finalDisplayWidth = std::min(finalDisplayWidth ,DW / (VideoModeDividers[videomode].x + 1));
-				finalDisplayHeight = std::min(finalDisplayHeight, DH / (VideoModeDividers[videomode].y + 1));
-			}
-
-			// Framebuffer size and offsets.
-			PCRTCDisplays[display].prevFramebufferOffsets = PCRTCDisplays[display].framebufferOffsets;
-			PCRTCDisplays[display].framebufferRect.x = 0;
-			PCRTCDisplays[display].framebufferRect.y = 0;
-			PCRTCDisplays[display].framebufferRect.z = renderWidth;
-
-			if(FFMD && interlaced) // Round up the height as if it's an odd value, this will cause havok with the merge circuit.
-				PCRTCDisplays[display].framebufferRect.w = (renderHeight + 1) >> (FFMD * interlaced); // Half height read if FFMD + INT enabled.
-			else
-				PCRTCDisplays[display].framebufferRect.w = renderHeight;
-			PCRTCDisplays[display].framebufferOffsets.x = framebufferReg.DBX;
-			PCRTCDisplays[display].framebufferOffsets.y = framebufferReg.DBY;
-
-			const bool is_interlaced_resolution = interlaced || (toggling_field && GSConfig.InterlaceMode != GSInterlaceMode::Off);
-
-			// If the interlace flag isn't set, but it's still interlacing, the height is likely reported wrong.
-			// Q-Ball Billiards.
-			if (is_interlaced_resolution && !interlaced)
-				finalDisplayHeight *= 2;
-
-			// Display size and offsets.
-			PCRTCDisplays[display].displayRect.x = 0;
-			PCRTCDisplays[display].displayRect.y = 0;
-			PCRTCDisplays[display].displayRect.z = finalDisplayWidth;
-			PCRTCDisplays[display].displayRect.w = finalDisplayHeight;
-			PCRTCDisplays[display].prevDisplayOffset = PCRTCDisplays[display].displayOffset;
-			PCRTCDisplays[display].displayOffset.x = displayReg.DX;
-			PCRTCDisplays[display].displayOffset.y = displayReg.DY;
-		}
-
-		// Calculate framebuffer read offsets, should be considered if only one circuit is enabled, or difference is more than 1 line.
-		// Only considered if "Anti-blur" is enabled.
-		void CalculateFramebufferOffset()
-		{
-			if (GSConfig.PCRTCAntiBlur && PCRTCSameSrc)
-			{
-				if (abs(PCRTCDisplays[1].framebufferOffsets.y - PCRTCDisplays[0].framebufferOffsets.y) == 1
-					&& PCRTCDisplays[0].displayRect.y == PCRTCDisplays[1].displayRect.y)
-				{
-					if (PCRTCDisplays[1].framebufferOffsets.y < PCRTCDisplays[0].framebufferOffsets.y)
-						PCRTCDisplays[0].framebufferOffsets.y = PCRTCDisplays[1].framebufferOffsets.y;
-					else
-						PCRTCDisplays[1].framebufferOffsets.y = PCRTCDisplays[0].framebufferOffsets.y;
-				}
-				if (abs(PCRTCDisplays[1].framebufferOffsets.x - PCRTCDisplays[0].framebufferOffsets.x) == 1
-					&& PCRTCDisplays[0].displayRect.x == PCRTCDisplays[1].displayRect.x)
-				{
-					if (PCRTCDisplays[1].framebufferOffsets.x < PCRTCDisplays[0].framebufferOffsets.x)
-						PCRTCDisplays[0].framebufferOffsets.x = PCRTCDisplays[1].framebufferOffsets.x;
-					else
-						PCRTCDisplays[1].framebufferOffsets.x = PCRTCDisplays[0].framebufferOffsets.x;
-				}
-			}
-			PCRTCDisplays[0].framebufferRect.x += PCRTCDisplays[0].framebufferOffsets.x;
-			PCRTCDisplays[0].framebufferRect.z += PCRTCDisplays[0].framebufferOffsets.x;
-			PCRTCDisplays[0].framebufferRect.y += PCRTCDisplays[0].framebufferOffsets.y;
-			PCRTCDisplays[0].framebufferRect.w += PCRTCDisplays[0].framebufferOffsets.y;
-
-			PCRTCDisplays[1].framebufferRect.x += PCRTCDisplays[1].framebufferOffsets.x;
-			PCRTCDisplays[1].framebufferRect.z += PCRTCDisplays[1].framebufferOffsets.x;
-			PCRTCDisplays[1].framebufferRect.y += PCRTCDisplays[1].framebufferOffsets.y;
-			PCRTCDisplays[1].framebufferRect.w += PCRTCDisplays[1].framebufferOffsets.y;
-		}
-
-		// Used in software mode to align the buffer when reading. Offset is accounted for (block aligned) by GetOutput.
-		void RemoveFramebufferOffset(int display)
-		{
-			if (display >= 0)
-			{
-				// Hardware needs nothing but handling for wrapped framebuffers.
-				if (GSConfig.UseHardwareRenderer())
-				{
-					if (PCRTCDisplays[display].framebufferRect.z >= 2048)
-					{
-						PCRTCDisplays[display].framebufferRect.x = 0;
-						PCRTCDisplays[display].framebufferRect.z -= 2048;
-					}
-					if (PCRTCDisplays[display].framebufferRect.w >= 2048)
-					{
-						PCRTCDisplays[display].framebufferRect.y = 0;
-						PCRTCDisplays[display].framebufferRect.w -= 2048;
-					}
-				}
-				else
-				{
-					const GSLocalMemory::psm_t& psm = GSLocalMemory::m_psm[PCRTCDisplays[display].PSM];
-
-					// Software mode - See note below.
-					GSVector4i r = PCRTCDisplays[display].framebufferRect;
-					r = r.ralign<Align_Outside>(psm.bs);
-
-					PCRTCDisplays[display].framebufferRect.z -= r.x;
-					PCRTCDisplays[display].framebufferRect.w -= r.y;
-					PCRTCDisplays[display].framebufferRect.x -= r.x;
-					PCRTCDisplays[display].framebufferRect.y -= r.y;
-				}
-			}
-			else
-			{
-				// Software Mode Note:
-				// This code is to read the framebuffer nicely block aligned in software, then leave the remaining offset in to the block.
-				// In hardware mode this doesn't happen, it reads the whole framebuffer, so we need to keep the offset.
-				if (!GSConfig.UseHardwareRenderer())
-				{
-					const GSLocalMemory::psm_t& psm = GSLocalMemory::m_psm[PCRTCDisplays[1].PSM];
-
-					GSVector4i r = PCRTCDisplays[0].framebufferRect.runion(PCRTCDisplays[1].framebufferRect);
-					r = r.ralign<Align_Outside>(psm.bs);
-
-					PCRTCDisplays[0].framebufferRect.x -= r.x;
-					PCRTCDisplays[0].framebufferRect.y -= r.y;
-					PCRTCDisplays[0].framebufferRect.z -= r.x;
-					PCRTCDisplays[0].framebufferRect.w -= r.y;
-					PCRTCDisplays[1].framebufferRect.x -= r.x;
-					PCRTCDisplays[1].framebufferRect.y -= r.y;
-					PCRTCDisplays[1].framebufferRect.z -= r.x;
-					PCRTCDisplays[1].framebufferRect.w -= r.y;
-				}
-			}
-		}
-
-		// If the two displays are offset from each other, move them to the correct offsets.
-		// If using screen offsets, calculate the positions here.
-		void CalculateDisplayOffset(bool scanmask)
-		{
-			const bool both_enabled = PCRTCDisplays[0].enabled && PCRTCDisplays[1].enabled;
-			// Offsets are generally ignored, the "hacky" way of doing the displays, but direct to framebuffers.
-			if (!GSConfig.PCRTCOffsets)
-			{
-				const GSVector4i offsets = !GSConfig.PCRTCOverscan ? VideoModeOffsets[videomode] : VideoModeOffsetsOverscan[videomode];
-				int int_off[2] = { 0, 0 };
-				GSVector2i zeroDisplay = NearestToZeroOffset();
-				GSVector2i baseOffset = PCRTCDisplays[zeroDisplay.y].displayOffset;
-
-				if (both_enabled)
-				{
-					int blurOffset = abs(PCRTCDisplays[1].displayOffset.y - PCRTCDisplays[0].displayOffset.y);
-					if (GSConfig.PCRTCAntiBlur && !scanmask && blurOffset < 4)
-					{
-						if (PCRTCDisplays[1].displayOffset.y > PCRTCDisplays[0].displayOffset.y)
-							PCRTCDisplays[1].displayOffset.y -= blurOffset;
-						else
-							PCRTCDisplays[0].displayOffset.y -= blurOffset;
-					}
-				}
-
-				// If there's a single pixel offset, account for it else it can throw interlacing out.
-				for (int i = 0; i < 2; i++)
-				{
-					if (!PCRTCDisplays[i].enabled)
-						continue;
-
-					// Should this be MAGV/H in the DISPLAY register rather than the "default" magnification?
-					const int offset = (PCRTCDisplays[i].displayOffset.y - (offsets.w * (interlaced + 1))) / (VideoModeDividers[videomode].y + 1);
-
-					if (offset > 4)
-						continue;
-
-					int_off[i] = offset & 1;
-					if (offset < 0)
-						int_off[i] = -int_off[i];
-
-					PCRTCDisplays[i].displayRect.y += int_off[i];
-					PCRTCDisplays[i].displayRect.w += int_off[i];
-				}
-
-				// Handle difference in offset between the two displays, used in games like DmC and Time Crisis 2 (for split screen).
-				// Offset is not screen based, but relative to each other.
-				if (both_enabled)
-				{
-					GSVector2i offset;
-
-					offset.x = (PCRTCDisplays[1 - zeroDisplay.x].displayOffset.x - PCRTCDisplays[zeroDisplay.x].displayOffset.x) / (VideoModeDividers[videomode].x + 1);
-					offset.y = (PCRTCDisplays[1 - zeroDisplay.y].displayOffset.y - PCRTCDisplays[zeroDisplay.y].displayOffset.y) / (VideoModeDividers[videomode].y + 1);
-
-					if (offset.x >= 4 || !GSConfig.PCRTCAntiBlur)
-					{
-						PCRTCDisplays[1 - zeroDisplay.x].displayRect.x += offset.x;
-						PCRTCDisplays[1 - zeroDisplay.x].displayRect.z += offset.x;
-					}
-					if (offset.y >= 4 || !GSConfig.PCRTCAntiBlur)
-					{
-						PCRTCDisplays[1 - zeroDisplay.y].displayRect.y += offset.y - int_off[1 - zeroDisplay.y];
-						PCRTCDisplays[1 - zeroDisplay.y].displayRect.w += offset.y - int_off[1 - zeroDisplay.y];
-					}
-
-					baseOffset = PCRTCDisplays[zeroDisplay.y].displayOffset;
-				}
-
-				// Handle any large vertical offset from the zero position on the screen.
-				// Example: Hokuto no Ken, does a rougly -14 offset to bring the screen up.
-				// Ignore the lowest bit, we've already accounted for this
-				int vOffset = ((static_cast<int>(baseOffset.y) - (offsets.w * (interlaced + 1))) / (VideoModeDividers[videomode].y + 1));
-
-				if(vOffset <= 4 && vOffset != 0)
-				{
-					PCRTCDisplays[0].displayRect.y += vOffset - int_off[0];
-					PCRTCDisplays[0].displayRect.w += vOffset - int_off[0];
-					PCRTCDisplays[1].displayRect.y += vOffset - int_off[1];
-					PCRTCDisplays[1].displayRect.w += vOffset - int_off[1];
-				}
-			}
-			else // We're using screen offsets, so just calculate the entire offset.
-			{
-				const GSVector4i offsets = !GSConfig.PCRTCOverscan ? VideoModeOffsets[videomode] : VideoModeOffsetsOverscan[videomode];
-				GSVector2i offset = { 0, 0 };
-				GSVector2i zeroDisplay = NearestToZeroOffset();
-
-				if (both_enabled)
-				{
-					int blurOffset = abs(PCRTCDisplays[1].displayOffset.y - PCRTCDisplays[0].displayOffset.y);
-					if (GSConfig.PCRTCAntiBlur && !scanmask && blurOffset < 4)
-					{
-						if (PCRTCDisplays[1].displayOffset.y > PCRTCDisplays[0].displayOffset.y)
-							PCRTCDisplays[1].displayOffset.y -= blurOffset;
-						else
-							PCRTCDisplays[0].displayOffset.y -= blurOffset;
-					}
-				}
-
-				for (int i = 0; i < 2; i++)
-				{
-					// Should this be MAGV/H in the DISPLAY register rather than the "default" magnification?
-					offset.x = (static_cast<int>(PCRTCDisplays[i].displayOffset.x) - offsets.z) / (VideoModeDividers[videomode].x + 1);
-					offset.y = (static_cast<int>(PCRTCDisplays[i].displayOffset.y) - (offsets.w * (interlaced + 1))) / (VideoModeDividers[videomode].y + 1);
-
-					PCRTCDisplays[i].displayRect.x += offset.x;
-					PCRTCDisplays[i].displayRect.z += offset.x;
-					PCRTCDisplays[i].displayRect.y += offset.y;
-					PCRTCDisplays[i].displayRect.w += offset.y;
-				}
-
-				if (both_enabled)
-				{
-					GSVector2i offset;
-
-					offset.x = (PCRTCDisplays[1 - zeroDisplay.x].displayRect.x - PCRTCDisplays[zeroDisplay.x].displayRect.x);
-					offset.y = (PCRTCDisplays[1 - zeroDisplay.y].displayRect.y - PCRTCDisplays[zeroDisplay.y].displayRect.y);
-
-					if (offset.x > 0 && offset.x < 4 && GSConfig.PCRTCAntiBlur)
-					{
-						PCRTCDisplays[1 - zeroDisplay.x].displayRect.x -= offset.x;
-						PCRTCDisplays[1 - zeroDisplay.x].displayRect.z -= offset.x;
-					}
-					if (offset.y > 0 && offset.y < 4 && GSConfig.PCRTCAntiBlur)
-					{
-						PCRTCDisplays[1 - zeroDisplay.y].displayRect.y -= offset.y;
-						PCRTCDisplays[1 - zeroDisplay.y].displayRect.w -= offset.y;
-					}
-				}
-			}
-		}
-	} PCRTCDisplays;
+	// The horizontal offset values (under z) for PAL and NTSC have been tweaked
+	// they should be apparently 632 and 652 respectively, but that causes a thick black line on the left
+	// these values leave a small black line on the right in a bunch of games, but it's not so bad.
+	// The only conclusion I can come to is there is horizontal overscan expected so there would normally
+	// be black borders either side anyway, or both sides slightly covered.
+	const GSVector4i VideoModeOffsets[6] = {
+		GSVector4i(640, 224, 642, 25),
+		GSVector4i(640, 256, 676, 36),
+		GSVector4i(640, 480, 276, 34),
+		GSVector4i(720, 480, 232, 35),
+		GSVector4i(1280, 720, 302, 24),
+		GSVector4i(1920, 540, 238, 40)
+	};
+
+	const GSVector4i VideoModeOffsetsOverscan[6] = {
+		GSVector4i(711, 243, 498, 12),
+		GSVector4i(702, 288, 532, 18),
+		GSVector4i(640, 480, 276, 34),
+		GSVector4i(720, 480, 232, 35),
+		GSVector4i(1280, 720, 302, 24),
+		GSVector4i(1920, 540, 238, 40)
+	};
+
+	const GSVector4i VideoModeDividers[6] = {
+		GSVector4i(3, 0, 2559, 239),
+		GSVector4i(3, 0, 2559, 287),
+		GSVector4i(1, 0, 1279, 479),
+		GSVector4i(1, 0, 1439, 479),
+		GSVector4i(0, 0, 1279, 719),
+		GSVector4i(0, 0, 1919, 1079)
+	};
 
 public:
 	/// Returns the appropriate directory for draw dumping.
 	static std::string GetDrawDumpPath(const char* format, ...);
 
 	void ResetHandlers();
-	void ResetPCRTC();
 
+	int GetFramebufferHeight();
+	int GetFramebufferWidth();
+	int GetFramebufferBitDepth();
+	int GetDisplayHMagnification();
+	GSVector4i GetDisplayRect(int i = -1);
+	GSVector4i GetFrameMagnifiedRect(int i = -1);
+	GSVector2i GetResolutionOffset(int i = -1);
+	GSVector2i GetResolution();
+	GSVector4i GetFrameRect(int i = -1, bool ignore_off = false);
 	GSVideoMode GetVideoMode();
 
+	bool IsEnabled(int i);
 	bool isinterlaced();
 	bool isReallyInterlaced();
+	bool IsAnalogue();
 
 	float GetTvRefreshRate();
 

pcsx2/GS/Renderers/Common/GSDevice.cpp

@@ -299,7 +299,7 @@ void GSDevice::Merge(GSTexture* sTex[3], GSVector4* sRect, GSVector4* dRect, con
 			}
 		}
 
-		DoMerge(tex, sRect, m_merge, dRect, PMODE, EXTBUF, c, GSConfig.PCRTCOffsets);
+		DoMerge(tex, sRect, m_merge, dRect, PMODE, EXTBUF, c);
 
 		for (size_t i = 0; i < std::size(tex); i++)
 		{
@@ -356,7 +356,6 @@ void GSDevice::Interlace(const GSVector2i& ds, int field, int mode, float yoffse
 			break;
 		default:
 			m_current = m_merge;
-			break;
 	}
 }
 

pcsx2/GS/Renderers/Common/GSDevice.h

@@ -357,6 +357,7 @@ struct alignas(16) GSHWDrawConfig
 
 				// Scan mask
 				u32 scanmsk : 2;
+				u32 swap_ga : 1;
 			};
 
 			struct
@@ -758,7 +759,7 @@ protected:
 	virtual GSTexture* CreateSurface(GSTexture::Type type, int width, int height, int levels, GSTexture::Format format) = 0;
 	GSTexture* FetchSurface(GSTexture::Type type, int width, int height, int levels, GSTexture::Format format, bool clear, bool prefer_reuse);
 
-	virtual void DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex, GSVector4* dRect, const GSRegPMODE& PMODE, const GSRegEXTBUF& EXTBUF, const GSVector4& c, const bool linear) = 0;
+	virtual void DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex, GSVector4* dRect, const GSRegPMODE& PMODE, const GSRegEXTBUF& EXTBUF, const GSVector4& c) = 0;
 	virtual void DoInterlace(GSTexture* sTex, GSTexture* dTex, int shader, bool linear, float yoffset, int bufIdx) = 0;
 	virtual void DoFXAA(GSTexture* sTex, GSTexture* dTex) {}
 	virtual void DoShadeBoost(GSTexture* sTex, GSTexture* dTex, const float params[4]) {}

pcsx2/GS/Renderers/Common/GSDirtyRect.cpp

@@ -31,7 +31,7 @@ GSDirtyRect::GSDirtyRect(GSVector4i& r, u32 psm, u32 bw) :
 {
 }
 
-GSVector4i GSDirtyRect::GetDirtyRect(GIFRegTEX0 TEX0) const
+GSVector4i GSDirtyRect::GetDirtyRect(GIFRegTEX0& TEX0)
 {
 	GSVector4i _r;
 
@@ -54,7 +54,7 @@ GSVector4i GSDirtyRect::GetDirtyRect(GIFRegTEX0 TEX0) const
 	return _r;
 }
 
-GSVector4i GSDirtyRectList::GetTotalRect(GIFRegTEX0 TEX0, const GSVector2i& size) const
+GSVector4i GSDirtyRectList::GetTotalRect(GIFRegTEX0& TEX0, const GSVector2i& size)
 {
 	if (!empty())
 	{
@@ -73,12 +73,31 @@ GSVector4i GSDirtyRectList::GetTotalRect(GIFRegTEX0 TEX0, const GSVector2i& size
 	return GSVector4i::zero();
 }
 
-GSVector4i GSDirtyRectList::GetDirtyRect(size_t index, GIFRegTEX0 TEX0, const GSVector4i& clamp) const
+GSVector4i GSDirtyRectList::GetDirtyRect(GIFRegTEX0& TEX0, const GSVector2i& size, bool clear)
 {
-	const GSVector4i r = (*this)[index].GetDirtyRect(TEX0);
+	if (!empty())
+	{
+		const std::vector<GSDirtyRect>::iterator &it = begin();
+		const GSVector4i r = it[0].GetDirtyRect(TEX0);
 
-	GSVector2i bs = GSLocalMemory::m_psm[TEX0.PSM].bs;
+		if (clear)
+			erase(it);
 
-	return r.ralign<Align_Outside>(bs).rintersect(clamp);
+		GSVector2i bs = GSLocalMemory::m_psm[TEX0.PSM].bs;
+
+		return r.ralign<Align_Outside>(bs).rintersect(GSVector4i(0, 0, size.x, size.y));
+	}
+
+	return GSVector4i::zero();
 }
 
+GSVector4i GSDirtyRectList::GetDirtyRectAndClear(GIFRegTEX0& TEX0, const GSVector2i& size)
+{
+	const GSVector4i r = GetDirtyRect(TEX0, size, true);
+	return r;
+}
+
+void GSDirtyRectList::ClearDirty()
+{
+	clear();
+}

pcsx2/GS/Renderers/Common/GSDirtyRect.h

@@ -26,13 +26,15 @@ public:
 
 	GSDirtyRect();
 	GSDirtyRect(GSVector4i& r, u32 psm, u32 bw);
-	GSVector4i GetDirtyRect(GIFRegTEX0 TEX0) const;
+	GSVector4i GetDirtyRect(GIFRegTEX0& TEX0);
 };
 
 class GSDirtyRectList : public std::vector<GSDirtyRect>
 {
 public:
 	GSDirtyRectList() {}
-	GSVector4i GetTotalRect(GIFRegTEX0 TEX0, const GSVector2i& size) const;
-	GSVector4i GetDirtyRect(size_t index, GIFRegTEX0 TEX0, const GSVector4i& clamp) const;
+	GSVector4i GetTotalRect(GIFRegTEX0& TEX0, const GSVector2i& size);
+	GSVector4i GetDirtyRect(GIFRegTEX0& TEX0, const GSVector2i& size, bool clear = false);
+	GSVector4i GetDirtyRectAndClear(GIFRegTEX0& TEX0, const GSVector2i& size);
+	void ClearDirty();
 };

pcsx2/GS/Renderers/Common/GSRenderer.cpp

@@ -50,8 +50,6 @@ std::unique_ptr<GSRenderer> g_gs_renderer;
 // we might be switching while the other thread reads it.
 static GSVector4 s_last_draw_rect;
 
-// Last time we reset the renderer due to a GPU crash, if any.
-static Common::Timer::Value s_last_gpu_reset_time;
 
 GSRenderer::GSRenderer()
 	: m_shader_time_start(Common::Timer::GetCurrentValue())
@@ -77,109 +75,264 @@ void GSRenderer::Destroy()
 
 bool GSRenderer::Merge(int field)
 {
-	GSVector2i fs(0, 0);
-	GSTexture* tex[3] = { NULL, NULL, NULL };
-	int y_offset[3] = { 0, 0, 0 };
-	const bool feedback_merge = m_regs->EXTWRITE.WRITE == 1;
+	bool en[2];
 
-	PCRTCDisplays.SetVideoMode(GetVideoMode());
-	PCRTCDisplays.EnableDisplays(m_regs->PMODE, m_regs->SMODE2, isReallyInterlaced());
-	PCRTCDisplays.CheckSameSource();
+	GSVector4i fr[2];
+	GSVector4i dr[2];
+	GSVector2i display_offsets[2];
 
-	if (!PCRTCDisplays.PCRTCDisplays[0].enabled && !PCRTCDisplays.PCRTCDisplays[1].enabled)
+	GSVector2i display_baseline = {INT_MAX, INT_MAX};
+	GSVector2i frame_baseline = {INT_MAX, INT_MAX};
+	GSVector2i display_combined = {0, 0};
+	bool feedback_merge = m_regs->EXTWRITE.WRITE == 1;
+	bool display_offset = false;
+
+	for (int i = 0; i < 2; i++)
+	{
+		en[i] = IsEnabled(i) || (m_regs->EXTBUF.FBIN == i && feedback_merge);
+
+		if (en[i])
+		{
+			fr[i] = GetFrameRect(i);
+			dr[i] = GetDisplayRect(i);
+			display_offsets[i] = GetResolutionOffset(i);
+
+			display_combined.x = std::max(((dr[i].right) - dr[i].left) + display_offsets[i].x, display_combined.x);
+			display_combined.y = std::max((dr[i].bottom - dr[i].top) + display_offsets[i].y, display_combined.y);
+
+			display_baseline.x = std::min(display_offsets[i].x, display_baseline.x);
+			display_baseline.y = std::min(display_offsets[i].y, display_baseline.y);
+			frame_baseline.x = std::min(std::max(fr[i].left, 0), frame_baseline.x);
+			frame_baseline.y = std::min(std::max(fr[i].top, 0), frame_baseline.y);
+
+			display_offset |= std::abs(display_baseline.y - display_offsets[i].y) == 1;
+			/*DevCon.Warning("Read offset was X %d(left %d) Y %d(top %d)", display_baseline.x, dr[i].left, display_baseline.y, dr[i].top);
+			DevCon.Warning("[%d]: %d %d %d %d, %d %d %d %d\n", i, fr[i].x,fr[i].y,fr[i].z,fr[i].w , dr[i].x,dr[i].y,dr[i].z,dr[i].w);
+			DevCon.Warning("Offset X %d Offset Y %d", display_offsets[i].x, display_offsets[i].y);*/
+		}
+	}
+
+	if (!en[0] && !en[1])
+	{
 		return false;
+	}
 
-	// Need to do this here, if the user has Anti-Blur enabled, these offsets can get wiped out/changed.
-	const bool game_deinterlacing = (m_regs->DISP[0].DISPFB.DBY != PCRTCDisplays.PCRTCDisplays[0].prevFramebufferReg.DBY) !=
-									(m_regs->DISP[1].DISPFB.DBY != PCRTCDisplays.PCRTCDisplays[1].prevFramebufferReg.DBY);
+	GL_PUSH("Renderer Merge %d (0: enabled %d 0x%x, 1: enabled %d 0x%x)", s_n, en[0], m_regs->DISP[0].DISPFB.Block(), en[1], m_regs->DISP[1].DISPFB.Block());
 
-	PCRTCDisplays.SetRects(0, m_regs->DISP[0].DISPLAY, m_regs->DISP[0].DISPFB);
-	PCRTCDisplays.SetRects(1, m_regs->DISP[1].DISPLAY, m_regs->DISP[1].DISPFB);
-	PCRTCDisplays.CalculateDisplayOffset(m_scanmask_used);
-	PCRTCDisplays.CalculateFramebufferOffset();
+	// try to avoid fullscreen blur, could be nice on tv but on a monitor it's like double vision, hurts my eyes (persona 4, guitar hero)
+	//
+	// NOTE: probably the technique explained in graphtip.pdf (Antialiasing by Supersampling / 4. Reading Odd/Even Scan Lines Separately with the PCRTC then Blending)
+
+	const bool samesrc =
+		en[0] && en[1] &&
+		m_regs->DISP[0].DISPFB.FBP == m_regs->DISP[1].DISPFB.FBP &&
+		m_regs->DISP[0].DISPFB.FBW == m_regs->DISP[1].DISPFB.FBW &&
+		GSUtil::HasCompatibleBits(m_regs->DISP[0].DISPFB.PSM, m_regs->DISP[1].DISPFB.PSM);
+	bool single_fetch = false;
+
+	GSVector2i fs(0, 0);
+	GSVector2i ds(0, 0);
+
+	GSTexture* tex[3] = {NULL, NULL, NULL};
+	int y_offset[3] = {0, 0, 0};
+
+	s_n++;
 
 	// Only need to check the right/bottom on software renderer, hardware always gets the full texture then cuts a bit out later.
-	if (PCRTCDisplays.FrameRectMatch() && !PCRTCDisplays.FrameWrap() && !feedback_merge)
+	if (samesrc && !feedback_merge && (GSConfig.UseHardwareRenderer() || (fr[0].right == fr[1].right && fr[0].bottom == fr[1].bottom)))
 	{
-		tex[0] = GetOutput(-1, y_offset[0]);
+		tex[0] = GetOutput(0, y_offset[0]);
 		tex[1] = tex[0]; // saves one texture fetch
 		y_offset[1] = y_offset[0];
+		single_fetch = true;
 	}
 	else
 	{
-		if (PCRTCDisplays.PCRTCDisplays[0].enabled)
+		if (en[0])
 			tex[0] = GetOutput(0, y_offset[0]);
-		if (PCRTCDisplays.PCRTCDisplays[1].enabled)
+		if (en[1])
 			tex[1] = GetOutput(1, y_offset[1]);
 		if (feedback_merge)
 			tex[2] = GetFeedbackOutput();
 	}
 
-	if (!tex[0] && !tex[1])
-		return false;
-
-	s_n++;
-
 	GSVector4 src_out_rect[2];
 	GSVector4 src_gs_read[2];
 	GSVector4 dst[3];
 
-	// Use offset for bob deinterlacing always, extra offset added later for FFMD mode.
-	const bool scanmask_frame = m_scanmask_used && abs(PCRTCDisplays.PCRTCDisplays[0].displayRect.y - PCRTCDisplays.PCRTCDisplays[1].displayRect.y) != 1;
-	int field2 = 0;
-	int mode = 3; // If the game is manually deinterlacing then we need to bob (if we want to get away with no deinterlacing).
-	bool is_bob = GSConfig.InterlaceMode == GSInterlaceMode::BobTFF || GSConfig.InterlaceMode == GSInterlaceMode::BobBFF;
+	const bool slbg = m_regs->PMODE.SLBG;
 
-	// FFMD (half frames) requires blend deinterlacing, so automatically use that. Same when SCANMSK is used but not blended in the merge circuit (Alpine Racer 3).
+	GSVector2i resolution(GetResolution());
+	bool scanmask_frame = m_scanmask_used && !display_offset;
+	const bool ignore_offset = !GSConfig.PCRTCOffsets;
+	const bool is_bob = GSConfig.InterlaceMode == GSInterlaceMode::BobTFF || GSConfig.InterlaceMode == GSInterlaceMode::BobBFF;
+
+	// Use offset for bob deinterlacing always, extra offset added later for FFMD mode.
+	float offset = is_bob ? (tex[1] ? tex[1]->GetScale().y : tex[0]->GetScale().y) : 0.0f;
+
+	int field2 = 0;
+	int mode = 3;
+
+	// FFMD (half frames) requires blend deinterlacing, so automatically use that. Same when SCANMSK is used but not blended in the merge circuit (Alpine Racer 3)
 	if (GSConfig.InterlaceMode != GSInterlaceMode::Automatic || (!m_regs->SMODE2.FFMD && !scanmask_frame))
 	{
-		// If the game is offsetting each frame itself and we're using full height buffers, we can offset this with Bob.
-		if (game_deinterlacing && !scanmask_frame && GSConfig.InterlaceMode == GSInterlaceMode::Automatic)
-		{
-			mode = 1; // Bob.
-			is_bob = true;
-		}
-		else
-		{
-			field2 = ((static_cast<int>(GSConfig.InterlaceMode) - 2) & 1);
-			mode = ((static_cast<int>(GSConfig.InterlaceMode) - 2) >> 1);
-		}
+		field2 = ((static_cast<int>(GSConfig.InterlaceMode) - 2) & 1);
+		mode = ((static_cast<int>(GSConfig.InterlaceMode) - 2) >> 1);
 	}
 
 	for (int i = 0; i < 2; i++)
 	{
-		 const GSPCRTCRegs::PCRTCDisplay& curCircuit = PCRTCDisplays.PCRTCDisplays[i];
-
-		if (!curCircuit.enabled || !tex[i])
+		if (!en[i] || !tex[i])
 			continue;
 
+		GSVector4i r = GetFrameMagnifiedRect(i);
 		GSVector4 scale = GSVector4(tex[i]->GetScale()).xyxy();
 
-		// dst is the final destination rect with offset on the screen.
-		dst[i] = scale * GSVector4(curCircuit.displayRect);
 
-		// src_gs_read is the size which we're really reading from GS memory.
-		src_gs_read[i] = ((GSVector4(curCircuit.framebufferRect) + GSVector4(0, y_offset[i], 0, y_offset[i])) * scale) / GSVector4(tex[i]->GetSize()).xyxy();
-		
-		float interlace_offset = 0.0f;
-		if (isReallyInterlaced() && m_regs->SMODE2.FFMD && !is_bob && !GSConfig.DisableInterlaceOffset && GSConfig.InterlaceMode != GSInterlaceMode::Off)
+		GSVector2i off(ignore_offset ? 0 : display_offsets[i]);
+		GSVector2i display_diff(display_offsets[i].x - display_baseline.x, display_offsets[i].y - display_baseline.y);
+		GSVector2i frame_diff(fr[i].left - frame_baseline.x, fr[i].top - frame_baseline.y);
+
+		if (!GSConfig.UseHardwareRenderer())
 		{
-			interlace_offset = (scale.y) * static_cast<float>(field ^ field2);
-		}
-		// Scanmask frame offsets. It's gross, I'm sorry but it sucks.
-		if (m_scanmask_used)
-		{
-			int displayIntOffset = PCRTCDisplays.PCRTCDisplays[i].displayRect.y - PCRTCDisplays.PCRTCDisplays[1 - i].displayRect.y;
-			
-			if (displayIntOffset > 0)
+			// Clear any frame offsets, offset is already done in the software GetOutput.
+			fr[i].right -= fr[i].left;
+			fr[i].left = 0;
+			fr[i].bottom -= fr[i].top;
+			fr[i].top = 0;
+
+			// Put any frame offset difference back if we aren't anti-blurring on a single fetch (not offset).
+			if (!GSConfig.PCRTCAntiBlur && single_fetch)
 			{
-				displayIntOffset &= 1;
-				dst[i].y -= displayIntOffset * scale.y;
-				dst[i].w -= displayIntOffset * scale.y;
-				interlace_offset += displayIntOffset;
+				fr[i].right += frame_diff.x;
+				fr[i].left += frame_diff.x;
+				fr[i].bottom += frame_diff.y;
+				fr[i].top += frame_diff.y;
+			}
+			
+		}
+
+		// If using scanmsk we have to keep the single line offset, regardless of upscale
+		// so we handle this separately after the rect calculations.
+		float interlace_offset = 0.0f;
+
+		if ((!GSConfig.PCRTCAntiBlur || m_scanmask_used) && display_offset)
+		{
+			interlace_offset = static_cast<float>(display_diff.y & 1);
+
+			// When the displays are offset by 1 we need to adjust for upscale to handle it (reduces bounce in MGS2 when upscaling)
+			interlace_offset += (tex[i]->GetScale().y - 1.0f)  / 2;
+
+			if (interlace_offset >= 1.0f)
+			{
+				if (!ignore_offset)
+					off.y -= 1;
+
+				display_diff.y -= 1;
 			}
 		}
 
+		// Start of Anti-Blur code.
+		if (!ignore_offset)
+		{
+			if (GSConfig.PCRTCAntiBlur)
+			{
+				if (samesrc)
+				{
+					// Offset by DISPLAY setting
+					if (display_diff.x < 4)
+						off.x -= display_diff.x;
+					if (display_diff.y < 4)
+						off.y -= display_diff.y;
+
+					// Only functional in HW mode, software clips/positions the framebuffer on read.
+					if (GSConfig.UseHardwareRenderer())
+					{
+						// Offset by DISPFB setting
+						if (abs(frame_diff.x) < 4)
+							off.x += frame_diff.x;
+						if (abs(frame_diff.y) < 4)
+							off.y += frame_diff.y;
+					}
+				}
+			}
+		}
+		else
+		{
+			if (!slbg || !feedback_merge)
+			{
+				// If the offsets between the two displays are quite large, it's probably intended for an effect.
+				if (display_diff.x >= 4 || !GSConfig.PCRTCAntiBlur)
+					off.x = display_diff.x;
+
+				if (display_diff.y >= 4 || !GSConfig.PCRTCAntiBlur)
+					off.y = display_diff.y;
+
+				// Need to check if only circuit 2 is enabled. Stuntman toggles circuit 1 on and off every other frame.
+				if (samesrc || m_regs->PMODE.EN == 2)
+				{
+					// Adjusting the screen offset when using a negative offset.
+					const int videomode = static_cast<int>(GetVideoMode()) - 1;
+					const GSVector4i offsets = !GSConfig.PCRTCOverscan ? VideoModeOffsets[videomode] : VideoModeOffsetsOverscan[videomode];
+					GSVector2i base_resolution(offsets.x, offsets.y);
+
+					if (isinterlaced() && !m_regs->SMODE2.FFMD)
+						base_resolution.y *= 2;
+
+					// Offset by DISPLAY setting
+					if (display_diff.x < 0)
+					{
+						off.x = 0;
+						if (base_resolution.x > resolution.x)
+							resolution.x -= display_diff.x;
+					}
+					if (display_diff.y < 0)
+					{
+						off.y = 0;
+						if (base_resolution.y > resolution.y)
+							resolution.y -= display_diff.y;
+					}
+
+					// Don't do X, we only care about height, this would need to be tailored for games using X (Black does -5).
+					// Mainly for Hokuto no Ken which does -14 Y offset.
+					if (display_baseline.y < -4)
+						off.y += display_baseline.y;
+
+					// Anti-Blur stuff
+					// Only functional in HW mode, software clips/positions the framebuffer on read.
+					if (GSConfig.PCRTCAntiBlur && GSConfig.UseHardwareRenderer())
+					{
+						// Offset by DISPFB setting
+						if (abs(frame_diff.x) < 4)
+							off.x += frame_diff.x;
+						if (abs(frame_diff.y) < 4)
+							off.y += frame_diff.y;
+					}
+				}
+			}
+		}
+		// End of Anti-Blur code.
+
+		if (isinterlaced() && m_regs->SMODE2.FFMD)
+			off.y >>= 1;
+
+		// dst is the final destination rect with offset on the screen.
+		dst[i] = scale * (GSVector4(off).xyxy() + GSVector4(r.rsize()));
+
+		// src_gs_read is the size which we're really reading from GS memory.
+		src_gs_read[i] = ((GSVector4(fr[i]) + GSVector4(0, y_offset[i], 0, y_offset[i])) * scale) / GSVector4(tex[i]->GetSize()).xyxy();
+
+		// src_out_rect is the resized rect for output. (Not really used)
+		src_out_rect[i] = (GSVector4(r) * scale) / GSVector4(tex[i]->GetSize()).xyxy();
+
+		if (m_regs->SMODE2.FFMD && !is_bob && !GSConfig.DisableInterlaceOffset && GSConfig.InterlaceMode != GSInterlaceMode::Off)
+		{
+			// We do half because FFMD is a half sized framebuffer, then we offset by 1 in the shader for the actual interlace
+			if(GetUpscaleMultiplier() > 1.0f)
+				interlace_offset += ((((tex[1] ? tex[1]->GetScale().y : tex[0]->GetScale().y) + 0.5f) * 0.5f) - 1.0f) * static_cast<float>(field ^ field2);
+			offset = 1.0f;
+		}
+		// Restore manually offset "interlace" lines
 		dst[i] += GSVector4(0.0f, interlace_offset, 0.0f, interlace_offset);
 	}
 
@@ -196,18 +349,41 @@ bool GSRenderer::Merge(int field)
 		dst[2] = GSVector4(scale * GSVector4(feedback_rect.rsize()));
 	}
 
-	GSVector2i resolution = PCRTCDisplays.GetResolution();
+	// Set the resolution to the height of the displays (kind of a saturate height)
+	if (ignore_offset && !feedback_merge)
+	{
+		GSVector2i max_resolution = GetResolution();
+		resolution.x = display_combined.x - display_baseline.x;
+		resolution.y = display_combined.y - display_baseline.y;
+
+		if (isinterlaced() && m_regs->SMODE2.FFMD)
+		{
+			resolution.y >>= 1;
+		}
+
+		resolution.x = std::min(max_resolution.x, resolution.x);
+		resolution.y = std::min(max_resolution.y, resolution.y);
+	}
+
 	fs = GSVector2i(static_cast<int>(static_cast<float>(resolution.x) * GetUpscaleMultiplier()),
 		static_cast<int>(static_cast<float>(resolution.y) * GetUpscaleMultiplier()));
+	ds = fs;
 
-	m_real_size = GSVector2i(fs.x, fs.y);
+	// When interlace(FRAME) mode, the rect is half height, so it needs to be stretched.
+	const bool is_interlaced_resolution = m_regs->SMODE2.INT || (isReallyInterlaced() && IsAnalogue() && GSConfig.InterlaceMode != GSInterlaceMode::Off);
 
-	if ((tex[0] == tex[1]) && (src_out_rect[0] == src_out_rect[1]).alltrue() && 
-		(PCRTCDisplays.PCRTCDisplays[0].displayRect == PCRTCDisplays.PCRTCDisplays[1].displayRect).alltrue() &&
-		(PCRTCDisplays.PCRTCDisplays[0].framebufferRect == PCRTCDisplays.PCRTCDisplays[1].framebufferRect).alltrue() &&
-		!feedback_merge && !m_regs->PMODE.SLBG)
+	if (is_interlaced_resolution && m_regs->SMODE2.FFMD)
+		ds.y *= 2;
+
+	m_real_size = GSVector2i(fs.x, is_interlaced_resolution ? ds.y : fs.y);
+
+	if (!tex[0] && !tex[1])
+		return false;
+
+	if ((tex[0] == tex[1]) && (src_out_rect[0] == src_out_rect[1]).alltrue() && (dst[0] == dst[1]).alltrue() && !feedback_merge && !slbg)
 	{
 		// the two outputs are identical, skip drawing one of them (the one that is alpha blended)
+
 		tex[0] = NULL;
 	}
 
@@ -216,11 +392,7 @@ bool GSRenderer::Merge(int field)
 	g_gs_device->Merge(tex, src_gs_read, dst, fs, m_regs->PMODE, m_regs->EXTBUF, c);
 
 	if (isReallyInterlaced() && GSConfig.InterlaceMode != GSInterlaceMode::Off)
-	{
-		const float offset = is_bob ? (tex[1] ? tex[1]->GetScale().y : tex[0]->GetScale().y) : 0.0f;
-
-		g_gs_device->Interlace(fs, field ^ field2, mode, offset);
-	}
+		g_gs_device->Interlace(ds, field ^ field2, mode, offset);
 
 	if (GSConfig.ShadeBoost)
 		g_gs_device->ShadeBoost();
@@ -430,40 +602,6 @@ void GSJoinSnapshotThreads()
 	}
 }
 
-bool GSRenderer::BeginPresentFrame(bool frame_skip)
-{
-	const HostDisplay::PresentResult result = Host::BeginPresentFrame(frame_skip);
-	if (result == HostDisplay::PresentResult::OK)
-		return true;
-	else if (result == HostDisplay::PresentResult::FrameSkipped)
-		return false;
-
-	// If we're constantly crashing on something in particular, we don't want to end up in an
-	// endless reset loop.. that'd probably end up leaking memory and/or crashing us for other
-	// reasons. So just abort in such case.
-	const Common::Timer::Value current_time = Common::Timer::GetCurrentValue();
-	if (s_last_gpu_reset_time != 0 &&
-		Common::Timer::ConvertValueToSeconds(current_time - s_last_gpu_reset_time) < 15.0f)
-	{
-		pxFailRel("Host GPU lost too many times, device is probably completely wedged.");
-	}
-	s_last_gpu_reset_time = current_time;
-
-	// Device lost, something went really bad.
-	// Let's just toss out everything, and try to hobble on.
-	if (!GSreopen(true, false, GSConfig))
-	{
-		pxFailRel("Failed to recreate GS device after loss.");
-		return false;
-	}
-
-	// First frame after reopening is definitely going to be trash, so skip it.
-	Host::AddIconOSDMessage("GSDeviceLost", ICON_FA_EXCLAMATION_TRIANGLE,
-		"Host GPU device encountered an error and was recovered. This may have broken rendering.",
-		Host::OSD_CRITICAL_ERROR_DURATION);
-	return false;
-}
-
 void GSRenderer::VSync(u32 field, bool registers_written)
 {
 	Flush(GSFlushReason::VSYNC);
@@ -509,7 +647,7 @@ void GSRenderer::VSync(u32 field, bool registers_written)
 	if (skip_frame)
 	{
 		g_gs_device->ResetAPIState();
-		if (BeginPresentFrame(true))
+		if (Host::BeginPresentFrame(true))
 			Host::EndPresentFrame();
 		g_gs_device->RestoreAPIState();
 		PerformanceMetrics::Update(registers_written, fb_sprite_frame, true);
@@ -556,7 +694,7 @@ void GSRenderer::VSync(u32 field, bool registers_written)
 	}
 
 	g_gs_device->ResetAPIState();
-	if (BeginPresentFrame(false))
+	if (Host::BeginPresentFrame(false))
 	{
 		if (current && !blank_frame)
 		{
@@ -772,7 +910,7 @@ void GSRenderer::StopGSDump()
 void GSRenderer::PresentCurrentFrame()
 {
 	g_gs_device->ResetAPIState();
-	if (BeginPresentFrame(false))
+	if (Host::BeginPresentFrame(false))
 	{
 		GSTexture* current = g_gs_device->GetCurrent();
 		if (current)

pcsx2/GS/Renderers/Common/GSRenderer.h

@@ -23,7 +23,6 @@ class GSRenderer : public GSState
 {
 private:
 	bool Merge(int field);
-	bool BeginPresentFrame(bool frame_skip);
 
 	u64 m_shader_time_start = 0;
 

pcsx2/GS/Renderers/Common/GSVertexTrace.cpp

@@ -19,8 +19,10 @@
 #include "GS/GSState.h"
 
 GSVertexTrace::GSVertexTrace(const GSState* state, bool provoking_vertex_first)
-	: m_state(state)
+	: m_accurate_stq(false), m_state(state), m_primclass(GS_INVALID_CLASS)
 {
+	memset(&m_alpha, 0, sizeof(m_alpha));
+
 	MULTI_ISA_SELECT(GSVertexTracePopulateFunctions)(*this, provoking_vertex_first);
 }
 

pcsx2/GS/Renderers/Common/GSVertexTrace.h

@@ -44,7 +44,7 @@ public:
 		int min, max;
 		bool valid;
 	};
-	bool m_accurate_stq = false;
+	bool m_accurate_stq;
 
 protected:
 	const GSState* m_state;
@@ -54,25 +54,25 @@ protected:
 	FindMinMaxPtr m_fmm[2][2][2][2][4];
 
 public:
-	GS_PRIM_CLASS m_primclass = GS_INVALID_CLASS;
+	GS_PRIM_CLASS m_primclass;
 
-	Vertex m_min = {};
-	Vertex m_max = {};
-	VertexAlpha m_alpha = {}; // source alpha range after tfx, GSRenderer::GetAlphaMinMax() updates it
+	Vertex m_min;
+	Vertex m_max;
+	VertexAlpha m_alpha; // source alpha range after tfx, GSRenderer::GetAlphaMinMax() updates it
 
 	union
 	{
 		u32 value;
 		struct { u32 r:4, g:4, b:4, a:4, x:1, y:1, z:1, f:1, s:1, t:1, q:1, _pad:1; };
 		struct { u32 rgba:16, xyzf:4, stq:4; };
-	} m_eq = {};
+	} m_eq;
 
 	union
 	{
 		struct { u32 mmag:1, mmin:1, linear:1, opt_linear:1; };
-	} m_filter = {};
+	} m_filter;
 
-	GSVector2 m_lod = {}; // x = min, y = max
+	GSVector2 m_lod; // x = min, y = max
 
 public:
 	GSVertexTrace(const GSState* state, bool provoking_vertex_first);

pcsx2/GS/Renderers/DX11/GSDevice11.cpp

@@ -798,7 +798,7 @@ void GSDevice11::UpdateCLUTTexture(GSTexture* sTex, u32 offsetX, u32 offsetY, GS
 	StretchRect(sTex, GSVector4::zero(), dTex, dRect, m_convert.ps[static_cast<int>(shader)].get(), m_merge.cb.get(), nullptr, false);
 }
 
-void GSDevice11::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex, GSVector4* dRect, const GSRegPMODE& PMODE, const GSRegEXTBUF& EXTBUF, const GSVector4& c, const bool linear)
+void GSDevice11::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex, GSVector4* dRect, const GSRegPMODE& PMODE, const GSRegEXTBUF& EXTBUF, const GSVector4& c)
 {
 	const GSVector4 full_r(0.0f, 0.0f, 1.0f, 1.0f);
 	const bool feedback_write_2 = PMODE.EN2 && sTex[2] != nullptr && EXTBUF.FBIN == 1;
@@ -821,14 +821,14 @@ void GSDevice11::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex,
 	{
 		// 2nd output is enabled and selected. Copy it to destination so we can blend it with 1st output
 		// Note: value outside of dRect must contains the background color (c)
-		StretchRect(sTex[1], sRect[1], dTex, PMODE.SLBG ? dRect[2] : dRect[1], ShaderConvert::COPY, linear);
+		StretchRect(sTex[1], sRect[1], dTex, PMODE.SLBG ? dRect[2] : dRect[1], ShaderConvert::COPY);
 	}
 
 	// Save 2nd output
 	if (feedback_write_2)
 	{
 		StretchRect(dTex, full_r, sTex[2], dRect[2], m_convert.ps[static_cast<int>(ShaderConvert::YUV)].get(),
-			m_merge.cb.get(), nullptr, linear);
+			m_merge.cb.get(), nullptr, true);
 	}
 
 	// Restore background color to process the normal merge
@@ -838,13 +838,13 @@ void GSDevice11::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex,
 	if (sTex[0])
 	{
 		// 1st output is enabled. It must be blended
-		StretchRect(sTex[0], sRect[0], dTex, dRect[0], m_merge.ps[PMODE.MMOD].get(), m_merge.cb.get(), m_merge.bs.get(), linear);
+		StretchRect(sTex[0], sRect[0], dTex, dRect[0], m_merge.ps[PMODE.MMOD].get(), m_merge.cb.get(), m_merge.bs.get(), true);
 	}
 
 	if (feedback_write_1)
 	{
 		StretchRect(sTex[0], full_r, sTex[2], dRect[2], m_convert.ps[static_cast<int>(ShaderConvert::YUV)].get(),
-			m_merge.cb.get(), nullptr, linear);
+			m_merge.cb.get(), nullptr, true);
 	}
 }
 

pcsx2/GS/Renderers/DX11/GSDevice11.h

@@ -126,7 +126,7 @@ private:
 
 	std::unique_ptr<GSDownloadTexture> CreateDownloadTexture(u32 width, u32 height, GSTexture::Format format) final;
 
-	void DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex, GSVector4* dRect, const GSRegPMODE& PMODE, const GSRegEXTBUF& EXTBUF, const GSVector4& c, const bool linear) final;
+	void DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex, GSVector4* dRect, const GSRegPMODE& PMODE, const GSRegEXTBUF& EXTBUF, const GSVector4& c) final;
 	void DoInterlace(GSTexture* sTex, GSTexture* dTex, int shader, bool linear, float yoffset = 0, int bufIdx = 0) final;
 	void DoFXAA(GSTexture* sTex, GSTexture* dTex) final;
 	void DoShadeBoost(GSTexture* sTex, GSTexture* dTex, const float params[4]) final;

pcsx2/GS/Renderers/DX11/GSTextureFX11.cpp

@@ -160,6 +160,7 @@ void GSDevice11::SetupPS(const PSSelector& sel, const GSHWDrawConfig::PSConstant
 		sm.AddMacro("PS_POINT_SAMPLER", sel.point_sampler);
 		sm.AddMacro("PS_SHUFFLE", sel.shuffle);
 		sm.AddMacro("PS_READ_BA", sel.read_ba);
+		sm.AddMacro("PS_SWAP_GA", sel.swap_ga);
 		sm.AddMacro("PS_CHANNEL_FETCH", sel.channel);
 		sm.AddMacro("PS_TALES_OF_ABYSS_HLE", sel.tales_of_abyss_hle);
 		sm.AddMacro("PS_URBAN_CHAOS_HLE", sel.urban_chaos_hle);

pcsx2/GS/Renderers/DX12/GSDevice12.cpp

@@ -567,7 +567,7 @@ void GSDevice12::DrawStretchRect(const GSVector4& sRect, const GSVector4& dRect,
 }
 
 void GSDevice12::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex, GSVector4* dRect,
-	const GSRegPMODE& PMODE, const GSRegEXTBUF& EXTBUF, const GSVector4& c, const bool linear)
+	const GSRegPMODE& PMODE, const GSRegEXTBUF& EXTBUF, const GSVector4& c)
 {
 	GL_PUSH("DoMerge");
 
@@ -575,7 +575,7 @@ void GSDevice12::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex,
 	const bool feedback_write_2 = PMODE.EN2 && sTex[2] != nullptr && EXTBUF.FBIN == 1;
 	const bool feedback_write_1 = PMODE.EN1 && sTex[2] != nullptr && EXTBUF.FBIN == 0;
 	const bool feedback_write_2_but_blend_bg = feedback_write_2 && PMODE.SLBG == 1;
-	const D3D12::DescriptorHandle& sampler = linear ? m_linear_sampler_cpu : m_point_sampler_cpu;
+
 	// Merge the 2 source textures (sTex[0],sTex[1]). Final results go to dTex. Feedback write will go to sTex[2].
 	// If either 2nd output is disabled or SLBG is 1, a background color will be used.
 	// Note: background color is also used when outside of the unit rectangle area
@@ -605,7 +605,7 @@ void GSDevice12::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex,
 		{
 			static_cast<GSTexture12*>(sTex[1])->TransitionToState(D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
 			OMSetRenderTargets(dTex, nullptr, darea);
-			SetUtilityTexture(sTex[1], sampler);
+			SetUtilityTexture(sTex[1], m_linear_sampler_cpu);
 			BeginRenderPass(D3D12_RENDER_PASS_BEGINNING_ACCESS_TYPE_CLEAR, D3D12_RENDER_PASS_ENDING_ACCESS_TYPE_PRESERVE,
 				D3D12_RENDER_PASS_BEGINNING_ACCESS_TYPE_NO_ACCESS, D3D12_RENDER_PASS_ENDING_ACCESS_TYPE_NO_ACCESS,
 				D3D12_RENDER_PASS_BEGINNING_ACCESS_TYPE_NO_ACCESS, D3D12_RENDER_PASS_ENDING_ACCESS_TYPE_NO_ACCESS, c);
@@ -625,7 +625,7 @@ void GSDevice12::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex,
 		EndRenderPass();
 		OMSetRenderTargets(sTex[2], nullptr, fbarea);
 		if (dcleared)
-			SetUtilityTexture(dTex, sampler);
+			SetUtilityTexture(dTex, m_linear_sampler_cpu);
 
 		// sTex[2] can be sTex[0], in which case it might be cleared (e.g. Xenosaga).
 		BeginRenderPassForStretchRect(static_cast<GSTexture12*>(sTex[2]), fbarea, GSVector4i(dRect[2]));
@@ -663,7 +663,7 @@ void GSDevice12::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex,
 	{
 		// 1st output is enabled. It must be blended
 		SetUtilityRootSignature();
-		SetUtilityTexture(sTex[0], sampler);
+		SetUtilityTexture(sTex[0], m_linear_sampler_cpu);
 		SetPipeline(m_merge[PMODE.MMOD].get());
 		DrawStretchRect(sRect[0], dRect[0], dTex->GetSize());
 	}
@@ -673,7 +673,7 @@ void GSDevice12::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex,
 		EndRenderPass();
 		SetUtilityRootSignature();
 		SetPipeline(m_convert[static_cast<int>(ShaderConvert::YUV)].get());
-		SetUtilityTexture(dTex, sampler);
+		SetUtilityTexture(dTex, m_linear_sampler_cpu);
 		OMSetRenderTargets(sTex[2], nullptr, fbarea);
 		BeginRenderPass(D3D12_RENDER_PASS_BEGINNING_ACCESS_TYPE_PRESERVE, D3D12_RENDER_PASS_ENDING_ACCESS_TYPE_PRESERVE);
 		DrawStretchRect(full_r, dRect[2], dsize);

pcsx2/GS/Renderers/DX12/GSDevice12.h

@@ -183,7 +183,7 @@ private:
 	GSTexture* CreateSurface(GSTexture::Type type, int width, int height, int levels, GSTexture::Format format) override;
 
 	void DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex, GSVector4* dRect, const GSRegPMODE& PMODE,
-		const GSRegEXTBUF& EXTBUF, const GSVector4& c, const bool linear) final;
+		const GSRegEXTBUF& EXTBUF, const GSVector4& c) final;
 	void DoInterlace(GSTexture* sTex, GSTexture* dTex, int shader, bool linear, float yoffset = 0, int bufIdx = 0) final;
 	void DoShadeBoost(GSTexture* sTex, GSTexture* dTex, const float params[4]) final;
 	void DoFXAA(GSTexture* sTex, GSTexture* dTex) final;

pcsx2/GS/Renderers/HW/GSHwHack.cpp

@@ -170,6 +170,25 @@ bool GSHwHack::GSC_SacredBlaze(GSRendererHW& r, const GSFrameInfo& fi, int& skip
 	return true;
 }
 
+bool GSHwHack::GSC_Spartan(GSRendererHW& r, const GSFrameInfo& fi, int& skip)
+{
+	if (skip == 0)
+	{
+		if (fi.TME)
+		{
+			// depth textures (bully, mgs3s1 intro, Front Mission 5)
+			if ((fi.TPSM == PSM_PSMZ32 || fi.TPSM == PSM_PSMZ24 || fi.TPSM == PSM_PSMZ16 || fi.TPSM == PSM_PSMZ16S) ||
+				// General, often problematic post processing
+				(GSUtil::HasSharedBits(fi.FBP, fi.FPSM, fi.TBP0, fi.TPSM)))
+			{
+				skip = 2;
+			}
+		}
+	}
+
+	return true;
+}
+
 bool GSHwHack::GSC_Oneechanbara2Special(GSRendererHW& r, const GSFrameInfo& fi, int& skip)
 {
 	if (skip == 0)
@@ -480,6 +499,21 @@ bool GSHwHack::GSC_SakuraWarsSoLongMyLove(GSRendererHW& r, const GSFrameInfo& fi
 	return true;
 }
 
+bool GSHwHack::GSC_FightingBeautyWulong(GSRendererHW& r, const GSFrameInfo& fi, int& skip)
+{
+	if (skip == 0)
+	{
+		if (!s_nativeres && fi.TME && (fi.TBP0 == 0x0700 || fi.TBP0 == 0x0a80) && (fi.TPSM == PSM_PSMCT32 || fi.TPSM == PSM_PSMCT24))
+		{
+			// Don't enable hack on native res if crc is below aggressive.
+			// removes glow/blur which cause ghosting and other sprite issues similar to Tekken 5
+			skip = 1;
+		}
+	}
+
+	return true;
+}
+
 bool GSHwHack::GSC_GodHand(GSRendererHW& r, const GSFrameInfo& fi, int& skip)
 {
 	if (skip == 0)
@@ -1002,6 +1036,30 @@ bool GSHwHack::OI_FFX(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTextureCa
 	return true;
 }
 
+bool GSHwHack::OI_MetalSlug6(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t)
+{
+	// missing red channel fix (looks alright in pcsx2 r5000+)
+
+	GSVertex* RESTRICT v = r.m_vertex.buff;
+
+	for (size_t i = r.m_vertex.next; i > 0; i--, v++)
+	{
+		const u32 c = v->RGBAQ.U32[0];
+
+		const u32 r = (c >> 0) & 0xff;
+		const u32 g = (c >> 8) & 0xff;
+		const u32 b = (c >> 16) & 0xff;
+
+		if (r == 0 && g != 0 && b != 0)
+		{
+			v->RGBAQ.U32[0] = (c & 0xffffff00) | ((g + b + 1) >> 1);
+		}
+	}
+
+	r.m_vt.Update(r.m_vertex.buff, r.m_index.buff, r.m_vertex.tail, r.m_index.tail, r.m_vt.m_primclass);
+
+	return true;
+}
 
 bool GSHwHack::OI_RozenMaidenGebetGarden(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t)
 {
@@ -1224,6 +1282,7 @@ const GSHwHack::Entry<GSRendererHW::GSC_Ptr> GSHwHack::s_get_skip_count_function
 	// Channel Effect
 	CRC_F(GSC_CrashBandicootWoC, CRCHackLevel::Partial),
 	CRC_F(GSC_GiTS, CRCHackLevel::Partial),
+	CRC_F(GSC_Spartan, CRCHackLevel::Partial),
 	CRC_F(GSC_SteambotChronicles, CRCHackLevel::Partial),
 
 	// Depth Issue
@@ -1237,6 +1296,7 @@ const GSHwHack::Entry<GSRendererHW::GSC_Ptr> GSHwHack::s_get_skip_count_function
 	CRC_F(GSC_DeathByDegreesTekkenNinaWilliams, CRCHackLevel::Partial), // + Upscaling issues
 
 	// Upscaling hacks
+	CRC_F(GSC_FightingBeautyWulong, CRCHackLevel::Partial),
 	CRC_F(GSC_Oneechanbara2Special, CRCHackLevel::Partial),
 	CRC_F(GSC_UltramanFightingEvolution, CRCHackLevel::Partial),
 	CRC_F(GSC_YakuzaGames, CRCHackLevel::Partial),
@@ -1262,6 +1322,7 @@ const GSHwHack::Entry<GSRendererHW::OI_Ptr> GSHwHack::s_before_draw_functions[]
 	CRC_F(OI_DBZBTGames, CRCHackLevel::Minimum),
 	CRC_F(OI_FFXII, CRCHackLevel::Minimum),
 	CRC_F(OI_FFX, CRCHackLevel::Minimum),
+	CRC_F(OI_MetalSlug6, CRCHackLevel::Minimum),
 	CRC_F(OI_RozenMaidenGebetGarden, CRCHackLevel::Minimum),
 	CRC_F(OI_SonicUnleashed, CRCHackLevel::Minimum),
 	CRC_F(OI_ArTonelico2, CRCHackLevel::Minimum),

pcsx2/GS/Renderers/HW/GSHwHack.h

@@ -24,6 +24,7 @@ public:
 	static bool GSC_Manhunt2(GSRendererHW& r, const GSFrameInfo& fi, int& skip);
 	static bool GSC_CrashBandicootWoC(GSRendererHW& r, const GSFrameInfo& fi, int& skip);
 	static bool GSC_SacredBlaze(GSRendererHW& r, const GSFrameInfo& fi, int& skip);
+	static bool GSC_Spartan(GSRendererHW& r, const GSFrameInfo& fi, int& skip);
 	static bool GSC_Oneechanbara2Special(GSRendererHW& r, const GSFrameInfo& fi, int& skip);
 	static bool GSC_SakuraTaisen(GSRendererHW& r, const GSFrameInfo& fi, int& skip);
 	static bool GSC_SFEX3(GSRendererHW& r, const GSFrameInfo& fi, int& skip);
@@ -38,6 +39,7 @@ public:
 	static bool GSC_Kunoichi(GSRendererHW& r, const GSFrameInfo& fi, int& skip);
 	static bool GSC_ZettaiZetsumeiToshi2(GSRendererHW& r, const GSFrameInfo& fi, int& skip);
 	static bool GSC_SakuraWarsSoLongMyLove(GSRendererHW& r, const GSFrameInfo& fi, int& skip);
+	static bool GSC_FightingBeautyWulong(GSRendererHW& r, const GSFrameInfo& fi, int& skip);
 	static bool GSC_GodHand(GSRendererHW& r, const GSFrameInfo& fi, int& skip);
 	static bool GSC_KnightsOfTheTemple2(GSRendererHW& r, const GSFrameInfo& fi, int& skip);
 	static bool GSC_UltramanFightingEvolution(GSRendererHW& r, const GSFrameInfo& fi, int& skip);
@@ -61,6 +63,7 @@ public:
 	static bool OI_DBZBTGames(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t);
 	static bool OI_FFXII(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t);
 	static bool OI_FFX(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t);
+	static bool OI_MetalSlug6(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t);
 	static bool OI_RozenMaidenGebetGarden(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t);
 	static bool OI_SonicUnleashed(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t);
 	static bool OI_ArTonelico2(GSRendererHW& r, GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t);

pcsx2/GS/Renderers/HW/GSRendererHW.cpp

@@ -24,6 +24,14 @@
 GSRendererHW::GSRendererHW()
 	: GSRenderer()
 	, m_tc(new GSTextureCache())
+	, m_src(nullptr)
+	, m_reset(false)
+	, m_tex_is_fb(false)
+	, m_channel_shuffle(false)
+	, m_userhacks_tcoffset(false)
+	, m_userhacks_tcoffset_x(0)
+	, m_userhacks_tcoffset_y(0)
+	, m_lod(GSVector2i(0, 0))
 {
 	MULTI_ISA_SELECT(GSRendererHWPopulateFunctions)(*this);
 	m_mipmap = (GSConfig.HWMipmap >= HWMipmapLevel::Basic);
@@ -36,12 +44,49 @@ GSRendererHW::GSRendererHW()
 
 	memset(&m_conf, 0, sizeof(m_conf));
 
+	m_prim_overlap = PRIM_OVERLAP_UNKNOW;
 	ResetStates();
 }
 
 GSVector2i GSRendererHW::GetOutputSize(int real_h)
 {
-	GSVector2i crtc_size(PCRTCDisplays.GetResolution());
+	GSVector2i crtc_size(GetResolution());
+
+	// Correct framebuffer size to get output size when offsets not considered (uses framebuffer height)
+	if (!GSConfig.PCRTCOffsets)
+	{
+		const int videomode = static_cast<int>(GetVideoMode()) - 1;
+		const int display_width = (VideoModeDividers[videomode].z + 1) / GetDisplayHMagnification();
+		const GSVector4i offsets = !GSConfig.PCRTCOverscan ? VideoModeOffsets[videomode] : VideoModeOffsetsOverscan[videomode];
+		int display_height = offsets.y;
+
+		if (isinterlaced() && !m_regs->SMODE2.FFMD)
+			display_height *= 2;
+
+		if (crtc_size.x < display_width || crtc_size.y < display_height)
+		{
+			GSVector2i display_baseline = { 4096, 4096 };
+
+			for (int i = 0; i < 2; i++)
+			{
+				if (IsEnabled(i))
+				{
+					const GSVector4i dr = GetDisplayRect(i);
+
+					const GSVector2i display_diff(dr.left - display_baseline.x, dr.top - display_baseline.y);
+
+					if (display_diff.x != 0 && abs(display_diff.x) < 4 && crtc_size.x < display_width)
+						crtc_size.x -= display_diff.x;
+
+					if (display_diff.y != 0 && abs(display_diff.y) < 4 && crtc_size.y < display_height)
+						crtc_size.y -= display_diff.y;
+
+					display_baseline.x = std::min(dr.left, display_baseline.x);
+					display_baseline.y = std::min(dr.top, display_baseline.y);
+				}
+			}
+		}
+	}
 
 	// Include negative display offsets in the height here.
 	crtc_size.y = std::max(crtc_size.y, real_h);
@@ -138,11 +183,10 @@ float GSRendererHW::GetUpscaleMultiplier()
 
 void GSRendererHW::Reset(bool hardware_reset)
 {
-	// Force targets to preload for 2 frames (for 30fps games).
-	static constexpr u8 TARGET_PRELOAD_FRAMES = 2;
+	// TODO: GSreset can come from the main thread too => crash
+	// m_tc->RemoveAll();
 
-	m_tc->RemoveAll();
-	m_force_preload = TARGET_PRELOAD_FRAMES;
+	m_reset = true;
 
 	GSRenderer::Reset(hardware_reset);
 }
@@ -156,45 +200,32 @@ void GSRendererHW::UpdateSettings(const Pcsx2Config::GSOptions& old_config)
 
 void GSRendererHW::VSync(u32 field, bool registers_written)
 {
-	if (m_force_preload > 0)
+	if (m_reset)
 	{
-		m_force_preload--;
-		if (m_force_preload == 0)
-		{
-			for (auto iter = m_draw_transfers.begin(); iter != m_draw_transfers.end();)
-			{
-				if ((s_n - iter->draw) > 5)
-					iter = m_draw_transfers.erase(iter);
-				else
-				{
-					iter++;
-				}
-
-			}
-		}
+		m_tc->RemoveAll();
+		m_reset = false;
+		m_force_preload = true;
 	}
 	else
-		m_draw_transfers.clear();
+	{
+		m_force_preload = false;
+		std::vector<GSState::GSUploadQueue>::iterator iter;
+		for (iter = m_draw_transfers.begin(); iter != m_draw_transfers.end(); ) {
+			if ((s_n - iter->draw) > 5)
+				iter = m_draw_transfers.erase(iter);
+			else
+				iter++;
+		}
+	}
 
 	if (GSConfig.LoadTextureReplacements)
 		GSTextureReplacements::ProcessAsyncLoadedTextures();
 
-	// Don't age the texture cache when no draws or EE writes have occurred.
-	// Xenosaga needs its targets kept around while it's loading, because it uses them for a fade transition.
-	if (m_last_draw_n == s_n && m_last_transfer_n == s_transfer_n)
-	{
-		GL_INS("No draws or transfers, not aging TC");
-	}
-	else
-	{
-		m_tc->IncAge();
-	}
-
-	m_last_draw_n = s_n + 1; // +1 for vsync
-	m_last_transfer_n = s_transfer_n;
+	m_tc->IncAge();
 
 	GSRenderer::VSync(field, registers_written);
 
+
 	if (m_tc->GetHashCacheMemoryUsage() > 1024 * 1024 * 1024)
 	{
 		Host::AddKeyedFormattedOSDMessage("HashCacheOverflow", Host::OSD_ERROR_DURATION, "Hash cache has used %.2f MB of VRAM, disabling.",
@@ -210,33 +241,40 @@ void GSRendererHW::VSync(u32 field, bool registers_written)
 
 GSTexture* GSRendererHW::GetOutput(int i, int& y_offset)
 {
-	int index = i >= 0 ? i : 1;
-
-	GSPCRTCRegs::PCRTCDisplay& curFramebuffer = PCRTCDisplays.PCRTCDisplays[index];
-	GSVector2i framebufferSize = PCRTCDisplays.GetFramebufferSize(i);
-	const int fb_width = framebufferSize.x;
-	const int fb_height = framebufferSize.y;
-
-	PCRTCDisplays.RemoveFramebufferOffset(i);
-	// TRACE(_T("[%d] GetOutput %d %05x (%d)\n"), (int)m_perfmon.GetFrame(), i, (int)TEX0.TBP0, (int)TEX0.PSM);
-
-	GSTexture* t = nullptr;
+	const GSRegDISPFB& DISPFB = m_regs->DISP[i].DISPFB;
 
 	GIFRegTEX0 TEX0 = {};
-	TEX0.TBP0 = curFramebuffer.Block();
-	TEX0.TBW = curFramebuffer.FBW;
-	TEX0.PSM = curFramebuffer.PSM;
+
+	TEX0.TBP0 = DISPFB.Block();
+	TEX0.TBW = DISPFB.FBW;
+	TEX0.PSM = DISPFB.PSM;
+
+	const int videomode = static_cast<int>(GetVideoMode()) - 1;
+	const GSVector4i offsets = VideoModeOffsets[videomode];
+
+	const int fb_width = std::min<int>(std::min<int>(GetFramebufferWidth(), DISPFB.FBW * 64) + static_cast<int>(DISPFB.DBX), 2048);
+	const int display_height = offsets.y * ((isinterlaced() && !m_regs->SMODE2.FFMD) ? 2 : 1);
+	const int display_offset = GetResolutionOffset(i).y;
+	int fb_height = (std::min<int>(GetFramebufferHeight(), display_height) + static_cast<int>(DISPFB.DBY)) % 2048;
+	// If there is a negative vertical offset on the picture, we need to read more.
+	if (display_offset < 0)
+	{
+		fb_height += -display_offset;
+	}
+	// TRACE(_T("[%d] GetOutput %d %05x (%d)\n"), static_cast<int>(g_perfmon.GetFrame()), i, static_cast<int>(TEX0.TBP0), static_cast<int>(TEX0.PSM));
+
+	GSTexture* t = nullptr;
 
 	if (GSTextureCache::Target* rt = m_tc->LookupDisplayTarget(TEX0, GetOutputSize(fb_height) * GSConfig.UpscaleMultiplier, fb_width, fb_height))
 	{
 		t = rt->m_texture;
 
 		const int delta = TEX0.TBP0 - rt->m_TEX0.TBP0;
-		if (delta > 0 && curFramebuffer.FBW != 0)
+		if (delta > 0 && DISPFB.FBW != 0)
 		{
 			const int pages = delta >> 5u;
-			int y_pages = pages / curFramebuffer.FBW;
-			y_offset = y_pages * GSLocalMemory::m_psm[curFramebuffer.PSM].pgs.y;
+			int y_pages = pages / DISPFB.FBW;
+			y_offset = y_pages * GSLocalMemory::m_psm[DISPFB.PSM].pgs.y;
 			GL_CACHE("Frame y offset %d pixels, unit %d", y_offset, i);
 		}
 
@@ -425,22 +463,47 @@ void GSRendererHW::ExpandIndices()
 }
 
 // Fix the vertex position/tex_coordinate from 16 bits color to 32 bits color
-void GSRendererHW::ConvertSpriteTextureShuffle(bool& write_ba, bool& read_ba)
+void GSRendererHW::ConvertSpriteTextureShuffle(bool& write_ba, bool& read_ba, bool& swap_ga)
 {
 	const u32 count = m_vertex.next;
 	GSVertex* v = &m_vertex.buff[0];
 	const GIFRegXYOFFSET& o = m_context->XYOFFSET;
-
+	int first_vertex = (v[1].XYZ.X > v[0].XYZ.X) ? 0 : 1;
 	// vertex position is 8 to 16 pixels, therefore it is the 16-31 bits of the colors
-	const int pos = (v[0].XYZ.X - o.OFX) & 0xFF;
+	const int pos = (v[first_vertex].XYZ.X - o.OFX) & 0xFF;
+	DevCon.Warning("Draw %d Pos %d(%d)",s_n, pos, pos >> 4);
 	write_ba = (pos > 112 && pos < 136);
 
-	// Read texture is 8 to 16 pixels (same as above)
 	const float tw = static_cast<float>(1u << m_context->TEX0.TW);
-	int tex_pos = (PRIM->FST) ? v[0].U : static_cast<int>(tw * v[0].ST.S);
+
+	// Read texture is 8 to 16 pixels (same as above)
+	int tex_pos = (PRIM->FST) ? v[first_vertex].U : static_cast<int>(tw * v[first_vertex].ST.S);
 	tex_pos &= 0xFF;
 	read_ba = (tex_pos > 112 && tex_pos < 144);
 
+	int coord_width = std::abs(v[first_vertex].XYZ.X - v[1 - first_vertex].XYZ.X) >> 4;
+
+	int tex_width = m_vt.m_max.t.x - m_vt.m_min.t.x;
+
+	// Probably Green/Alpha swap
+	if (tex_width > 14)
+	{
+		/*v[1 - first_vertex].XYZ.X = ((v[1 - first_vertex].XYZ.X - o.OFX) * 2) + o.OFX;
+		v[first_vertex].XYZ.X = ((v[first_vertex].XYZ.X - o.OFX) * 2) + o.OFX;
+		if (m_vt.m_max.p.y > 512.0f)
+		{
+			DevCon.Warning("Changing width from %d to %d", v[1 - first_vertex].XYZ.X, v[1 - first_vertex].XYZ.X + (tex_width << 4));
+			v[1 - first_vertex].XYZ.X -= tex_width << 4;
+		}*/
+		DevCon.Warning("Width %d Max y %f", tex_width, m_vt.m_max.p.y);
+		//read_ba = true;
+		//write_ba = false;
+		swap_ga = true;
+		return;
+	}
+	else
+		swap_ga = false;
+
 	bool half_bottom = false;
 	switch (GSConfig.UserHacks_HalfBottomOverride)
 	{
@@ -503,15 +566,16 @@ void GSRendererHW::ConvertSpriteTextureShuffle(bool& write_ba, bool& read_ba)
 
 		for (u32 i = 0; i < count; i += 2)
 		{
+			first_vertex = (v[i+1].XYZ.X > v[i].XYZ.X) ? 0 : 1;
 			if (write_ba)
-				v[i].XYZ.X   -= 128u;
+				v[i+first_vertex].XYZ.X   -= 128u;
 			else
-				v[i+1].XYZ.X += 128u;
+				v[i+(1-first_vertex)].XYZ.X += 128u;
 
 			if (read_ba)
-				v[i].U       -= 128u;
+				v[i + first_vertex].U       -= 128u;
 			else
-				v[i+1].U     += 128u;
+				v[i+(1 - first_vertex)].U   += 128u;
 
 			if (!half_bottom)
 			{
@@ -519,13 +583,13 @@ void GSRendererHW::ConvertSpriteTextureShuffle(bool& write_ba, bool& read_ba)
 				const int tex_offset = v[i].V & 0xF;
 				const GSVector4i offset(o.OFY, tex_offset, o.OFY, tex_offset);
 
-				GSVector4i tmp(v[i].XYZ.Y, v[i].V, v[i + 1].XYZ.Y, v[i + 1].V);
+				GSVector4i tmp(v[i + first_vertex].XYZ.Y, v[i +first_vertex].V, v[i + (1 - first_vertex)].XYZ.Y, v[i + (1 - first_vertex)].V);
 				tmp = GSVector4i(tmp - offset).srl32(1) + offset;
 
-				v[i].XYZ.Y = static_cast<u16>(tmp.x);
-				v[i].V = static_cast<u16>(tmp.y);
-				v[i + 1].XYZ.Y = static_cast<u16>(tmp.z);
-				v[i + 1].V = static_cast<u16>(tmp.w);
+				v[i + first_vertex].XYZ.Y = static_cast<u16>(tmp.x);
+				v[i + first_vertex].V = static_cast<u16>(tmp.y);
+				v[i + (1 - first_vertex)].XYZ.Y = static_cast<u16>(tmp.z);
+				v[i + (1 - first_vertex)].V = static_cast<u16>(tmp.w);
 			}
 		}
 	}
@@ -536,22 +600,24 @@ void GSRendererHW::ConvertSpriteTextureShuffle(bool& write_ba, bool& read_ba)
 
 		for (u32 i = 0; i < count; i += 2)
 		{
+			first_vertex = (v[i + 1].XYZ.X > v[i].XYZ.X) ? 0 : 1;
+
 			if (write_ba)
-				v[i].XYZ.X   -= 128u;
+				v[i+ first_vertex].XYZ.X   -= 128u;
 			else
-				v[i+1].XYZ.X += 128u;
+				v[i+(1- first_vertex)].XYZ.X += 128u;
 
 			if (read_ba)
-				v[i].ST.S    -= offset_8pix;
+				v[i + first_vertex].ST.S    -= offset_8pix;
 			else
-				v[i+1].ST.S  += offset_8pix;
+				v[i + (1- first_vertex)].ST.S += offset_8pix;
 
 			if (!half_bottom)
 			{
 				// Height is too big (2x).
 				const GSVector4i offset(o.OFY, o.OFY);
 
-				GSVector4i tmp(v[i].XYZ.Y, v[i + 1].XYZ.Y);
+				GSVector4i tmp(v[i+ first_vertex].XYZ.Y, v[i + (1- first_vertex)].XYZ.Y);
 				tmp = GSVector4i(tmp - offset).srl32(1) + offset;
 
 				//fprintf(stderr, "Before %d, After %d\n", v[i + 1].XYZ.Y, tmp.y);
@@ -759,8 +825,8 @@ GSVector2i GSRendererHW::GetTargetSize(GSVector2i* unscaled_size)
 		const int page_y = GSLocalMemory::m_psm[m_context->FRAME.PSM].pgs.y - 1;
 
 		// Round up the page as channel shuffles are generally done in pages at a time
-		width = (std::max(static_cast<u32>(PCRTCDisplays.GetResolution().x), width) + page_x) & ~page_x;
-		min_height = (std::max(static_cast<u32>(PCRTCDisplays.GetResolution().y), min_height) + page_y) & ~page_y;
+		width = (std::max(static_cast<u32>(GetResolution().x), width) + page_x) & ~page_x;
+		min_height = (std::max(static_cast<u32>(GetResolution().y), min_height) + page_y) & ~page_y;
 	}
 
 	// Align to even lines, reduces the chance of tiny resizes.
@@ -1333,7 +1399,7 @@ void GSRendererHW::Draw()
 	}
 
 	// SW CLUT Render enable.
-	bool force_preload = GSConfig.PreloadFrameWithGSData;
+	bool preload = GSConfig.PreloadFrameWithGSData | m_force_preload;
 	if (GSConfig.UserHacks_CPUCLUTRender > 0 || GSConfig.UserHacks_GPUTargetCLUTMode != GSGPUTargetCLUTMode::Disabled)
 	{
 		const CLUTDrawTestResult result = (GSConfig.UserHacks_CPUCLUTRender == 2) ? PossibleCLUTDrawAggressive() : PossibleCLUTDraw();
@@ -1354,17 +1420,14 @@ void GSRendererHW::Draw()
 				!IsOpaque()) // Blending enabled
 			{
 				GL_INS("Forcing preload due to partial/blended CLUT draw");
-				force_preload = true;
+				preload = m_force_preload = true;
 			}
 		}
 	}
 
 	if (m_channel_shuffle)
 	{
-		// NFSU2 does consecutive channel shuffles with blending, reducing the alpha channel over time.
-		// Fortunately, it seems to change the FBMSK along the way, so this check alone is sufficient.
-		m_channel_shuffle = draw_sprite_tex && m_context->TEX0.PSM == PSM_PSMT8 && single_page &&
-							m_last_channel_shuffle_fbmsk == m_context->FRAME.FBMSK;
+		m_channel_shuffle = draw_sprite_tex && (m_context->TEX0.PSM == PSM_PSMT8) && single_page;
 		if (m_channel_shuffle)
 		{
 			GL_CACHE("Channel shuffle effect detected SKIP");
@@ -1378,7 +1441,6 @@ void GSRendererHW::Draw()
 		{
 			GL_INS("Channel shuffle effect detected");
 			m_channel_shuffle = true;
-			m_last_channel_shuffle_fbmsk = m_context->FRAME.FBMSK;
 		}
 		else
 		{
@@ -1409,14 +1471,13 @@ void GSRendererHW::Draw()
 			const bool clear_height_valid = (m_r.w >= 1024);
 			if (clear_height_valid && context->FRAME.FBW == 1)
 			{
-				GSVector2i fb_size = PCRTCDisplays.GetFramebufferSize(-1);
-				u32 width = ceil(static_cast<float>(m_r.w) / fb_size.y) * 64;
+				u32 width = ceil(static_cast<float>(m_r.w) / GetFramebufferHeight()) * 64;
 				// Framebuffer is likely to be read as 16bit later, so we will need to double the width if the write is 32bit.
-				const bool double_width = GSLocalMemory::m_psm[context->FRAME.PSM].bpp == 32 && PCRTCDisplays.GetFramebufferBitDepth() == 16;
+				const bool double_width = GSLocalMemory::m_psm[context->FRAME.PSM].bpp == 32 && GetFramebufferBitDepth() == 16;
 				m_r.x = 0;
 				m_r.y = 0;
-				m_r.w = fb_size.y;
-				m_r.z = std::max((width * (double_width ? 2 : 1)), static_cast<u32>(fb_size.x));
+				m_r.w = GetFramebufferHeight();
+				m_r.z = std::max((width * (double_width ? 2 : 1)), static_cast<u32>(GetFramebufferWidth()));
 				context->FRAME.FBW = (m_r.z + 63) / 64;
 				m_context->scissor.in.z = context->FRAME.FBW * 64;
 
@@ -1453,9 +1514,8 @@ void GSRendererHW::Draw()
 		}
 	}
 	TextureMinMaxResult tmm;
-	const bool process_texture = PRIM->TME && !(PRIM->ABE && m_context->ALPHA.IsBlack() && !m_context->TEX0.TCC);
 	// Disable texture mapping if the blend is black and using alpha from vertex.
-	if (process_texture)
+	if (PRIM->TME && !(PRIM->ABE && m_context->ALPHA.IsBlack() && !m_context->TEX0.TCC))
 	{
 		GIFRegCLAMP MIP_CLAMP = context->CLAMP;
 		GSVector2i hash_lod_range(0, 0);
@@ -1565,7 +1625,7 @@ void GSRendererHW::Draw()
 
 	GSTextureCache::Target* rt = nullptr;
 	if (!no_rt)
-		rt = m_tc->LookupTarget(TEX0, t_size, GSTextureCache::RenderTarget, true, fm, false, unscaled_target_size.x, unscaled_target_size.y, force_preload);
+		rt = m_tc->LookupTarget(TEX0, t_size, GSTextureCache::RenderTarget, true, fm, false, unscaled_target_size.x, unscaled_target_size.y, preload);
 
 	TEX0.TBP0 = context->ZBUF.Block();
 	TEX0.TBW = context->FRAME.FBW;
@@ -1573,9 +1633,9 @@ void GSRendererHW::Draw()
 
 	GSTextureCache::Target* ds = nullptr;
 	if (!no_ds)
-		ds = m_tc->LookupTarget(TEX0, t_size, GSTextureCache::DepthStencil, context->DepthWrite(), 0, false, unscaled_target_size.x, unscaled_target_size.y, force_preload);
+		ds = m_tc->LookupTarget(TEX0, t_size, GSTextureCache::DepthStencil, context->DepthWrite(), 0, false, 0, 0, preload);
 
-	if (process_texture)
+	if (PRIM->TME)
 	{
 		GIFRegCLAMP MIP_CLAMP = context->CLAMP;
 
@@ -1594,6 +1654,9 @@ void GSRendererHW::Draw()
 		m_texture_shuffle = (GSLocalMemory::m_psm[context->FRAME.PSM].bpp == 16) && (tex_psm.bpp == 16)
 			&& draw_sprite_tex && (m_src->m_32_bits_fmt || copy_16bit_to_target_shuffle);
 
+
+		if (copy_16bit_to_target_shuffle && m_texture_shuffle)
+			DevCon.Warning("here");
 		// Okami mustn't call this code
 		if (m_texture_shuffle && m_vertex.next < 3 && PRIM->FST && ((m_context->FRAME.FBMSK & fm_mask) == 0))
 		{
@@ -1625,7 +1688,6 @@ void GSRendererHW::Draw()
 		{
 			GL_INS("Channel shuffle effect detected (2nd shot)");
 			m_channel_shuffle = true;
-			m_last_channel_shuffle_fbmsk = m_context->FRAME.FBMSK;
 		}
 		else
 		{
@@ -2199,8 +2261,9 @@ void GSRendererHW::EmulateTextureShuffleAndFbmask()
 
 		bool write_ba;
 		bool read_ba;
+		bool swap_ga;
 
-		ConvertSpriteTextureShuffle(write_ba, read_ba);
+		ConvertSpriteTextureShuffle(write_ba, read_ba, swap_ga);
 
 		// If date is enabled you need to test the green channel instead of the
 		// alpha channel. Only enable this code in DATE mode to reduce the number
@@ -2220,37 +2283,52 @@ void GSRendererHW::EmulateTextureShuffleAndFbmask()
 		const GSVector2i rb_ga_mask = GSVector2i(fbmask & 0xFF, (fbmask >> 8) & 0xFF);
 		m_conf.colormask.wrgba = 0;
 
-		// 2 Select the new mask
-		if (rb_ga_mask.r != 0xFF)
+		if (swap_ga)
 		{
-			if (write_ba)
-			{
-				GL_INS("Color shuffle %s => B", read_ba ? "B" : "R");
-				m_conf.colormask.wb = 1;
-			}
-			else
-			{
-				GL_INS("Color shuffle %s => R", read_ba ? "B" : "R");
-				m_conf.colormask.wr = 1;
-			}
-			if (rb_ga_mask.r)
-				m_conf.ps.fbmask = 1;
+			m_conf.ps.swap_ga = true;
+			m_conf.ps.fbmask = 0;
+			GL_CACHE("I hate myself");
+			m_conf.colormask.wg = 1;
+			m_conf.colormask.wa = 1;
+			m_skip = 1;
+			DevCon.Warning("Kill me");
+			m_conf.ps.tex_is_fb = true;
+			return;
 		}
-
-		if (rb_ga_mask.g != 0xFF)
+		else
 		{
-			if (write_ba)
+			// 2 Select the new mask
+			if (rb_ga_mask.r != 0xFF)
 			{
-				GL_INS("Color shuffle %s => A", read_ba ? "A" : "G");
-				m_conf.colormask.wa = 1;
+				if (write_ba)
+				{
+					DevCon.Warning("Color shuffle %s => B", read_ba ? "B" : "R");
+					m_conf.colormask.wb = 1;
+				}
+				else
+				{
+					DevCon.Warning("Color shuffle %s => R", read_ba ? "B" : "R");
+					m_conf.colormask.wr = 1;
+				}
+				if (rb_ga_mask.r)
+					m_conf.ps.fbmask = 1;
 			}
-			else
+
+			if (rb_ga_mask.g != 0xFF)
 			{
-				GL_INS("Color shuffle %s => G", read_ba ? "A" : "G");
-				m_conf.colormask.wg = 1;
+				if (write_ba)
+				{
+					DevCon.Warning("Color shuffle %s => A", read_ba ? "A" : "G");
+					m_conf.colormask.wa = 1;
+				}
+				else
+				{
+					DevCon.Warning("Color shuffle %s => G", read_ba ? "A" : "G");
+					m_conf.colormask.wg = 1;
+				}
+				if (rb_ga_mask.g)
+					m_conf.ps.fbmask = 1;
 			}
-			if (rb_ga_mask.g)
-				m_conf.ps.fbmask = 1;
 		}
 
 		if (m_conf.ps.fbmask && enable_fbmask_emulation)
@@ -2263,12 +2341,12 @@ void GSRendererHW::EmulateTextureShuffleAndFbmask()
 			// No blending so hit unsafe path.
 			if (!PRIM->ABE || !features.texture_barrier)
 			{
-				GL_INS("FBMASK Unsafe SW emulated fb_mask:%x on tex shuffle", fbmask);
+				DevCon.Warning("FBMASK Unsafe SW emulated fb_mask:%x on tex shuffle", fbmask);
 				m_conf.require_one_barrier = true;
 			}
 			else
 			{
-				GL_INS("FBMASK SW emulated fb_mask:%x on tex shuffle", fbmask);
+				DevCon.Warning("FBMASK SW emulated fb_mask:%x on tex shuffle", fbmask);
 				m_conf.require_full_barrier = true;
 			}
 		}
@@ -2320,14 +2398,14 @@ void GSRendererHW::EmulateTextureShuffleAndFbmask()
 			// No blending so hit unsafe path.
 			if (!PRIM->ABE || !(~ff_fbmask & ~zero_fbmask & 0x7) || !g_gs_device->Features().texture_barrier)
 			{
-				GL_INS("FBMASK Unsafe SW emulated fb_mask:%x on %d bits format", m_context->FRAME.FBMSK,
+				DevCon.Warning("FBMASK Unsafe SW emulated fb_mask:%x on %d bits format", m_context->FRAME.FBMSK,
 					(m_conf.ps.dfmt == 2) ? 16 : 32);
 				m_conf.require_one_barrier = true;
 			}
 			else
 			{
 				// The safe and accurate path (but slow)
-				GL_INS("FBMASK SW emulated fb_mask:%x on %d bits format", m_context->FRAME.FBMSK,
+				DevCon.Warning("FBMASK SW emulated fb_mask:%x on %d bits format", m_context->FRAME.FBMSK,
 					(m_conf.ps.dfmt == 2) ? 16 : 32);
 				m_conf.require_full_barrier = true;
 			}
@@ -3353,8 +3431,8 @@ void GSRendererHW::EmulateTextureSampler(const GSTextureCache::Source* tex)
 	m_conf.cb_vs.texture_scale = GSVector2(tc_oh_ts.x, tc_oh_ts.y);
 
 	// Only enable clamping in CLAMP mode. REGION_CLAMP will be done manually in the shader
-	m_conf.sampler.tau = (wms == CLAMP_REPEAT);
-	m_conf.sampler.tav = (wmt == CLAMP_REPEAT);
+	m_conf.sampler.tau = (wms != CLAMP_CLAMP);
+	m_conf.sampler.tav = (wmt != CLAMP_CLAMP);
 	if (shader_emulated_sampler)
 	{
 		m_conf.sampler.biln = 0;
@@ -3994,8 +4072,8 @@ GSRendererHW::CLUTDrawTestResult GSRendererHW::PossibleCLUTDraw()
 		(PRIM->TME && ((m_regs->DISP[0].DISPFB.Block() == m_context->TEX0.TBP0) || (m_regs->DISP[1].DISPFB.Block() == m_context->TEX0.TBP0)) && !(m_mem.m_clut.IsInvalid() & 2)))
 		return CLUTDrawTestResult::NotCLUTDraw;
 
-	// Ignore large render targets, make sure it's staying in page width.
-	if (PRIM->TME && (m_context->FRAME.FBW != 1 && m_context->TEX0.TBW == m_context->FRAME.FBW))
+	// Ignore recursive/shuffle effects, but possible it will recursively draw, but make sure it's staying in page width
+	if (PRIM->TME && m_context->TEX0.TBP0 == m_context->FRAME.Block() && (m_context->FRAME.FBW != 1 && m_context->TEX0.TBW == m_context->FRAME.FBW))
 		return CLUTDrawTestResult::NotCLUTDraw;
 
 	// Hopefully no games draw a CLUT with a CLUT, that would be evil, most likely a channel shuffle.

pcsx2/GS/Renderers/HW/GSRendererHW.h

@@ -97,8 +97,8 @@ private:
 	void SetTCOffset();
 
 	GSTextureCache* m_tc;
-	GSVector4i m_r = {};
-	GSTextureCache::Source* m_src = nullptr;
+	GSVector4i m_r;
+	GSTextureCache::Source* m_src;
 
 	// CRC Hacks
 	bool IsBadFrame();
@@ -107,27 +107,22 @@ private:
 	int m_skip = 0;
 	int m_skip_offset = 0;
 
-	u32 m_last_channel_shuffle_fbmsk = 0;
-	bool m_channel_shuffle = false;
+	bool m_reset;
+	bool m_tex_is_fb;
+	bool m_channel_shuffle;
+	bool m_userhacks_tcoffset;
+	float m_userhacks_tcoffset_x;
+	float m_userhacks_tcoffset_y;
 
-	bool m_tex_is_fb = false;
-	bool m_userhacks_tcoffset = false;
-	float m_userhacks_tcoffset_x = 0.0f;
-	float m_userhacks_tcoffset_y = 0.0f;
+	GSVector2i m_lod; // Min & Max level of detail
 
-	GSVector2i m_lod = {}; // Min & Max level of detail
-
-	GSHWDrawConfig m_conf = {};
+	GSHWDrawConfig m_conf;
 
 	// software sprite renderer state
 	std::vector<GSVertexSW> m_sw_vertex_buffer;
 	std::unique_ptr<GSTextureCacheSW::Texture> m_sw_texture[7 + 1];
 	std::unique_ptr<GSVirtualAlignedClass<32>> m_sw_rasterizer;
 
-	// Tracking draw counters for idle frame detection.
-	int m_last_draw_n = 0;
-	int m_last_transfer_n = 0;
-
 public:
 	GSRendererHW();
 	virtual ~GSRendererHW() override;
@@ -145,7 +140,7 @@ public:
 	void Lines2Sprites();
 	bool VerifyIndices();
 	template <GSHWDrawConfig::VSExpand Expand> void ExpandIndices();
-	void ConvertSpriteTextureShuffle(bool& write_ba, bool& read_ba);
+	void ConvertSpriteTextureShuffle(bool& write_ba, bool& read_ba, bool& swap_ga);
 	GSVector4 RealignTargetTextureCoordinate(const GSTextureCache::Source* tex);
 	GSVector4i ComputeBoundingBox(const GSVector2& rtscale, const GSVector2i& rtsize);
 	void MergeSprite(GSTextureCache::Source* tex);

pcsx2/GS/Renderers/HW/GSTextureCache.cpp

@@ -43,9 +43,24 @@ GSTextureCache::~GSTextureCache()
 
 	RemoveAll();
 
+	m_surface_offset_cache.clear();
+
 	_aligned_free(s_unswizzle_buffer);
 }
 
+void GSTextureCache::RemovePartial()
+{
+	//m_src.RemoveAll();
+
+	for (int type = 0; type < 2; type++)
+	{
+		for (auto t : m_dst[type])
+			delete t;
+
+		m_dst[type].clear();
+	}
+}
+
 void GSTextureCache::RemoveAll()
 {
 	m_src.RemoveAll();
@@ -70,8 +85,6 @@ void GSTextureCache::RemoveAll()
 
 	m_source_memory_usage = 0;
 	m_target_memory_usage = 0;
-
-	m_surface_offset_cache.clear();
 }
 
 void GSTextureCache::AddDirtyRectTarget(Target* target, GSVector4i rect, u32 psm, u32 bw)
@@ -148,7 +161,7 @@ GSTextureCache::Source* GSTextureCache::LookupDepthSource(const GIFRegTEX0& TEX0
 		for (auto t : m_dst[RenderTarget])
 		{
 			// FIXME: do I need to allow m_age == 1 as a potential match (as DepthStencil) ???
-			if (t->m_age <= 1 && t->m_used && t->m_dirty.empty() && GSUtil::HasSharedBits(bp, psm, t->m_TEX0.TBP0, t->m_TEX0.PSM))
+			if (!t->m_age && t->m_used && t->m_dirty.empty() && GSUtil::HasSharedBits(bp, psm, t->m_TEX0.TBP0, t->m_TEX0.PSM))
 			{
 				ASSERT(GSLocalMemory::m_psm[t->m_TEX0.PSM].depth);
 				dst = t;
@@ -386,18 +399,11 @@ GSTextureCache::Source* GSTextureCache::LookupSource(const GIFRegTEX0& TEX0, con
 						// 2/ even with upscaling
 						// 3/ for both Direct3D and OpenGL
 						if (GSConfig.UserHacks_CPUFBConversion && (psm == PSM_PSMT4 || psm == PSM_PSMT8))
-						{
 							// Forces 4-bit and 8-bit frame buffer conversion to be done on the CPU instead of the GPU, but performance will be slower.
 							// There is no dedicated shader to handle 4-bit conversion (Stuntman has been confirmed to use 4-bit).
 							// Direct3D10/11 and OpenGL support 8-bit fb conversion but don't render some corner cases properly (Harry Potter games).
 							// The hack can fix glitches in some games.
-							if (!t->m_drawn_since_read.rempty())
-							{
-								Read(t, t->m_drawn_since_read);
-
-								t->m_drawn_since_read = GSVector4i::zero();
-							}
-						}
+							Read(t, t->m_valid);
 						else
 							dst = t;
 
@@ -423,7 +429,7 @@ GSTextureCache::Source* GSTextureCache::LookupSource(const GIFRegTEX0& TEX0, con
 				}
 				// Make sure the texture actually is INSIDE the RT, it's possibly not valid if it isn't.
 				// Also check BP >= TBP, create source isn't equpped to expand it backwards and all data comes from the target. (GH3)
-				else if (GSConfig.UserHacks_TextureInsideRt && psm >= PSM_PSMCT32 && psm <= PSM_PSMCT16S && t->m_TEX0.PSM == psm &&
+				else if (GSConfig.UserHacks_TextureInsideRt && psm == PSM_PSMCT32 && t->m_TEX0.PSM == psm &&
 						(t->Overlaps(bp, bw, psm, r) || t_wraps) && t->m_age <= 1 && !found_t && bp >= t->m_TEX0.TBP0)
 				{
 					// Only PSMCT32 to limit false hits.
@@ -511,7 +517,7 @@ GSTextureCache::Source* GSTextureCache::LookupSource(const GIFRegTEX0& TEX0, con
 			// 1/ Check only current frame, I guess it is only used as a postprocessing effect
 			for (auto t : m_dst[DepthStencil])
 			{
-				if (t->m_age <= 1 && t->m_used && t->m_dirty.empty() && GSUtil::HasSharedBits(bp, psm, t->m_TEX0.TBP0, t->m_TEX0.PSM))
+				if (!t->m_age && t->m_used && t->m_dirty.empty() && GSUtil::HasSharedBits(bp, psm, t->m_TEX0.TBP0, t->m_TEX0.PSM))
 				{
 					GL_INS("TC: Warning depth format read as color format. Pixels will be scrambled");
 					// Let's fetch a depth format texture. Rational, it will avoid the texture allocation and the
@@ -769,6 +775,7 @@ GSTextureCache::Target* GSTextureCache::LookupTarget(const GIFRegTEX0& TEX0, con
 		GL_CACHE("TC: Lookup %s(%s) %dx%d, miss (0x%x, %s)", is_frame ? "Frame" : "Target", to_string(type), size.x, size.y, bp, psm_str(TEX0.PSM));
 
 		dst = CreateTarget(TEX0, size.x, size.y, type, true);
+
 		// In theory new textures contain invalidated data. Still in theory a new target
 		// must contains the content of the GS memory.
 		// In practice, TC will wrongly invalidate some RT. For example due to write on the alpha
@@ -781,22 +788,18 @@ GSTextureCache::Target* GSTextureCache::LookupTarget(const GIFRegTEX0& TEX0, con
 		// From a performance point of view, it might cost a little on big upscaling
 		// but normally few RT are miss so it must remain reasonable.
 		const bool supported_fmt = !GSConfig.UserHacks_DisableDepthSupport || psm_s.depth == 0;
-
-		if (TEX0.TBW > 0 && supported_fmt)
+		const bool forced_preload = static_cast<GSRendererHW*>(g_gs_renderer.get())->m_force_preload;
+		if ((is_frame || preload || forced_preload) && TEX0.TBW > 0 && supported_fmt)
 		{
-			const bool forced_preload = GSRendererHW::GetInstance()->m_force_preload > 0;
-			const GSVector4i newrect = GSVector4i(0, 0, real_w, real_h);
-
-			if (!is_frame && !forced_preload && !preload)
+			if (!is_frame && !forced_preload)
 			{
 				std::vector<GSState::GSUploadQueue>::iterator iter;
-				for (iter = GSRendererHW::GetInstance()->m_draw_transfers.begin(); iter != GSRendererHW::GetInstance()->m_draw_transfers.end(); )
-				{
-					// If the format, and location doesn't match, but also the upload is at least the size of the target, don't preload.
-					if (iter->blit.DBP == TEX0.TBP0 && GSUtil::HasCompatibleBits(iter->blit.DPSM, TEX0.PSM) && iter->rect.rintersect(newrect).eq(newrect))
+				for (iter = static_cast<GSRendererHW*>(g_gs_renderer.get())->m_draw_transfers.begin(); iter != static_cast<GSRendererHW*>(g_gs_renderer.get())->m_draw_transfers.end(); ) {
+					if (iter->blit.DBP == TEX0.TBP0 && GSUtil::HasSharedBits(iter->blit.DPSM, TEX0.PSM))
 					{
-						GSRendererHW::GetInstance()->m_draw_transfers.erase(iter);
+						iter = static_cast<GSRendererHW*>(g_gs_renderer.get())->m_draw_transfers.erase(iter);
 						GL_INS("Preloading the RT DATA");
+						const GSVector4i newrect = GSVector4i(0, 0, real_w, real_h);
 						AddDirtyRectTarget(dst, newrect, TEX0.PSM, TEX0.TBW);
 						dst->Update(true);
 						break;
@@ -807,6 +810,7 @@ GSTextureCache::Target* GSTextureCache::LookupTarget(const GIFRegTEX0& TEX0, con
 			else
 			{
 				GL_INS("Preloading the RT DATA");
+				const GSVector4i newrect = GSVector4i(0, 0, real_w, real_h);
 				AddDirtyRectTarget(dst, newrect, TEX0.PSM, TEX0.TBW);
 				dst->Update(true);
 			}
@@ -819,8 +823,7 @@ GSTextureCache::Target* GSTextureCache::LookupTarget(const GIFRegTEX0& TEX0, con
 	}
 	if (is_frame)
 		dst->m_dirty_alpha = false;
-
-	dst->readbacks_since_draw = 0;
+	
 
 	assert(dst && dst->m_texture && dst->m_texture->GetScale() == new_s);
 	assert(dst && dst->m_dirty.empty());
@@ -1356,23 +1359,13 @@ void GSTextureCache::InvalidateVideoMem(const GSOffset& off, const GSVector4i& r
 				}
 				else if (GSConfig.UserHacks_TextureInsideRt && t->Overlaps(bp, bw, psm, rect) && GSUtil::HasCompatibleBits(psm, t->m_TEX0.PSM))
 				{
-					SurfaceOffsetKey sok;
-					sok.elems[0].bp = bp;
-					sok.elems[0].bw = bw;
-					sok.elems[0].psm = psm;
-					sok.elems[0].rect = r;
-					sok.elems[1].bp = t->m_TEX0.TBP0;
-					sok.elems[1].bw = t->m_TEX0.TBW;
-					sok.elems[1].psm = t->m_TEX0.PSM;
-					sok.elems[1].rect = t->m_valid;
-
-					const SurfaceOffset so = ComputeSurfaceOffset(sok);
+					const SurfaceOffset so = ComputeSurfaceOffset(off, r, t);
 					if (so.is_valid)
 					{
 						if (eewrite)
 							t->m_age = 0;
 
-						AddDirtyRectTarget(t, so.b2a_offset, t->m_TEX0.PSM, t->m_TEX0.TBW);
+						AddDirtyRectTarget(t, so.b2a_offset, psm, bw);
 					}
 				}
 #endif
@@ -1417,14 +1410,7 @@ void GSTextureCache::InvalidateLocalMem(const GSOffset& off, const GSVector4i& r
 				if (GSUtil::HasSharedBits(bp, psm, t->m_TEX0.TBP0, t->m_TEX0.PSM))
 				{
 					if (GSUtil::HasCompatibleBits(psm, t->m_TEX0.PSM))
-					{
-						const GSVector4i draw_rect = (t->readbacks_since_draw > 0) ? t->m_drawn_since_read : r.rintersect(t->m_drawn_since_read);
-						Read(t, draw_rect);
-
-						t->readbacks_since_draw++;
-						if(draw_rect.rintersect(t->m_drawn_since_read).eq(t->m_drawn_since_read))
-							t->m_drawn_since_read = GSVector4i::zero();
-					}
+						Read(t, r.rintersect(t->m_valid));
 				}
 			}
 		}
@@ -1463,10 +1449,6 @@ void GSTextureCache::InvalidateLocalMem(const GSOffset& off, const GSVector4i& r
 				// note: r.rintersect breaks Wizardry and Chaos Legion
 				// Read(t, t->m_valid) works in all tested games but is very slow in GUST titles ><
 
-				// If the game has been spamming downloads, we've already read the whole texture back at this point.
-				if (t->m_drawn_since_read.rempty())
-					continue;
-
 				// propagate the format from the result of a channel effect
 				// texture is 16/8 bit but the real data is 32
 				// common use for shuffling is moving data into the alpha channel
@@ -1482,39 +1464,16 @@ void GSTextureCache::InvalidateLocalMem(const GSOffset& off, const GSVector4i& r
 					const GSVector4i rb_rc((!GSConfig.UserHacks_DisablePartialInvalidation && targetr.x == 0 && targetr.y == 0) ? t->m_valid : targetr.rintersect(t->m_valid));
 					DevCon.Error("Skipping depth readback of %ux%u @ %u,%u", rb_rc.width(), rb_rc.height(), rb_rc.left, rb_rc.top);
 				}
+				else if (GSConfig.UserHacks_DisablePartialInvalidation)
+				{
+					Read(t, targetr.rintersect(t->m_valid));
+				}
 				else
 				{
-					// If it's a download to the EE, or we've done multiple reads of the same texture between draws, just get it all.
-					if (!GSConfig.UserHacks_DisablePartialInvalidation && t->readbacks_since_draw > 0)
-					{
-						Read(t, t->m_drawn_since_read);
-						t->m_drawn_since_read = GSVector4i::zero();
-						t->readbacks_since_draw++;
-					}
-					else if(!targetr.rintersect(t->m_drawn_since_read).rempty()) // Block level read?
-					{
-						// Read full width of drawn area, it's not much slower and makes invalidation easier.
-						GSVector4i full_lines = GSVector4i(0, targetr.y, t->m_valid.z, targetr.w);
-						full_lines = full_lines.rintersect(t->m_drawn_since_read);
-
-						Read(t, full_lines);
-
-						// After reading, try to cut down our "dirty" rect.
-						if (full_lines.rintersect(t->m_drawn_since_read).eq(t->m_drawn_since_read))
-							t->m_drawn_since_read = GSVector4i::zero();
-						else
-						{
-							// Try to cut down how much we read next, if we can.
-							if (full_lines.w >= t->m_drawn_since_read.y)
-							{
-								if (full_lines.y <= t->m_drawn_since_read.y)
-									t->m_drawn_since_read.y = full_lines.w;
-								else if (full_lines.w >= t->m_drawn_since_read.w)
-									t->m_drawn_since_read.w = full_lines.y;
-							}
-						}
-						t->readbacks_since_draw++;
-					}
+					if (targetr.x == 0 && targetr.y == 0) // Full screen read?
+						Read(t, t->m_valid);
+					else // Block level read?
+						Read(t, targetr.rintersect(t->m_valid));
 				}
 			}
 		}
@@ -1620,24 +1579,6 @@ bool GSTextureCache::Move(u32 SBP, u32 SBW, u32 SPSM, int sx, int sy, u32 DBP, u
 	// Look for an exact match on the targets.
 	GSTextureCache::Target* src = GetExactTarget(SBP, SBW, SPSM);
 	GSTextureCache::Target* dst = GetExactTarget(DBP, DBW, DPSM);
-
-	// Beware of the case where a game might create a larger texture by moving a bunch of chunks around.
-	// We use dx/dy == 0 and the TBW check as a safeguard to make sure these go through to local memory.
-	// Good test case for this is the Xenosaga I cutscene transitions, or Gradius V.
-	if (src && !dst && dx == 0 && dy == 0 && ((static_cast<u32>(w) + 63) / 64) == DBW)
-	{
-		GIFRegTEX0 new_TEX0 = {};
-		new_TEX0.TBP0 = DBP;
-		new_TEX0.TBW = DBW;
-		new_TEX0.PSM = DPSM;
-
-		const int real_height = GetTargetHeight(DBP, DBW, DPSM, h);
-		const GSVector2 scale(src->m_texture->GetScale());
-		dst = LookupTarget(new_TEX0, GSVector2i(static_cast<int>(w * scale.x), static_cast<int>(real_height * scale.y)), src->m_type, true);
-		if (dst)
-			dst->m_texture->SetScale(scale);
-	}
-
 	if (!src || !dst || src->m_texture->GetScale() != dst->m_texture->GetScale())
 		return false;
 
@@ -3126,67 +3067,63 @@ void GSTextureCache::Target::Update(bool reset_age)
 	{
 		// do the most likely thing a direct write would do, clear it
 		GL_INS("ERROR: Update DepthStencil dummy");
-		m_dirty.clear();
+		m_dirty.ClearDirty();
 		return;
 	}
-
-	const GSVector2i unscaled_size(static_cast<int>(m_texture->GetWidth() / m_texture->GetScale().x),
-		static_cast<int>(m_texture->GetHeight() / m_texture->GetScale().y));
-	const GSVector4i total_rect(m_dirty.GetTotalRect(m_TEX0, unscaled_size));
-	if (total_rect.rempty())
+	else if (m_type == DepthStencil && g_gs_renderer->m_game.title == CRC::FFX2)
 	{
-		GL_INS("ERROR: Nothing to update?");
-		m_dirty.clear();
+		GL_INS("ERROR: bad invalidation detected, depth buffer will be cleared");
+		// FFX2 menu. Invalidation of the depth is wrongly done and only the first
+		// page is invalidated. Technically a CRC hack will be better but I don't expect
+		// any games to only upload a single page of data for the depth.
+		//
+		// FFX2 menu got another bug. I'm not sure the top-left is properly written or not. It
+		// could be a gs transfer bug too due to unaligned-page transfer.
+		//
+		// So the quick and dirty solution is just to clean the depth buffer.
+		g_gs_device->ClearDepth(m_texture);
+		m_dirty.ClearDirty();
 		return;
 	}
 
-	const GSVector4i t_offset(total_rect.xyxy());
-	const GSVector4i t_size(total_rect - t_offset);
-	const GSVector4 t_sizef(t_size.zwzw());
-
-	// This'll leave undefined data in pixels that we're not reading from... shouldn't hurt anything.
-	GSTexture* const t = g_gs_device->CreateTexture(t_size.z, t_size.w, 1, GSTexture::Format::Color);
-	GSTexture::GSMap m;
-	const bool mapped = t->Map(m);
-
 	GIFRegTEXA TEXA = {};
+
 	TEXA.AEM = 1;
 	TEXA.TA0 = 0;
 	TEXA.TA1 = 0x80;
 
-	const GSOffset off(g_gs_renderer->m_mem.GetOffset(m_TEX0.TBP0, m_TEX0.TBW, m_TEX0.PSM));
-	for (size_t i = 0; i < m_dirty.size(); i++)
+	const GSOffset off = g_gs_renderer->m_mem.GetOffset(m_TEX0.TBP0, m_TEX0.TBW, m_TEX0.PSM);
+
+	GSTexture::GSMap m;
+
+	const GSVector4i unscaled_size = GSVector4i(GSVector4(m_texture->GetSize()) / GSVector4(m_texture->GetScale()));
+	const GSVector4i rect_size = m_dirty.GetTotalRect(m_TEX0, GSVector2i(unscaled_size.x, unscaled_size.y));
+
+	GSTexture* t = g_gs_device->CreateTexture(rect_size.z, rect_size.w, 1, GSTexture::Format::Color);
+
+	while (m_dirty.size() > 0)
 	{
-		const GSVector4i r(m_dirty.GetDirtyRect(i, m_TEX0, total_rect));
+		const GSVector4i r = m_dirty.GetDirtyRectAndClear(m_TEX0, GSVector2i(unscaled_size.x, unscaled_size.y));
+
 		if (r.rempty())
 			continue;
 
-		const GSVector4i t_r(r - t_offset);
-		if (mapped)
+		if (t->Map(m))
 		{
-			g_gs_renderer->m_mem.ReadTexture(
-				off, r, m.bits + t_r.y * static_cast<u32>(m.pitch) + (t_r.x * sizeof(u32)), m.pitch, TEXA);
+			g_gs_renderer->m_mem.ReadTexture(off, r, m.bits, m.pitch, TEXA);
+
+			t->Unmap();
 		}
 		else
 		{
-			const int pitch = Common::AlignUpPow2(r.width() * sizeof(u32), 32);
+			int pitch = ((r.width()+3) & ~3) * 4;
 			g_gs_renderer->m_mem.ReadTexture(off, r, s_unswizzle_buffer, pitch, TEXA);
 
-			t->Update(t_r, s_unswizzle_buffer, pitch);
+			t->Update(r, s_unswizzle_buffer, pitch);
 		}
-	}
 
-	if (mapped)
-		t->Unmap();
-
-	for (size_t i = 0; i < m_dirty.size(); i++)
-	{
-		const GSVector4i r(m_dirty.GetDirtyRect(i, m_TEX0, total_rect));
-		if (r.rempty())
-			continue;
-
-		const GSVector4 sRect(GSVector4(r - t_offset) / t_sizef);
-		const GSVector4 dRect(GSVector4(r) * GSVector4(m_texture->GetScale()).xyxy());
+		const GSVector4 sRect = GSVector4(0.0f, 0.0f, static_cast<float>(r.width()) / rect_size.z, static_cast<float>(r.height()) / rect_size.w);
+		const GSVector4 dest_rect = (GSVector4(r) * GSVector4(m_texture->GetScale()).xyxy());
 
 		// Copy the new GS memory content into the destination texture.
 		if (m_type == RenderTarget)
@@ -3194,21 +3131,21 @@ void GSTextureCache::Target::Update(bool reset_age)
 			GL_INS("ERROR: Update RenderTarget 0x%x bw:%d (%d,%d => %d,%d)", m_TEX0.TBP0, m_TEX0.TBW, r.x, r.y, r.z, r.w);
 
 			// Bilinear filtering this is probably not a good thing, at least in native, but upscaling Nearest can be gross and messy.
-			g_gs_device->StretchRect(t, sRect, m_texture, dRect, ShaderConvert::COPY, g_gs_renderer->CanUpscale());
+			g_gs_device->StretchRect(t, sRect, m_texture, dest_rect,ShaderConvert::COPY, g_gs_renderer->CanUpscale());
 		}
 		else if (m_type == DepthStencil)
 		{
 			GL_INS("ERROR: Update DepthStencil 0x%x", m_TEX0.TBP0);
 
 			// FIXME linear or not?
-			g_gs_device->StretchRect(t, sRect, m_texture, dRect, ShaderConvert::RGBA8_TO_FLOAT32_BILN);
+			const GSVector4 sRect = GSVector4(0.0f, 0.0f, static_cast<float>(r.width()) / rect_size.z, static_cast<float>(r.height()) / rect_size.w);
+			g_gs_device->StretchRect(t, sRect, m_texture, dest_rect, ShaderConvert::RGBA8_TO_FLOAT32_BILN);
 		}
 	}
-
-	UpdateValidity(total_rect);
-
+	// m_renderer->m_perfmon.Put(GSPerfMon::Unswizzle, w * h * 4);
 	g_gs_device->Recycle(t);
-	m_dirty.clear();
+
+	UpdateValidity(rect_size);
 }
 
 void GSTextureCache::Target::UpdateIfDirtyIntersects(const GSVector4i& rc)
@@ -3235,7 +3172,6 @@ void GSTextureCache::Target::UpdateValidity(const GSVector4i& rect)
 	else
 		m_valid = m_valid.runion(rect);
 
-	m_drawn_since_read = m_drawn_since_read.runion(rect);
 	// Block of the bottom right texel of the validity rectangle, last valid block of the texture
 	// TODO: This is not correct when the PSM changes. e.g. a 512x448 target being shuffled will become 512x896 temporarily, and
 	// at the moment, we blow the valid rect out to twice the size. The only thing stopping everything breaking is the fact

pcsx2/GS/Renderers/HW/GSTextureCache.h

@@ -234,15 +234,13 @@ public:
 	class Target : public Surface
 	{
 	public:
-		const int m_type = 0;
-		bool m_used = false;
+		const int m_type;
+		bool m_used;
 		GSDirtyRectList m_dirty;
-		GSVector4i m_valid{};
-		GSVector4i m_drawn_since_read{};
-		const bool m_depth_supported = false;
-		bool m_dirty_alpha = true;
-		bool m_is_frame = false;
-		int readbacks_since_draw = 0;
+		GSVector4i m_valid;
+		const bool m_depth_supported;
+		bool m_dirty_alpha;
+		bool m_is_frame;
 
 	public:
 		Target(const GIFRegTEX0& TEX0, const bool depth_supported, const int type);
@@ -305,10 +303,10 @@ public:
 
 			struct
 			{
-				u32 fbp : 14;
+				u32 fbp : 9;
 				u32 fbw : 6;
 				u32 psm : 6;
-				u32 pad : 6;
+				u32 pad : 11;
 			};
 		};
 
@@ -397,6 +395,7 @@ public:
 	void Read(Target* t, const GSVector4i& r);
 	void Read(Source* t, const GSVector4i& r);
 	void RemoveAll();
+	void RemovePartial();
 	void AddDirtyRectTarget(Target* target, GSVector4i rect, u32 psm, u32 bw);
 
 	GSTexture* LookupPaletteSource(u32 CBP, u32 CPSM, u32 CBW, GSVector2i& offset, const GSVector2i& size);

pcsx2/GS/Renderers/Metal/GSDeviceMTL.h

@@ -351,7 +351,7 @@ public:
 
 	GSTexture* CreateSurface(GSTexture::Type type, int width, int height, int levels, GSTexture::Format format) override;
 
-	void DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex, GSVector4* dRect, const GSRegPMODE& PMODE, const GSRegEXTBUF& EXTBUF, const GSVector4& c, const bool linear) override;
+	void DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex, GSVector4* dRect, const GSRegPMODE& PMODE, const GSRegEXTBUF& EXTBUF, const GSVector4& c) override;
 	void DoInterlace(GSTexture* sTex, GSTexture* dTex, int shader, bool linear, float yoffset, int bufIdx) override;
 	void DoFXAA(GSTexture* sTex, GSTexture* dTex) override;
 	void DoShadeBoost(GSTexture* sTex, GSTexture* dTex, const float params[4]) override;

pcsx2/GS/Renderers/Metal/GSDeviceMTL.mm

@@ -542,7 +542,7 @@ GSTexture* GSDeviceMTL::CreateSurface(GSTexture::Type type, int width, int heigh
 	}
 }}
 
-void GSDeviceMTL::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex, GSVector4* dRect, const GSRegPMODE& PMODE, const GSRegEXTBUF& EXTBUF, const GSVector4& c, const bool linear)
+void GSDeviceMTL::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex, GSVector4* dRect, const GSRegPMODE& PMODE, const GSRegEXTBUF& EXTBUF, const GSVector4& c)
 { @autoreleasepool {
 	id<MTLCommandBuffer> cmdbuf = GetRenderCmdBuf();
 	GSScopedDebugGroupMTL dbg(cmdbuf, @"DoMerge");
@@ -563,12 +563,12 @@ void GSDeviceMTL::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex,
 	{
 		// 2nd output is enabled and selected. Copy it to destination so we can blend it with 1st output
 		// Note: value outside of dRect must contains the background color (c)
-		StretchRect(sTex[1], sRect[1], dTex, dRect[1], ShaderConvert::COPY, linear);
+		StretchRect(sTex[1], sRect[1], dTex, dRect[1], ShaderConvert::COPY);
 	}
 
 	// Save 2nd output
 	if (feedback_write_2) // FIXME I'm not sure dRect[1] is always correct
-		DoStretchRect(dTex, full_r, sTex[2], dRect[1], m_convert_pipeline[static_cast<int>(ShaderConvert::YUV)], linear, LoadAction::DontCareIfFull, &cb_yuv, sizeof(cb_yuv));
+		DoStretchRect(dTex, full_r, sTex[2], dRect[1], m_convert_pipeline[static_cast<int>(ShaderConvert::YUV)], true, LoadAction::DontCareIfFull, &cb_yuv, sizeof(cb_yuv));
 
 	if (feedback_write_2_but_blend_bg)
 		ClearRenderTarget(dTex, c);
@@ -582,17 +582,17 @@ void GSDeviceMTL::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex,
 		if (PMODE.MMOD == 1)
 		{
 			// Blend with a constant alpha
-			DoStretchRect(sTex[0], sRect[0], dTex, dRect[0], pipeline, linear, LoadAction::Load, &cb_c, sizeof(cb_c));
+			DoStretchRect(sTex[0], sRect[0], dTex, dRect[0], pipeline, true, LoadAction::Load, &cb_c, sizeof(cb_c));
 		}
 		else
 		{
 			// Blend with 2 * input alpha
-			DoStretchRect(sTex[0], sRect[0], dTex, dRect[0], pipeline, linear, LoadAction::Load, nullptr, 0);
+			DoStretchRect(sTex[0], sRect[0], dTex, dRect[0], pipeline, true, LoadAction::Load, nullptr, 0);
 		}
 	}
 
 	if (feedback_write_1) // FIXME I'm not sure dRect[0] is always correct
-		StretchRect(dTex, full_r, sTex[2], dRect[0], ShaderConvert::YUV, linear);
+		StretchRect(dTex, full_r, sTex[2], dRect[0], ShaderConvert::YUV);
 }}
 
 void GSDeviceMTL::DoInterlace(GSTexture* sTex, GSTexture* dTex, int shader, bool linear, float yoffset, int bufIdx)

pcsx2/GS/Renderers/Null/GSDeviceNull.h

@@ -23,7 +23,7 @@ class GSDeviceNull : public GSDevice
 private:
 	GSTexture* CreateSurface(GSTexture::Type type, int width, int height, int levels, GSTexture::Format format);
 
-	void DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex, GSVector4* dRect, const GSRegPMODE& PMODE, const GSRegEXTBUF& EXTBUF, const GSVector4& c, const bool linear) {}
+	void DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex, GSVector4* dRect, const GSRegPMODE& PMODE, const GSRegEXTBUF& EXTBUF, const GSVector4& c) {}
 	void DoInterlace(GSTexture* sTex, GSTexture* dTex, int shader, bool linear, float yoffset = 0, int bufIdx = 0) {}
 	u16 ConvertBlendEnum(u16 generic) { return 0xFFFF; }
 

pcsx2/GS/Renderers/OpenGL/GLLoader.cpp

@@ -17,7 +17,6 @@
 #include "GLLoader.h"
 #include "GS/GS.h"
 #include "Host.h"
-#include "HostSettings.h"
 
 namespace ReplaceGL
 {
@@ -113,8 +112,8 @@ namespace GLLoader
 	bool vendor_id_amd = false;
 	bool vendor_id_nvidia = false;
 	bool vendor_id_intel = false;
+	bool mesa_driver = false;
 	bool buggy_pbo = false;
-	bool disable_download_pbo = false;
 
 	bool is_gles = false;
 	bool has_dual_source_blend = false;
@@ -132,8 +131,14 @@ namespace GLLoader
 			vendor_id_amd = true;
 		else if (strstr(vendor, "NVIDIA Corporation"))
 			vendor_id_nvidia = true;
+
+#ifdef _WIN32
 		else if (strstr(vendor, "Intel"))
 			vendor_id_intel = true;
+#else
+		// On linux assumes the free driver if it isn't nvidia or amd pro driver
+		mesa_driver = !vendor_id_nvidia && !vendor_id_amd;
+#endif
 
 		if (GSConfig.OverrideGeometryShaders != -1)
 		{
@@ -220,16 +225,10 @@ namespace GLLoader
 
 		// Don't use PBOs when we don't have ARB_buffer_storage, orphaning buffers probably ends up worse than just
 		// using the normal texture update routines and letting the driver take care of it.
-		buggy_pbo = !GLAD_GL_VERSION_4_4 && !GLAD_GL_ARB_buffer_storage && !GLAD_GL_EXT_buffer_storage;
-		if (buggy_pbo)
+		GLLoader::buggy_pbo = !GLAD_GL_VERSION_4_4 && !GLAD_GL_ARB_buffer_storage && !GLAD_GL_EXT_buffer_storage;
+		if (GLLoader::buggy_pbo)
 			Console.Warning("Not using PBOs for texture uploads because buffer_storage is unavailable.");
 
-		// Give the user the option to disable PBO usage for downloads.
-		// Most drivers seem to be faster with PBO.
-		disable_download_pbo = Host::GetBoolSettingValue("EmuCore/GS", "DisableGLDownloadPBO", false);
-		if (disable_download_pbo)
-			Console.Warning("Not using PBOs for texture downloads, this may reduce performance.");
-
 		return true;
 	}
 

pcsx2/GS/Renderers/OpenGL/GLLoader.h

@@ -29,8 +29,9 @@ namespace GLLoader
 	extern bool vendor_id_amd;
 	extern bool vendor_id_nvidia;
 	extern bool vendor_id_intel;
+	extern bool mesa_driver;
 	extern bool buggy_pbo;
-	extern bool disable_download_pbo;
+	extern bool in_replayer;
 
 	// GL
 	extern bool is_gles;

pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp

@@ -1308,7 +1308,7 @@ void GSDeviceOGL::DrawStretchRect(const GSVector4& sRect, const GSVector4& dRect
 	DrawPrimitive();
 }
 
-void GSDeviceOGL::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex, GSVector4* dRect, const GSRegPMODE& PMODE, const GSRegEXTBUF& EXTBUF, const GSVector4& c, const bool linear)
+void GSDeviceOGL::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex, GSVector4* dRect, const GSRegPMODE& PMODE, const GSRegEXTBUF& EXTBUF, const GSVector4& c)
 {
 	GL_PUSH("DoMerge");
 
@@ -1327,7 +1327,7 @@ void GSDeviceOGL::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex,
 	{
 		// 2nd output is enabled and selected. Copy it to destination so we can blend it with 1st output
 		// Note: value outside of dRect must contains the background color (c)
-		StretchRect(sTex[1], sRect[1], dTex, PMODE.SLBG ? dRect[2] : dRect[1], ShaderConvert::COPY, linear);
+		StretchRect(sTex[1], sRect[1], dTex, PMODE.SLBG ? dRect[2] : dRect[1], ShaderConvert::COPY);
 	}
 
 	// Upload constant to select YUV algo
@@ -1340,7 +1340,7 @@ void GSDeviceOGL::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex,
 
 	// Save 2nd output
 	if (feedback_write_2)
-		StretchRect(dTex, full_r, sTex[2], dRect[2], ShaderConvert::YUV, linear);
+		StretchRect(dTex, full_r, sTex[2], dRect[2], ShaderConvert::YUV);
 
 	// Restore background color to process the normal merge
 	if (feedback_write_2_but_blend_bg)
@@ -1357,17 +1357,17 @@ void GSDeviceOGL::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex,
 			// Blend with a constant alpha
 			m_merge_obj.ps[1].Bind();
 			m_merge_obj.ps[1].Uniform4fv(0, c.v);
-			StretchRect(sTex[0], sRect[0], dTex, dRect[0], m_merge_obj.ps[1], true, OMColorMaskSelector(), linear);
+			StretchRect(sTex[0], sRect[0], dTex, dRect[0], m_merge_obj.ps[1], true, OMColorMaskSelector());
 		}
 		else
 		{
 			// Blend with 2 * input alpha
-			StretchRect(sTex[0], sRect[0], dTex, dRect[0], m_merge_obj.ps[0], true, OMColorMaskSelector(), linear);
+			StretchRect(sTex[0], sRect[0], dTex, dRect[0], m_merge_obj.ps[0], true, OMColorMaskSelector());
 		}
 	}
 
 	if (feedback_write_1)
-		StretchRect(dTex, full_r, sTex[2], dRect[2], ShaderConvert::YUV, linear);
+		StretchRect(dTex, full_r, sTex[2], dRect[2], ShaderConvert::YUV);
 }
 
 void GSDeviceOGL::DoInterlace(GSTexture* sTex, GSTexture* dTex, int shader, bool linear, float yoffset, int bufIdx)

pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.h

@@ -276,7 +276,7 @@ private:
 
 	GSTexture* CreateSurface(GSTexture::Type type, int width, int height, int levels, GSTexture::Format format) final;
 
-	void DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex, GSVector4* dRect, const GSRegPMODE& PMODE, const GSRegEXTBUF& EXTBUF, const GSVector4& c, const bool linear) final;
+	void DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex, GSVector4* dRect, const GSRegPMODE& PMODE, const GSRegEXTBUF& EXTBUF, const GSVector4& c) final;
 	void DoInterlace(GSTexture* sTex, GSTexture* dTex, int shader, bool linear, float yoffset = 0, int bufIdx = 0) final;
 	void DoFXAA(GSTexture* sTex, GSTexture* dTex) final;
 	void DoShadeBoost(GSTexture* sTex, GSTexture* dTex, const float params[4]) final;

pcsx2/GS/Renderers/OpenGL/GSTextureOGL.cpp

@@ -453,10 +453,9 @@ GSDownloadTextureOGL::~GSDownloadTextureOGL()
 
 std::unique_ptr<GSDownloadTextureOGL> GSDownloadTextureOGL::Create(u32 width, u32 height, GSTexture::Format format)
 {
-	const u32 buffer_size = GetBufferSize(width, height, format, TEXTURE_UPLOAD_PITCH_ALIGNMENT);
+	const u32 buffer_size = GetBufferSize(width, height, format, GSTexture::GetCompressedBytesPerBlock(format));
 
-	const bool use_buffer_storage = (GLAD_GL_VERSION_4_4 || GLAD_GL_ARB_buffer_storage || GLAD_GL_EXT_buffer_storage) &&
-									!GLLoader::disable_download_pbo;
+	const bool use_buffer_storage = (GLAD_GL_VERSION_4_4 || GLAD_GL_ARB_buffer_storage || GLAD_GL_EXT_buffer_storage);
 	if (use_buffer_storage)
 	{
 		GLuint buffer_id;

pcsx2/GS/Renderers/SW/GSRendererSW.cpp

@@ -82,6 +82,22 @@ void GSRendererSW::VSync(u32 field, bool registers_written)
 {
 	Sync(0); // IncAge might delete a cached texture in use
 
+	if (0) if (LOG)
+	{
+		fprintf(s_fp, "%llu\n", g_perfmon.GetFrame());
+
+		GSVector4i dr = GetDisplayRect();
+		GSVector4i fr = GetFrameRect();
+
+		fprintf(s_fp, "dr %d %d %d %d, fr %d %d %d %d\n",
+			dr.x, dr.y, dr.z, dr.w,
+			fr.x, fr.y, fr.z, fr.w);
+
+		m_regs->Dump(s_fp);
+
+		fflush(s_fp);
+	}
+
 	/*
 	int draw[8], sum = 0;
 
@@ -111,20 +127,27 @@ GSTexture* GSRendererSW::GetOutput(int i, int& y_offset)
 {
 	Sync(1);
 
-	int index = i >= 0 ? i : 1;
-	GSPCRTCRegs::PCRTCDisplay& curFramebuffer = PCRTCDisplays.PCRTCDisplays[index];
-	GSVector2i framebufferSize = PCRTCDisplays.GetFramebufferSize(i);
-	GSVector4i framebufferRect = PCRTCDisplays.GetFramebufferRect(i);
-	int w = curFramebuffer.FBW * 64;
-	int h = framebufferSize.y;
+	const GSRegDISPFB& DISPFB = m_regs->DISP[i].DISPFB;
 
-	if (g_gs_device->ResizeTarget(&m_texture[index], w, h))
+	int w = DISPFB.FBW * 64;
+
+	const int videomode = static_cast<int>(GetVideoMode()) - 1;
+	const int display_offset = GetResolutionOffset(i).y;
+	const GSVector4i offsets = !GSConfig.PCRTCOverscan ? VideoModeOffsets[videomode] : VideoModeOffsetsOverscan[videomode];
+	const int display_height = offsets.y * ((isinterlaced() && !m_regs->SMODE2.FFMD) ? 2 : 1);
+	int h = std::min(GetFramebufferHeight(), display_height);
+
+	// If there is a negative vertical offset on the picture, we need to read more.
+	if (display_offset < 0)
+	{
+		h += -display_offset;
+	}
+
+	if (g_gs_device->ResizeTarget(&m_texture[i], w, h))
 	{
-		const GSLocalMemory::psm_t& psm = GSLocalMemory::m_psm[curFramebuffer.PSM];
 		constexpr int pitch = 1024 * 4;
-		// Should really be framebufferOffsets rather than framebufferRect but this might be compensated with anti-blur in some games.
-		const int off_x = (framebufferRect.x & 0x7ff) & ~(psm.bs.x-1);
-		const int off_y = (framebufferRect.y & 0x7ff) & ~(psm.bs.y-1);
+		const int off_x = DISPFB.DBX & 0x7ff;
+		const int off_y = DISPFB.DBY & 0x7ff;
 		const GSVector4i out_r(0, 0, w, h);
 		GSVector4i r(off_x, off_y, w + off_x, h + off_y);
 		GSVector4i rh(off_x, off_y, w + off_x, (h + off_y) & 0x7FF);
@@ -132,7 +155,6 @@ GSTexture* GSRendererSW::GetOutput(int i, int& y_offset)
 		bool h_wrap = false;
 		bool w_wrap = false;
 
-		PCRTCDisplays.RemoveFramebufferOffset(i);
 		// Need to read it in 2 parts, since you can't do a split rect.
 		if (r.bottom >= 2048)
 		{
@@ -150,51 +172,50 @@ GSTexture* GSRendererSW::GetOutput(int i, int& y_offset)
 			w_wrap = true;
 		}
 
+		const GSLocalMemory::psm_t& psm = GSLocalMemory::m_psm[DISPFB.PSM];
+
 		// Display doesn't use texa, and instead uses the equivalent of this
 		GIFRegTEXA texa = {};
 		texa.AEM = 0;
-		texa.TA0 = (curFramebuffer.PSM == PSM_PSMCT24 || curFramebuffer.PSM == PSM_PSGPU24) ? 0x80 : 0;
+		texa.TA0 = (DISPFB.PSM == PSM_PSMCT24 || DISPFB.PSM == PSM_PSGPU24) ? 0x80 : 0;
 		texa.TA1 = 0x80;
 
 		// Top left rect
-		psm.rtx(m_mem, m_mem.GetOffset(curFramebuffer.Block(), curFramebuffer.FBW, curFramebuffer.PSM), r.ralign<Align_Outside>(psm.bs), m_output, pitch, texa);
-
-		// Top left rect
-		psm.rtx(m_mem, m_mem.GetOffset(curFramebuffer.Block(), curFramebuffer.FBW, curFramebuffer.PSM), r.ralign<Align_Outside>(psm.bs), m_output, pitch, texa);
+		psm.rtx(m_mem, m_mem.GetOffset(DISPFB.Block(), DISPFB.FBW, DISPFB.PSM), r.ralign<Align_Outside>(psm.bs), m_output, pitch, texa);
 
 		int top = (h_wrap) ? ((r.bottom - r.top) * pitch) : 0;
-		int left = (w_wrap) ? (r.right - r.left) * (GSLocalMemory::m_psm[curFramebuffer.PSM].bpp / 8) : 0;
+		int left = (w_wrap) ? (r.right - r.left) * (GSLocalMemory::m_psm[DISPFB.PSM].bpp / 8) : 0;
 
 		// The following only happen if the DBX/DBY wrap around at 2048.
 
 		// Top right rect
 		if (w_wrap)
-			psm.rtx(m_mem, m_mem.GetOffset(curFramebuffer.Block(), curFramebuffer.FBW, curFramebuffer.PSM), rw.ralign<Align_Outside>(psm.bs), &m_output[left], pitch, texa);
+			psm.rtx(m_mem, m_mem.GetOffset(DISPFB.Block(), DISPFB.FBW, DISPFB.PSM), rw.ralign<Align_Outside>(psm.bs), &m_output[left], pitch, texa);
 
 		// Bottom left rect
 		if (h_wrap)
-			psm.rtx(m_mem, m_mem.GetOffset(curFramebuffer.Block(), curFramebuffer.FBW, curFramebuffer.PSM), rh.ralign<Align_Outside>(psm.bs), &m_output[top], pitch, texa);
+			psm.rtx(m_mem, m_mem.GetOffset(DISPFB.Block(), DISPFB.FBW, DISPFB.PSM), rh.ralign<Align_Outside>(psm.bs), &m_output[top], pitch, texa);
 
 		// Bottom right rect
 		if (h_wrap && w_wrap)
 		{
 			// Needs also rw with the start/end height of rh, fills in the bottom right rect which will be missing if both overflow.
 			const GSVector4i rwh(rw.left, rh.top, rw.right, rh.bottom);
-			psm.rtx(m_mem, m_mem.GetOffset(curFramebuffer.Block(), curFramebuffer.FBW, curFramebuffer.PSM), rwh.ralign<Align_Outside>(psm.bs), &m_output[top + left], pitch, texa);
+			psm.rtx(m_mem, m_mem.GetOffset(DISPFB.Block(), DISPFB.FBW, DISPFB.PSM), rwh.ralign<Align_Outside>(psm.bs), &m_output[top + left], pitch, texa);
 		}
 
-		m_texture[index]->Update(out_r, m_output, pitch);
+		m_texture[i]->Update(out_r, m_output, pitch);
 
 		if (GSConfig.DumpGSData)
 		{
 			if (GSConfig.SaveFrame && s_n >= GSConfig.SaveN)
 			{
-				m_texture[i]->Save(GetDrawDumpPath("%05d_f%lld_fr%d_%05x_%s.bmp", s_n, g_perfmon.GetFrame(), i, (int)curFramebuffer.Block(), psm_str(curFramebuffer.PSM)));
+				m_texture[i]->Save(GetDrawDumpPath("%05d_f%lld_fr%d_%05x_%s.bmp", s_n, g_perfmon.GetFrame(), i, (int)DISPFB.Block(), psm_str(DISPFB.PSM)));
 			}
 		}
 	}
 
-	return m_texture[index];
+	return m_texture[i];
 }
 
 GSTexture* GSRendererSW::GetFeedbackOutput()
@@ -469,18 +490,18 @@ void GSRendererSW::Draw()
 			{
 				// Dump the RT in 32 bits format. It helps to debug texture shuffle effect
 				s = GetDrawDumpPath("%05d_f%lld_rt0_%05x_32bits.bmp", s_n, frame, m_context->FRAME.Block());
-				m_mem.SaveBMP(s, m_context->FRAME.Block(), m_context->FRAME.FBW, 0, PCRTCDisplays.GetFramebufferRect(-1).width(), 512);
+				m_mem.SaveBMP(s, m_context->FRAME.Block(), m_context->FRAME.FBW, 0, GetFrameRect().width(), 512);
 			}
 
 			s = GetDrawDumpPath("%05d_f%lld_rt0_%05x_%s.bmp", s_n, frame, m_context->FRAME.Block(), psm_str(m_context->FRAME.PSM));
-			m_mem.SaveBMP(s, m_context->FRAME.Block(), m_context->FRAME.FBW, m_context->FRAME.PSM, PCRTCDisplays.GetFramebufferRect(-1).width(), 512);
+			m_mem.SaveBMP(s, m_context->FRAME.Block(), m_context->FRAME.FBW, m_context->FRAME.PSM, GetFrameRect().width(), 512);
 		}
 
 		if (GSConfig.SaveDepth && s_n >= GSConfig.SaveN)
 		{
 			s = GetDrawDumpPath("%05d_f%lld_rz0_%05x_%s.bmp", s_n, frame, m_context->ZBUF.Block(), psm_str(m_context->ZBUF.PSM));
 
-			m_mem.SaveBMP(s, m_context->ZBUF.Block(), m_context->FRAME.FBW, m_context->ZBUF.PSM, PCRTCDisplays.GetFramebufferRect(-1).width(), 512);
+			m_mem.SaveBMP(s, m_context->ZBUF.Block(), m_context->FRAME.FBW, m_context->ZBUF.PSM, GetFrameRect().width(), 512);
 		}
 
 		Queue(data);
@@ -493,18 +514,18 @@ void GSRendererSW::Draw()
 			{
 				// Dump the RT in 32 bits format. It helps to debug texture shuffle effect
 				s = GetDrawDumpPath("%05d_f%lld_rt1_%05x_32bits.bmp", s_n, frame, m_context->FRAME.Block());
-				m_mem.SaveBMP(s, m_context->FRAME.Block(), m_context->FRAME.FBW, 0, PCRTCDisplays.GetFramebufferRect(-1).width(), 512);
+				m_mem.SaveBMP(s, m_context->FRAME.Block(), m_context->FRAME.FBW, 0, GetFrameRect().width(), 512);
 			}
 
 			s = GetDrawDumpPath("%05d_f%lld_rt1_%05x_%s.bmp", s_n, frame, m_context->FRAME.Block(), psm_str(m_context->FRAME.PSM));
-			m_mem.SaveBMP(s, m_context->FRAME.Block(), m_context->FRAME.FBW, m_context->FRAME.PSM, PCRTCDisplays.GetFramebufferRect(-1).width(), 512);
+			m_mem.SaveBMP(s, m_context->FRAME.Block(), m_context->FRAME.FBW, m_context->FRAME.PSM, GetFrameRect().width(), 512);
 		}
 
 		if (GSConfig.SaveDepth && s_n >= GSConfig.SaveN)
 		{
 			s = GetDrawDumpPath("%05d_f%lld_rz1_%05x_%s.bmp", s_n, frame, m_context->ZBUF.Block(), psm_str(m_context->ZBUF.PSM));
 
-			m_mem.SaveBMP(s, m_context->ZBUF.Block(), m_context->FRAME.FBW, m_context->ZBUF.PSM, PCRTCDisplays.GetFramebufferRect(-1).width(), 512);
+			m_mem.SaveBMP(s, m_context->ZBUF.Block(), m_context->FRAME.FBW, m_context->ZBUF.PSM, GetFrameRect().width(), 512);
 		}
 
 		if (GSConfig.SaveL > 0 && (s_n - GSConfig.SaveN) > GSConfig.SaveL)
@@ -592,14 +613,14 @@ void GSRendererSW::Sync(int reason)
 		{
 			s = GetDrawDumpPath("%05d_f%lld_rt1_%05x_%s.bmp", s_n, g_perfmon.GetFrame(), m_context->FRAME.Block(), psm_str(m_context->FRAME.PSM));
 
-			m_mem.SaveBMP(s, m_context->FRAME.Block(), m_context->FRAME.FBW, m_context->FRAME.PSM, PCRTCDisplays.GetFramebufferRect(-1).width(), 512);
+			m_mem.SaveBMP(s, m_context->FRAME.Block(), m_context->FRAME.FBW, m_context->FRAME.PSM, GetFrameRect().width(), 512);
 		}
 
 		if (GSConfig.SaveDepth)
 		{
 			s = GetDrawDumpPath("%05d_f%lld_zb1_%05x_%s.bmp", s_n, g_perfmon.GetFrame(), m_context->ZBUF.Block(), psm_str(m_context->ZBUF.PSM));
 
-			m_mem.SaveBMP(s, m_context->ZBUF.Block(), m_context->FRAME.FBW, m_context->ZBUF.PSM, PCRTCDisplays.GetFramebufferRect(-1).width(), 512);
+			m_mem.SaveBMP(s, m_context->ZBUF.Block(), m_context->FRAME.FBW, m_context->ZBUF.PSM, GetFrameRect().width(), 512);
 		}
 	}
 

pcsx2/GS/Renderers/Vulkan/GSDeviceVK.cpp

@@ -705,7 +705,7 @@ void GSDeviceVK::UpdateCLUTTexture(GSTexture* sTex, u32 offsetX, u32 offsetY, GS
 }
 
 void GSDeviceVK::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex, GSVector4* dRect,
-	const GSRegPMODE& PMODE, const GSRegEXTBUF& EXTBUF, const GSVector4& c, const bool linear)
+	const GSRegPMODE& PMODE, const GSRegEXTBUF& EXTBUF, const GSVector4& c)
 {
 	GL_PUSH("DoMerge");
 
@@ -714,7 +714,7 @@ void GSDeviceVK::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex,
 	const bool feedback_write_2 = PMODE.EN2 && sTex[2] != nullptr && EXTBUF.FBIN == 1;
 	const bool feedback_write_1 = PMODE.EN1 && sTex[2] != nullptr && EXTBUF.FBIN == 0;
 	const bool feedback_write_2_but_blend_bg = feedback_write_2 && PMODE.SLBG == 1;
-	const VkSampler& sampler = linear? m_linear_sampler : m_point_sampler;
+
 	// Merge the 2 source textures (sTex[0],sTex[1]). Final results go to dTex. Feedback write will go to sTex[2].
 	// If either 2nd output is disabled or SLBG is 1, a background color will be used.
 	// Note: background color is also used when outside of the unit rectangle area
@@ -736,7 +736,7 @@ void GSDeviceVK::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex,
 		{
 			static_cast<GSTextureVK*>(sTex[1])->TransitionToLayout(VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
 			OMSetRenderTargets(dTex, nullptr, darea, false);
-			SetUtilityTexture(sTex[1], sampler);
+			SetUtilityTexture(sTex[1], m_linear_sampler);
 			BeginClearRenderPass(m_utility_color_render_pass_clear, darea, c);
 			SetPipeline(m_convert[static_cast<int>(ShaderConvert::COPY)]);
 			DrawStretchRect(sRect[1], PMODE.SLBG ? dRect[2] : dRect[1], dsize);
@@ -753,7 +753,7 @@ void GSDeviceVK::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex,
 		EndRenderPass();
 		OMSetRenderTargets(sTex[2], nullptr, fbarea, false);
 		if (dcleared)
-			SetUtilityTexture(dTex, sampler);
+			SetUtilityTexture(dTex, m_linear_sampler);
 		// sTex[2] can be sTex[0], in which case it might be cleared (e.g. Xenosaga).
 		BeginRenderPassForStretchRect(static_cast<GSTextureVK*>(sTex[2]), fbarea, GSVector4i(dRect[2]));
 		if (dcleared)
@@ -787,7 +787,7 @@ void GSDeviceVK::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex,
 	if (sTex[0] && sTex[0]->GetState() == GSTexture::State::Dirty)
 	{
 		// 1st output is enabled. It must be blended
-		SetUtilityTexture(sTex[0], sampler);
+		SetUtilityTexture(sTex[0], m_linear_sampler);
 		SetPipeline(m_merge[PMODE.MMOD]);
 		SetUtilityPushConstants(&c, sizeof(c));
 		DrawStretchRect(sRect[0], dRect[0], dTex->GetSize());
@@ -797,7 +797,7 @@ void GSDeviceVK::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex,
 	{
 		EndRenderPass();
 		SetPipeline(m_convert[static_cast<int>(ShaderConvert::YUV)]);
-		SetUtilityTexture(dTex, sampler);
+		SetUtilityTexture(dTex, m_linear_sampler);
 		SetUtilityPushConstants(yuv_constants, sizeof(yuv_constants));
 		OMSetRenderTargets(sTex[2], nullptr, fbarea, false);
 		BeginRenderPass(m_utility_color_render_pass_load, fbarea);
@@ -1996,6 +1996,7 @@ VkShaderModule GSDeviceVK::GetTFXFragmentShader(const GSHWDrawConfig::PSSelector
 	AddMacro(ss, "PS_NO_COLOR1", sel.no_color1);
 	AddMacro(ss, "PS_NO_ABLEND", sel.no_ablend);
 	AddMacro(ss, "PS_ONLY_ALPHA", sel.only_alpha);
+	AddMacro(ss, "PS_SWAP_GA", sel.swap_ga);
 	ss << m_tfx_source;
 
 	VkShaderModule mod = g_vulkan_shader_cache->GetFragmentShader(ss.str());

pcsx2/GS/Renderers/Vulkan/GSDeviceVK.h

@@ -154,7 +154,7 @@ private:
 	GSTexture* CreateSurface(GSTexture::Type type, int width, int height, int levels, GSTexture::Format format) override;
 
 	void DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex, GSVector4* dRect, const GSRegPMODE& PMODE,
-		const GSRegEXTBUF& EXTBUF, const GSVector4& c, const bool linear) final;
+		const GSRegEXTBUF& EXTBUF, const GSVector4& c) final;
 	void DoInterlace(GSTexture* sTex, GSTexture* dTex, int shader, bool linear, float yoffset = 0, int bufIdx = 0) final;
 	void DoShadeBoost(GSTexture* sTex, GSTexture* dTex, const float params[4]) final;
 	void DoFXAA(GSTexture* sTex, GSTexture* dTex) final;

pcsx2/HostDisplay.h

@@ -60,13 +60,6 @@ public:
 		RightOrBottom
 	};
 
-	enum class PresentResult
-	{
-		OK,
-		FrameSkipped,
-		DeviceLost
-	};
-
 	struct AdapterAndModeList
 	{
 		std::vector<std::string> adapter_names;
@@ -144,7 +137,7 @@ public:
 
 	/// Returns false if the window was completely occluded. If frame_skip is set, the frame won't be
 	/// displayed, but the GPU command queue will still be flushed.
-	virtual PresentResult BeginPresent(bool frame_skip) = 0;
+	virtual bool BeginPresent(bool frame_skip) = 0;
 
 	/// Presents the frame to the display, and renders OSD elements.
 	virtual void EndPresent() = 0;
@@ -191,7 +184,7 @@ namespace Host
 
 	/// Returns false if the window was completely occluded. If frame_skip is set, the frame won't be
 	/// displayed, but the GPU command queue will still be flushed.
-	HostDisplay::PresentResult BeginPresentFrame(bool frame_skip);
+	bool BeginPresentFrame(bool frame_skip);
 
 	/// Presents the frame to the display, and renders OSD elements.
 	void EndPresentFrame();

pcsx2/IopBios.cpp

@@ -96,11 +96,6 @@ void Hle_SetElfPath(const char* elfFileName)
 	Console.WriteLn("HLE Host: Set 'host:' root path to: %s\n", hostRoot.c_str());
 }
 
-void Hle_ClearElfPath()
-{
-	hostRoot = {};
-}
-
 namespace R3000A
 {
 

pcsx2/IopBios.h

@@ -86,5 +86,3 @@ namespace R3000A
 } // namespace R3000A
 
 extern void Hle_SetElfPath(const char* elfFileName);
-extern void Hle_ClearElfPath();
-

pcsx2/PAD/Host/PAD.cpp

@@ -267,11 +267,8 @@ void PAD::SetDefaultControllerConfig(SettingsInterface& si)
 #endif
 	si.SetBoolValue("Pad", "MultitapPort1", false);
 	si.SetBoolValue("Pad", "MultitapPort2", false);
-	si.SetFloatValue("Pad", "PointerXSpeed", 40.0f);
-	si.SetFloatValue("Pad", "PointerYSpeed", 40.0f);
-	si.SetFloatValue("Pad", "PointerXDeadZone", 20.0f);
-	si.SetFloatValue("Pad", "PointerYDeadZone", 20.0f);
-	si.SetFloatValue("Pad", "PointerInertia", 10.0f);
+	si.SetFloatValue("Pad", "PointerXScale", 8.0f);
+	si.SetFloatValue("Pad", "PointerYScale", 8.0f);
 
 	// PCSX2 Controller Settings - Default pad types and parameters.
 	for (u32 i = 0; i < NUM_CONTROLLER_PORTS; i++)
@@ -533,11 +530,8 @@ void PAD::CopyConfiguration(SettingsInterface* dest_si, const SettingsInterface&
 		dest_si->CopyBoolValue(src_si, "Pad", "MultitapPort2");
 		dest_si->CopyBoolValue(src_si, "Pad", "MultitapPort1");
 		dest_si->CopyBoolValue(src_si, "Pad", "MultitapPort2");
-		dest_si->CopyFloatValue(src_si, "Pad", "PointerXSpeed");
-		dest_si->CopyFloatValue(src_si, "Pad", "PointerYSpeed");
-		dest_si->CopyFloatValue(src_si, "Pad", "PointerXDeadZone");
-		dest_si->CopyFloatValue(src_si, "Pad", "PointerYDeadZone");
-		dest_si->CopyFloatValue(src_si, "Pad", "PointerInertia");
+		dest_si->CopyFloatValue(src_si, "Pad", "PointerXScale");
+		dest_si->CopyFloatValue(src_si, "Pad", "PointerYScale");
 		for (u32 i = 0; i < static_cast<u32>(InputSourceType::Count); i++)
 		{
 			dest_si->CopyBoolValue(src_si, "InputSources",

pcsx2/VMManager.cpp

@@ -905,10 +905,6 @@ bool VMManager::ApplyBootParameters(VMBootParameters params, std::string* state_
 		Hle_SetElfPath(s_elf_override.c_str());
 		EmuConfig.UseBOOT2Injection = true;
 	}
-	else
-	{
-		Hle_ClearElfPath();
-	}
 
 	return true;
 }

tests/ctest/core/StubHost.cpp

@@ -114,9 +114,9 @@ void Host::ReleaseHostDisplay(bool clear_state)
 {
 }
 
-HostDisplay::PresentResult Host::BeginPresentFrame(bool frame_skip)
+bool Host::BeginPresentFrame(bool frame_skip)
 {
-	return HostDisplay::PresentResult::FrameSkipped;
+	return false;
 }
 
 void Host::EndPresentFrame()