Merge 3b92f4928a into 2c92e5b5b3

Merge pull request #13160 from cpba/flatpak-6.8-runtime
Flatpak: Upgrade kde runtime to 6.8
2024-11-14 13:27:45 -07:00 · 2024-11-14 01:45:56 +00:00 · 2024-11-12 00:30:46 -05:00 · 2024-11-10 12:06:06 +01:00 · 2024-10-03 13:31:28 -04:00
3 changed files with 1 additions and 29 deletions
--- a/Flatpak/SDL2/SDL2.json
+++ b/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"]
-}
-
--- a/Flatpak/org.DolphinEmu.dolphin-emu.yml
+++ b/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:
--- a/Source/Core/VideoBackends/Vulkan/VKGfx.cpp
+++ b/Source/Core/VideoBackends/Vulkan/VKGfx.cpp
@ -260,9 +260,6 @@ bool VKGfx::BindBackbuffer(const ClearColor& clear_color)

  if (res != VK_SUCCESS)
  {
-    // Execute cmdbuffer before resizing, as the last frame could still be presenting.
-    ExecuteCommandBuffer(false, true);
-
    // Was this a lost exclusive fullscreen?
    if (res == VK_ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT)
    {
Author	SHA1	Message	Date
Ali	ea9e4f1830	Merge `3b92f4928a` into `2c92e5b5b3`	2024-11-14 01:45:56 +00:00
OatmealDome	2c92e5b5b3	Merge pull request #13160 from cpba/flatpak-6.8-runtime Flatpak: Upgrade kde runtime to 6.8	2024-11-12 00:30:46 -05:00
Carles Pastor	fe96bf4108	Flatpak: Upgrade kde runtime to 6.8 this version bundles SDL2-2.30.6, the temporary measure of building the vendored version from exports is no longer necessary.	2024-11-10 12:06:06 +01:00
Ali Homafar	3b92f4928a	Vulkan: Remove unnecessary command buffer execution When resizing the game window there is a chance that the swapchain state is bad. This will result in a deadlock on Linux + Nvidia's proprietary driver. This code can be removed and the next command buffer execution will simply occur when the swapchain has been recreated. The root issue may be a Linux Nvidia driver implementation problem. I wasn't able to reproduce the original problem on Windows, nor on my Steam Deck. I tested this change on Fedora 40+Nvidia & SteamOS+AMD. Fixes https://bugs.dolphin-emu.org/issues/13523	2024-10-03 13:31:28 -04:00