Merge a2e43f1e9c into 2c83a256ae

Merge pull request #13277 from jordan-woyak/iowindow-debug-assert-fix
DolphinQt: Fix ASSERT failure in IOWindow in debug build.
2025-01-17 21:23:46 +01:00 · 2025-01-16 10:04:55 +01:00 · 2025-01-15 16:39:45 -06:00 · 2025-01-15 15:08:03 -05:00 · 2025-01-08 13:51:53 -05:00 · 2023-12-18 21:50:42 +02:00
3 changed files with 6 additions and 2 deletions
--- a/Source/Core/Core/Config/MainSettings.h
+++ b/Source/Core/Core/Config/MainSettings.h
@ -17,7 +17,7 @@
 #define BACKEND_NULLSOUND _trans("No Audio Output")
 #define BACKEND_ALSA "ALSA"
 #define BACKEND_CUBEB "Cubeb"
-#define BACKEND_OPENAL "OpenAL"
+#define BACKEND_OPENAL _trans("OpenAL (Deprecated)")
 #define BACKEND_PULSEAUDIO "Pulse"
 #define BACKEND_OPENSLES "OpenSLES"
 #define BACKEND_WASAPI _trans("WASAPI (Exclusive Mode)")
--- a/Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp
@ -541,7 +541,7 @@ void IOWindow::ConnectWidgets()
    const auto lock = m_controller->GetStateLock();
    m_reference->State(0.0);
  });
-  connect(this, &QWidget::destroyed, this, &IOWindow::TestOutputComplete);
+  connect(this, &IOWindow::closeEvent, this, &IOWindow::TestOutputComplete);

  connect(m_button_box, &QDialogButtonBox::clicked, this, &IOWindow::OnDialogButtonPressed);
  connect(m_devices_combo, &QComboBox::currentTextChanged, this, &IOWindow::OnDeviceChanged);
--- a/Source/Core/VideoBackends/Vulkan/VKMain.cpp
+++ b/Source/Core/VideoBackends/Vulkan/VKMain.cpp
@ -259,6 +259,10 @@ void VideoBackend::Shutdown()
 void VideoBackend::PrepareWindow(WindowSystemInfo& wsi)
 {
 #if defined(VK_USE_PLATFORM_METAL_EXT)
+  // We only need to manually create the CAMetalLayer on macOS.
+  if (wsi.type != WindowSystemType::MacOS)
+    return;
+
  // This is kinda messy, but it avoids having to write Objective C++ just to create a metal layer.
  id view = reinterpret_cast<id>(wsi.render_surface);
  Class clsCAMetalLayer = objc_getClass("CAMetalLayer");
Author	SHA1	Message	Date
Filippo Tarpini	f1c6468614	Merge `a2e43f1e9c` into `2c83a256ae`	2025-01-17 21:23:46 +01:00
Admiral H. Curtiss	2c83a256ae	Merge pull request #13277 from jordan-woyak/iowindow-debug-assert-fix DolphinQt: Fix ASSERT failure in IOWindow in debug build.	2025-01-16 10:04:55 +01:00
Jordan Woyak	c3f66e83e6	DolphinQt: Fix ASSERT failure in IOWindow in debug build.	2025-01-15 16:39:45 -06:00
OatmealDome	c344514ba2	Merge pull request #13270 from OatmealDome/vk-metal-layer Vulkan: Only attempt to create a CAMetalLayer on macOS	2025-01-15 15:08:03 -05:00
OatmealDome	2633b84b98	Vulkan: Only attempt to create a CAMetalLayer on macOS	2025-01-08 13:51:53 -05:00
Filoppi	a2e43f1e9c	Audio: Deprecate OpenAL This will also revert the setting of anyone that currently has OpenAL selected to the default, which is Cubeb. OpenAL is only on Windows now, and it's the worst backend there by far, it crackles at latencies that Cubeb supports fine, it has no additional features to Cubeb. There seems to be no reason to allow users to even select, and in the dev irc channel, no one was aware of any case where OpenAL might work better than Cubeb. The plan is to see if users complain about this, and if not, just delete it from Dolphin.	2023-12-18 21:50:42 +02:00