Merge 19c3b88e5a into 80ea68b13c

Merge pull request #13183 from Tilka/sync_on_fifo_reset
ProcessorInterface: sync GPU just before PI_FIFO_RESET
2024-11-14 13:27:45 -07:00 · 2024-11-10 21:49:03 -08:00 · 2024-11-11 00:38:26 -05:00 · 2024-11-09 03:29:05 +00:00 · 2024-10-30 17:41:09 -05:00
2 changed files with 6 additions and 0 deletions
--- a/Source/Core/Core/HW/ProcessorInterface.cpp
+++ b/Source/Core/Core/HW/ProcessorInterface.cpp
@ -98,6 +98,10 @@ void ProcessorInterfaceManager::RegisterMMIO(MMIO::Mapping* mmio, u32 base)
                   {
                     system.GetGPFifo().ResetGatherPipe();

+                     // Assume that all bytes that made it into the GPU fifo did in fact execute
+                     // before this MMIO write takes effect.
+                     system.GetFifo().SyncGPUForRegisterAccess();
+
                     // Call Fifo::ResetVideoBuffer() from the video thread. Since that function
                     // resets various pointers used by the video thread, we can't call it directly
                     // from the CPU thread, so queue a task to do it instead. In single-core mode,
--- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
@ -434,6 +434,8 @@ InputBackend::InputBackend(ControllerInterface* controller_interface)
  SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE, "1");
  // We want buttons to come in as positions, not labels
  SDL_SetHint(SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS, "0");
+  // We have our own WGI backend. Enabling SDL's WGI handling creates even more redundant devices.
+  SDL_SetHint(SDL_HINT_JOYSTICK_WGI, "0");

  // Disable DualSense Player LEDs; We already colorize the Primary LED
  SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5_PLAYER_LED, "0");
Author	SHA1	Message	Date
Jordan Woyak	6380379f43	Merge `19c3b88e5a` into `80ea68b13c`	2024-11-10 21:49:03 -08:00
JMC47	80ea68b13c	Merge pull request #13183 from Tilka/sync_on_fifo_reset ProcessorInterface: sync GPU just before PI_FIFO_RESET	2024-11-11 00:38:26 -05:00
Tillmann Karras	fbce737415	ProcessorInterface: sync GPU just before PI_FIFO_RESET GXAbortFrame() is problematic for Dolphin because it first writes PI_FIFO_RESET (for which we discard our internal fifo), then disables CP reads (for which we execute pending commands in the GP fifo in emulated memory). I don't know whether there is a race condition on hardware, but there is one for us. Avoid this by also doing a GPU sync here.	2024-11-09 03:29:05 +00:00
Jordan Woyak	19c3b88e5a	ControllerInterface/SDL: Disable SDL's Windows.Gaming.Input controller handling.	2024-10-30 17:41:09 -05:00