From d99d052b826d5306679728cad3b8b30967f7348c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miran=20Gr=C4=8Da?= Date: Wed, 24 Sep 2025 01:16:20 +0200 Subject: [PATCH 1/3] AdLib Gold: Use the YMF289. --- src/sound/snd_adlibgold.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sound/snd_adlibgold.c b/src/sound/snd_adlibgold.c index 0181db72e..4c4c17341 100644 --- a/src/sound/snd_adlibgold.c +++ b/src/sound/snd_adlibgold.c @@ -1063,7 +1063,7 @@ adgold_init(UNUSED(const device_t *info)) adgold->surround_enabled = device_get_config_int("surround"); adgold->gameport_enabled = device_get_config_int("gameport"); - fm_driver_get(FM_YMF262, &adgold->opl); + fm_driver_get(FM_YMF289, &adgold->opl); if (adgold->surround_enabled) ym7128_init(&adgold->ym7128); From ba9c1732f7907d99b6986aadb95bbc183b586bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miran=20Gr=C4=8Da?= Date: Wed, 24 Sep 2025 01:41:00 +0200 Subject: [PATCH 2/3] Actually, it's 289B. --- src/sound/snd_adlibgold.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sound/snd_adlibgold.c b/src/sound/snd_adlibgold.c index 4c4c17341..870e473b0 100644 --- a/src/sound/snd_adlibgold.c +++ b/src/sound/snd_adlibgold.c @@ -1063,7 +1063,7 @@ adgold_init(UNUSED(const device_t *info)) adgold->surround_enabled = device_get_config_int("surround"); adgold->gameport_enabled = device_get_config_int("gameport"); - fm_driver_get(FM_YMF289, &adgold->opl); + fm_driver_get(FM_YMF289B, &adgold->opl); if (adgold->surround_enabled) ym7128_init(&adgold->ym7128); From d29b0d51833584fd47a6111fd95bce1c6e456311 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Wed, 24 Sep 2025 17:59:29 +0600 Subject: [PATCH 3/3] Set up default surface formats before QApplication creation (#6221) --- src/qt/qt_main.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/qt/qt_main.cpp b/src/qt/qt_main.cpp index a48fde924..d667cfdb9 100644 --- a/src/qt/qt_main.cpp +++ b/src/qt/qt_main.cpp @@ -542,6 +542,17 @@ main(int argc, char *argv[]) #endif QApplication::setAttribute(Qt::AA_UseDesktopOpenGL); + QSurfaceFormat fmt = QSurfaceFormat::defaultFormat(); + fmt.setSwapInterval(0); + fmt.setProfile(QSurfaceFormat::OpenGLContextProfile::CoreProfile); + fmt.setRenderableType(QSurfaceFormat::OpenGL); +#ifdef Q_OS_MACOS + fmt.setVersion(4, 1); +#else + fmt.setVersion(3, 2); +#endif + QSurfaceFormat::setDefaultFormat(fmt); + QApplication app(argc, argv); QLocale::setDefault(QLocale::C); setlocale(LC_NUMERIC, "C"); @@ -573,9 +584,6 @@ main(int argc, char *argv[]) Q_INIT_RESOURCE(qt_resources); Q_INIT_RESOURCE(qt_translations); - QSurfaceFormat fmt = QSurfaceFormat::defaultFormat(); - fmt.setSwapInterval(0); - QSurfaceFormat::setDefaultFormat(fmt); #ifdef __APPLE__ CocoaEventFilter cocoafilter;