Merge 190291ec6c 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/PowerPC/CachedInterpreter/CachedInterpreterEmitter.h

@@ -17,6 +17,9 @@ struct PowerPCState;
 
 class CachedInterpreterEmitter
 {
+  // Note: Turning the constexpr `CallbackCast` functions consteval causes error C7595 "call
+  // to immediate function is not a constant expression" on MSVC... and only for some people.
+
 protected:
   // The return value of most callbacks is the distance in memory to the next callback.
   // If a callback returns 0, the block will be exited. The return value is signed to
@@ -26,7 +29,7 @@ protected:
   using AnyCallback = s32 (*)(PowerPC::PowerPCState& ppc_state, const void* operands);
 
   template <class Operands>
-  static consteval Callback<Operands> CallbackCast(Callback<Operands> callback)
+  static constexpr Callback<Operands> CallbackCast(Callback<Operands> callback)
   {
     return callback;
   }
@@ -35,7 +38,7 @@ protected:
   {
     return reinterpret_cast<AnyCallback>(callback);
   }
-  static consteval AnyCallback AnyCallbackCast(AnyCallback callback) { return callback; }
+  static constexpr AnyCallback AnyCallbackCast(AnyCallback callback) { return callback; }
 
   // Disassemble callbacks will always return the distance to the next callback.
   template <class Operands>
@@ -47,7 +50,7 @@ protected:
   {
     return reinterpret_cast<AnyDisassemble>(disassemble);
   }
-  static consteval AnyDisassemble AnyDisassembleCast(AnyDisassemble disassemble)
+  static constexpr AnyDisassemble AnyDisassembleCast(AnyDisassemble disassemble)
   {
     return disassemble;
   }