Merge 649e49c9e2 into 2c92e5b5b3

Flatpak: Upgrade kde runtime to 6.8

Flatpak/SDL2/SDL2.json

@@ -1,22 +0,0 @@
-{
-  "name": "SDL2",
-  "buildsystem": "autotools",
-  "config-opts": ["--disable-static"],
-  "sources": [
-    {
-      "type": "dir",
-      "path": "../../Externals/SDL/SDL"
-    }
-  ],
-  "cleanup": [ "/bin/sdl2-config",
-               "/include",
-               "/lib/libSDL2.la",
-               "/lib/libSDL2main.a",
-               "/lib/libSDL2main.la",
-               "/lib/libSDL2_test.a",
-               "/lib/libSDL2_test.la",
-               "/lib/cmake",
-               "/share/aclocal",
-               "/lib/pkgconfig"]
-}
-

Flatpak/org.DolphinEmu.dolphin-emu.yml

@@ -1,6 +1,6 @@
 app-id: org.DolphinEmu.dolphin-emu
 runtime: org.kde.Platform
-runtime-version: '6.7'
+runtime-version: '6.8'
 sdk: org.kde.Sdk
 command: dolphin-emu-wrapper
 rename-desktop-file: dolphin-emu.desktop
@@ -47,9 +47,6 @@ modules:
         url: https://github.com/Unrud/xdg-screensaver-shim/archive/0.0.2.tar.gz
         sha256: 0ed2a69fe6ee6cbffd2fe16f85116db737f17fb1e79bfb812d893cf15c728399
 
-  # build the vendored SDL2 from Externals until the runtime gets 2.30.6
-  - SDL2/SDL2.json
-
   - name: dolphin-emu
     buildsystem: cmake-ninja
     config-opts:

Source/Core/Core/HW/WiimoteEmu/Extension/Nunchuk.cpp

@@ -67,31 +67,11 @@ void Nunchuk::BuildDesiredExtensionState(DesiredExtensionState* target_state)
   DataFormat nc_data = {};
 
   // stick
-  bool override_occurred = false;
   const ControllerEmu::AnalogStick::StateData stick_state =
-      m_stick->GetState(m_input_override_function, &override_occurred);
+      m_stick->GetState(m_input_override_function);
   nc_data.jx = MapFloat<u8>(stick_state.x, STICK_CENTER, 0, STICK_RANGE);
   nc_data.jy = MapFloat<u8>(stick_state.y, STICK_CENTER, 0, STICK_RANGE);
 
-  if (!override_occurred)
-  {
-    // Some terribly coded games check whether to move with a check like
-    //
-    //     if (x != 0 && y != 0)
-    //         do_movement(x, y);
-    //
-    // With keyboard controls, these games break if you simply hit one
-    // of the axes. Adjust this if you're hitting one of the axes so that
-    // we slightly tweak the other axis.
-    if (nc_data.jx != STICK_CENTER || nc_data.jy != STICK_CENTER)
-    {
-      if (nc_data.jx == STICK_CENTER)
-        ++nc_data.jx;
-      if (nc_data.jy == STICK_CENTER)
-        ++nc_data.jy;
-    }
-  }
-
   // buttons
   u8 buttons = 0;
   m_buttons->GetState(&buttons, nunchuk_button_bitmasks.data(), m_input_override_function);

Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp

@@ -50,13 +50,6 @@ AnalogStick::StateData AnalogStick::GetState() const
 }
 
 AnalogStick::StateData AnalogStick::GetState(const InputOverrideFunction& override_func) const
-{
-  bool override_occurred = false;
-  return GetState(override_func, &override_occurred);
-}
-
-AnalogStick::StateData AnalogStick::GetState(const InputOverrideFunction& override_func,
-                                             bool* override_occurred) const
 {
   StateData state = GetState();
   if (!override_func)
@@ -65,13 +58,11 @@ AnalogStick::StateData AnalogStick::GetState(const InputOverrideFunction& overri
   if (const std::optional<ControlState> x_override = override_func(name, X_INPUT_OVERRIDE, state.x))
   {
     state.x = *x_override;
-    *override_occurred = true;
   }
 
   if (const std::optional<ControlState> y_override = override_func(name, Y_INPUT_OVERRIDE, state.y))
   {
     state.y = *y_override;
-    *override_occurred = true;
   }
 
   return state;

Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h

@@ -22,7 +22,6 @@ public:
 
   StateData GetState() const;
   StateData GetState(const InputOverrideFunction& override_func) const;
-  StateData GetState(const InputOverrideFunction& override_func, bool* override_occurred) const;
 
 private:
   Control* GetModifierInput() const override;