Merge branch 'main' into stopgamesesc

CMakeLists.txt

@@ -103,6 +103,8 @@ if(ENABLE_QT_GUI)
     find_package(Qt6 REQUIRED COMPONENTS Widgets Concurrent)
     qt_standard_project_setup()
     set(CMAKE_AUTORCC ON)
+    set(CMAKE_AUTOMOC ON)
+    set(CMAKE_AUTOUIC ON)
 endif()
 
 set(AUDIO_CORE src/audio_core/sdl_audio.cpp 
@@ -548,10 +550,13 @@ set(QT_GUI
     src/qt_gui/elf_viewer.h
     src/qt_gui/main_window_themes.cpp
     src/qt_gui/main_window_themes.h
+    src/qt_gui/settings_dialog.cpp
+    src/qt_gui/settings_dialog.h
+    src/qt_gui/settings_dialog.ui
     src/qt_gui/main.cpp
     ${EMULATOR}
     ${RESOURCE_FILES}
-    )
+)
 endif()
 
 if (ENABLE_QT_GUI)

externals/fmt

@@ -1 +1 @@
-Subproject commit bc8d32e9643d2be5fc070abf2a50bc021544545d
+Subproject commit c98518351efd5a46f5d448e947e0b7242d197d07

externals/glslang

@@ -1 +1 @@
-Subproject commit 52f68dc6b2a9d017b43161f31f13a6f44636ee7c
+Subproject commit 7c4d91e7819a1d27213aa3499953d54ae1a00e8f

externals/magic_enum

@@ -1 +1 @@
-Subproject commit 664ee62c12570948b0e025d15b42d641fba8d54a
+Subproject commit dae6bbf16c363e9ead4e628a47fdb02956a634f3

externals/sdl3

@@ -1 +1 @@
-Subproject commit f9a06c20ed85fb1d6754fc2280d6183382217910
+Subproject commit 4cc3410dce50cefce98d3cf3cf1bc8eca83b862a

externals/toml11

@@ -1 +1 @@
-Subproject commit b389bbc4ebf90fa2fe7651de3046fb19f661ba3c
+Subproject commit fcb1d3d7e5885edfadbbe9572991dc4b3248af58

externals/vulkan-headers

@@ -1 +1 @@
-Subproject commit b379292b2ab6df5771ba9870d53cf8b2c9295daf
+Subproject commit 595c8d4794410a4e64b98dc58d27c0310d7ea2fd

externals/xxhash

@@ -1 +1 @@
-Subproject commit a57f6cce2698049863af8c25787084ae0489d849
+Subproject commit ee65ff988bab34a184c700e2fbe1e1c5bc27485d

src/common/config.cpp

@@ -43,6 +43,8 @@ u32 m_window_size_H = 720;
 std::vector<std::string> m_pkg_viewer;
 std::vector<std::string> m_elf_viewer;
 std::vector<std::string> m_recent_files;
+// Settings
+u32 m_language = 1; // english
 
 bool isLleLibc() {
     return isLibc;
@@ -112,6 +114,70 @@ bool vkValidationSyncEnabled() {
     return vkValidationSync;
 }
 
+void setScreenWidth(u32 width) {
+    screenWidth = width;
+}
+
+void setScreenHeight(u32 height) {
+    screenHeight = height;
+}
+
+void setDebugDump(bool enable) {
+    isDebugDump = enable;
+}
+
+void setShowSplash(bool enable) {
+    isShowSplash = enable;
+}
+
+void setNullGpu(bool enable) {
+    isNullGpu = enable;
+}
+
+void setDumpShaders(bool enable) {
+    shouldDumpShaders = enable;
+}
+
+void setDumpPM4(bool enable) {
+    shouldDumpPM4 = enable;
+}
+
+void setVkValidation(bool enable) {
+    vkValidation = enable;
+}
+
+void setVkSyncValidation(bool enable) {
+    vkValidationSync = enable;
+}
+
+void setRdocEnabled(bool enable) {
+    rdocEnable = enable;
+}
+
+void setVblankDiv(u32 value) {
+    vblankDivider = value;
+}
+
+void setFullscreenMode(bool enable) {
+    isFullscreen = enable;
+}
+
+void setLanguage(u32 language) {
+    m_language = language;
+}
+
+void setNeoMode(bool enable) {
+    isNeo = enable;
+}
+
+void setLogType(std::string type) {
+    logType = type;
+}
+
+void setLogFilter(std::string type) {
+    logFilter = type;
+}
+
 void setMainWindowGeometry(u32 x, u32 y, u32 w, u32 h) {
     main_window_geometry_x = x;
     main_window_geometry_y = y;
@@ -207,6 +273,9 @@ std::vector<std::string> getRecentFiles() {
     return m_recent_files;
 }
 
+u32 GetLanguage() {
+    return m_language;
+}
 void load(const std::filesystem::path& path) {
     // If the configuration file does not exist, create it and return
     std::error_code error;
@@ -223,90 +292,82 @@ void load(const std::filesystem::path& path) {
         fmt::print("Got exception trying to load config file. Exception: {}\n", ex.what());
         return;
     }
-
     if (data.contains("General")) {
-        auto generalResult = toml::expect<toml::value>(data.at("General"));
-        if (generalResult.is_ok()) {
-            auto general = generalResult.unwrap();
+        const toml::value& general = data.at("General");
 
-            isNeo = toml::find_or<toml::boolean>(general, "isPS4Pro", false);
-            isFullscreen = toml::find_or<toml::boolean>(general, "Fullscreen", false);
-            logFilter = toml::find_or<toml::string>(general, "logFilter", "");
-            logType = toml::find_or<toml::string>(general, "logType", "sync");
-            isShowSplash = toml::find_or<toml::boolean>(general, "showSplash", true);
-        }
+        isNeo = toml::find_or<bool>(general, "isPS4Pro", false);
+        isFullscreen = toml::find_or<bool>(general, "Fullscreen", false);
+        logFilter = toml::find_or<std::string>(general, "logFilter", "");
+        logType = toml::find_or<std::string>(general, "logType", "sync");
+        isShowSplash = toml::find_or<bool>(general, "showSplash", true);
     }
+
     if (data.contains("GPU")) {
-        auto gpuResult = toml::expect<toml::value>(data.at("GPU"));
-        if (gpuResult.is_ok()) {
-            auto gpu = gpuResult.unwrap();
+        const toml::value& gpu = data.at("GPU");
 
-            screenWidth = toml::find_or<toml::integer>(gpu, "screenWidth", screenWidth);
-            screenHeight = toml::find_or<toml::integer>(gpu, "screenHeight", screenHeight);
-            isNullGpu = toml::find_or<toml::boolean>(gpu, "nullGpu", false);
-            shouldDumpShaders = toml::find_or<toml::boolean>(gpu, "dumpShaders", false);
-            shouldDumpPM4 = toml::find_or<toml::boolean>(gpu, "dumpPM4", false);
-            vblankDivider = toml::find_or<toml::integer>(gpu, "vblankDivider", 1);
-        }
+        screenWidth = toml::find_or<int>(gpu, "screenWidth", screenWidth);
+        screenHeight = toml::find_or<int>(gpu, "screenHeight", screenHeight);
+        isNullGpu = toml::find_or<bool>(gpu, "nullGpu", false);
+        shouldDumpShaders = toml::find_or<bool>(gpu, "dumpShaders", false);
+        shouldDumpPM4 = toml::find_or<bool>(gpu, "dumpPM4", false);
+        vblankDivider = toml::find_or<int>(gpu, "vblankDivider", 1);
     }
+
     if (data.contains("Vulkan")) {
-        const auto vkResult = toml::expect<toml::value>(data.at("Vulkan"));
-        if (vkResult.is_ok()) {
-            auto vk = vkResult.unwrap();
+        const toml::value& vk = data.at("Vulkan");
 
-            gpuId = toml::find_or<toml::integer>(vk, "gpuId", 0);
-            vkValidation = toml::find_or<toml::boolean>(vk, "validation", true);
-            vkValidationSync = toml::find_or<toml::boolean>(vk, "validation_sync", true);
-            rdocEnable = toml::find_or<toml::boolean>(vk, "rdocEnable", false);
-        }
+        gpuId = toml::find_or<int>(vk, "gpuId", -1);
+        vkValidation = toml::find_or<bool>(vk, "validation", false);
+        vkValidationSync = toml::find_or<bool>(vk, "validation_sync", false);
+        rdocEnable = toml::find_or<bool>(vk, "rdocEnable", false);
     }
+
     if (data.contains("Debug")) {
-        auto debugResult = toml::expect<toml::value>(data.at("Debug"));
-        if (debugResult.is_ok()) {
-            auto debug = debugResult.unwrap();
+        const toml::value& debug = data.at("Debug");
 
-            isDebugDump = toml::find_or<toml::boolean>(debug, "DebugDump", false);
-        }
+        isDebugDump = toml::find_or<bool>(debug, "DebugDump", false);
     }
+
     if (data.contains("LLE")) {
-        auto lleResult = toml::expect<toml::value>(data.at("LLE"));
-        if (lleResult.is_ok()) {
-            auto lle = lleResult.unwrap();
+        const toml::value& lle = data.at("LLE");
 
-            isLibc = toml::find_or<toml::boolean>(lle, "libc", true);
-        }
+        isLibc = toml::find_or<bool>(lle, "libc", true);
     }
-    if (data.contains("GUI")) {
-        auto guiResult = toml::expect<toml::value>(data.at("GUI"));
-        if (guiResult.is_ok()) {
-            auto gui = guiResult.unwrap();
 
-            m_icon_size = toml::find_or<toml::integer>(gui, "iconSize", 0);
-            m_icon_size_grid = toml::find_or<toml::integer>(gui, "iconSizeGrid", 0);
-            m_slider_pos = toml::find_or<toml::integer>(gui, "sliderPos", 0);
-            m_slider_pos_grid = toml::find_or<toml::integer>(gui, "sliderPosGrid", 0);
-            mw_themes = toml::find_or<toml::integer>(gui, "theme", 0);
-            m_window_size_W = toml::find_or<toml::integer>(gui, "mw_width", 0);
-            m_window_size_H = toml::find_or<toml::integer>(gui, "mw_height", 0);
-            settings_install_dir = toml::find_or<toml::string>(gui, "installDir", "");
-            main_window_geometry_x = toml::find_or<toml::integer>(gui, "geometry_x", 0);
-            main_window_geometry_y = toml::find_or<toml::integer>(gui, "geometry_y", 0);
-            main_window_geometry_w = toml::find_or<toml::integer>(gui, "geometry_w", 0);
-            main_window_geometry_h = toml::find_or<toml::integer>(gui, "geometry_h", 0);
-            m_pkg_viewer = toml::find_or<std::vector<std::string>>(gui, "pkgDirs", {});
-            m_elf_viewer = toml::find_or<std::vector<std::string>>(gui, "elfDirs", {});
-            m_recent_files = toml::find_or<std::vector<std::string>>(gui, "recentFiles", {});
-            m_table_mode = toml::find_or<toml::integer>(gui, "gameTableMode", 0);
-        }
+    if (data.contains("GUI")) {
+        const toml::value& gui = data.at("GUI");
+
+        m_icon_size = toml::find_or<int>(gui, "iconSize", 0);
+        m_icon_size_grid = toml::find_or<int>(gui, "iconSizeGrid", 0);
+        m_slider_pos = toml::find_or<int>(gui, "sliderPos", 0);
+        m_slider_pos_grid = toml::find_or<int>(gui, "sliderPosGrid", 0);
+        mw_themes = toml::find_or<int>(gui, "theme", 0);
+        m_window_size_W = toml::find_or<int>(gui, "mw_width", 0);
+        m_window_size_H = toml::find_or<int>(gui, "mw_height", 0);
+        settings_install_dir = toml::find_or<std::string>(gui, "installDir", "");
+        main_window_geometry_x = toml::find_or<int>(gui, "geometry_x", 0);
+        main_window_geometry_y = toml::find_or<int>(gui, "geometry_y", 0);
+        main_window_geometry_w = toml::find_or<int>(gui, "geometry_w", 0);
+        main_window_geometry_h = toml::find_or<int>(gui, "geometry_h", 0);
+        m_pkg_viewer = toml::find_or<std::vector<std::string>>(gui, "pkgDirs", {});
+        m_elf_viewer = toml::find_or<std::vector<std::string>>(gui, "elfDirs", {});
+        m_recent_files = toml::find_or<std::vector<std::string>>(gui, "recentFiles", {});
+        m_table_mode = toml::find_or<int>(gui, "gameTableMode", 0);
+    }
+
+    if (data.contains("Settings")) {
+        const toml::value& settings = data.at("Settings");
+
+        m_language = toml::find_or<int>(settings, "consoleLanguage", 1);
     }
 }
 void save(const std::filesystem::path& path) {
-    toml::basic_value<toml::preserve_comments> data;
+    toml::value data;
 
     std::error_code error;
     if (std::filesystem::exists(path, error)) {
         try {
-            data = toml::parse<toml::preserve_comments>(path);
+            data = toml::parse(path);
         } catch (const std::exception& ex) {
             fmt::print("Exception trying to parse config file. Exception: {}\n", ex.what());
             return;
@@ -353,8 +414,29 @@ void save(const std::filesystem::path& path) {
     data["GUI"]["elfDirs"] = m_elf_viewer;
     data["GUI"]["recentFiles"] = m_recent_files;
 
+    data["Settings"]["consoleLanguage"] = m_language;
+
     std::ofstream file(path, std::ios::out);
     file << data;
     file.close();
 }
+
+void setDefaultValues() {
+    isNeo = false;
+    isFullscreen = false;
+    screenWidth = 1280;
+    screenHeight = 720;
+    logFilter = "";
+    logType = "async";
+    isDebugDump = false;
+    isShowSplash = false;
+    isNullGpu = false;
+    shouldDumpShaders = false;
+    shouldDumpPM4 = false;
+    vblankDivider = 1;
+    vkValidation = false;
+    rdocEnable = false;
+    m_language = 1;
+}
+
 } // namespace Config

src/common/config.h

@@ -29,6 +29,25 @@ bool dumpPM4();
 bool isRdocEnabled();
 u32 vblankDiv();
 
+void setDebugDump(bool enable);
+void setShowSplash(bool enable);
+void setNullGpu(bool enable);
+void setDumpShaders(bool enable);
+void setDumpPM4(bool enable);
+void setVblankDiv(u32 value);
+void setScreenWidth(u32 width);
+void setScreenHeight(u32 height);
+void setFullscreenMode(bool enable);
+void setLanguage(u32 language);
+void setNeoMode(bool enable);
+
+void setLogType(std::string type);
+void setLogFilter(std::string type);
+
+void setVkValidation(bool enable);
+void setVkSyncValidation(bool enable);
+void setRdocEnabled(bool enable);
+
 bool vkValidationEnabled();
 bool vkValidationSyncEnabled();
 
@@ -64,4 +83,8 @@ std::vector<std::string> getPkgViewer();
 std::vector<std::string> getElfViewer();
 std::vector<std::string> getRecentFiles();
 
+void setDefaultValues();
+
+// settings
+u32 GetLanguage();
 }; // namespace Config

src/core/libraries/audio/audioout.cpp

@@ -235,6 +235,9 @@ int PS4_SYSV_ABI sceAudioOutGetSystemState() {
 }
 
 int PS4_SYSV_ABI sceAudioOutInit() {
+    if (audio != nullptr) {
+        return ORBIS_AUDIO_OUT_ERROR_ALREADY_INIT;
+    }
     audio = std::make_unique<Audio::SDLAudio>();
     LOG_INFO(Lib_AudioOut, "called");
     return ORBIS_OK;

src/core/libraries/kernel/thread_management.cpp

@@ -1519,6 +1519,8 @@ void pthreadSymbolsRegister(Core::Loader::SymbolsResolver* sym) {
     LIB_FUNCTION("1tKyG7RlMJo", "libkernel", 1, "libkernel", 1, 1, scePthreadGetprio);
     LIB_FUNCTION("W0Hpm2X0uPE", "libkernel", 1, "libkernel", 1, 1, scePthreadSetprio);
     LIB_FUNCTION("GBUY7ywdULE", "libkernel", 1, "libkernel", 1, 1, scePthreadRename);
+    LIB_FUNCTION("F+yfmduIBB8", "libkernel", 1, "libkernel", 1, 1, scePthreadAttrSetstackaddr);
+    LIB_FUNCTION("El+cQ20DynU", "libkernel", 1, "libkernel", 1, 1, scePthreadAttrSetguardsize);
 
     LIB_FUNCTION("aI+OeCz8xrQ", "libkernel", 1, "libkernel", 1, 1, scePthreadSelf);
     LIB_FUNCTION("EotR8a3ASf4", "libkernel", 1, "libkernel", 1, 1, posix_pthread_self);

src/core/libraries/pad/pad.cpp

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 // Generated By moduleGenerator
+#include <common/assert.h>
 #include <common/singleton.h>
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
@@ -85,7 +86,18 @@ int PS4_SYSV_ABI scePadGetCapability() {
 
 int PS4_SYSV_ABI scePadGetControllerInformation(s32 handle, OrbisPadControllerInformation* pInfo) {
     LOG_INFO(Lib_Pad, "called handle = {}", handle);
-    std::memset(pInfo, 0, sizeof(OrbisPadControllerInformation));
+    if (handle < 0) {
+        pInfo->touchPadInfo.pixelDensity = 1;
+        pInfo->touchPadInfo.resolution.x = 1920;
+        pInfo->touchPadInfo.resolution.y = 950;
+        pInfo->stickInfo.deadZoneLeft = 2;
+        pInfo->stickInfo.deadZoneRight = 2;
+        pInfo->connectionType = ORBIS_PAD_PORT_TYPE_STANDARD;
+        pInfo->connectedCount = 1;
+        pInfo->connected = false;
+        pInfo->deviceClass = ORBIS_PAD_DEVICE_CLASS_STANDARD;
+        return SCE_OK;
+    }
     pInfo->touchPadInfo.pixelDensity = 1;
     pInfo->touchPadInfo.resolution.x = 1920;
     pInfo->touchPadInfo.resolution.y = 950;
@@ -239,7 +251,6 @@ int PS4_SYSV_ABI scePadOutputReport() {
 }
 
 int PS4_SYSV_ABI scePadRead(s32 handle, OrbisPadData* pData, s32 num) {
-    std::memset(pData, 0, sizeof(OrbisPadData));
     int connected_count = 0;
     bool connected = false;
     Input::State states[64];
@@ -306,11 +317,9 @@ int PS4_SYSV_ABI scePadReadHistory() {
 
 int PS4_SYSV_ABI scePadReadState(s32 handle, OrbisPadData* pData) {
     auto* controller = Common::Singleton<Input::GameController>::Instance();
-
     int connectedCount = 0;
     bool isConnected = false;
     Input::State state;
-    std::memset(pData, 0, sizeof(OrbisPadData));
     controller->ReadState(&state, &isConnected, &connectedCount);
     pData->buttons = state.buttonsState;
     pData->leftStick.x = state.axes[static_cast<int>(Input::Axis::LeftX)];
@@ -322,7 +331,7 @@ int PS4_SYSV_ABI scePadReadState(s32 handle, OrbisPadData* pData) {
     pData->orientation.x = 0;
     pData->orientation.y = 0;
     pData->orientation.z = 0;
-    pData->orientation.w = 0;
+    pData->orientation.w = 1;
     pData->acceleration.x = 0.0f;
     pData->acceleration.y = 0.0f;
     pData->acceleration.z = 0.0f;

src/core/libraries/playgo/playgo.cpp

@@ -58,6 +58,7 @@ s32 PS4_SYSV_ABI scePlayGoGetLocus(OrbisPlayGoHandle handle, const OrbisPlayGoCh
         if (chunkIds[i] <= playgo->GetPlaygoHeader().mchunk_count) {
             outLoci[i] = OrbisPlayGoLocusValue::ORBIS_PLAYGO_LOCUS_LOCAL_FAST;
         } else {
+            outLoci[i] = ORBIS_PLAYGO_LOCUS_NOT_DOWNLOADED;
             return ORBIS_PLAYGO_ERROR_BAD_CHUNK_ID;
         }
     }
@@ -70,12 +71,13 @@ s32 PS4_SYSV_ABI scePlayGoGetProgress(OrbisPlayGoHandle handle, const OrbisPlayG
               handle, *chunkIds, numberOfEntries);
     outProgress->progressSize = 0x10000; // todo?
     outProgress->totalSize = 0x10000;
-    return 0;
+    return ORBIS_OK;
 }
 
 s32 PS4_SYSV_ABI scePlayGoGetToDoList(OrbisPlayGoHandle handle, OrbisPlayGoToDo* outTodoList,
                                       u32 numberOfEntries, u32* outEntries) {
-    LOG_ERROR(Lib_PlayGo, "(STUBBED)called");
+    LOG_ERROR(Lib_PlayGo, "(STUBBED)called handle = {} numberOfEntries = {}", handle,
+              numberOfEntries);
     if (handle != 1)
         return ORBIS_PLAYGO_ERROR_BAD_HANDLE;
     if (outTodoList == nullptr)

src/core/libraries/system/systemservice.cpp

@@ -1898,7 +1898,7 @@ s32 PS4_SYSV_ABI sceSystemServiceParamGetInt(int param_id, int* value) {
     }
     switch (param_id) {
     case ORBIS_SYSTEM_SERVICE_PARAM_ID_LANG:
-        *value = ORBIS_SYSTEM_PARAM_LANG_ENGLISH_US;
+        *value = Config::GetLanguage();
         break;
     case ORBIS_SYSTEM_SERVICE_PARAM_ID_DATE_FORMAT:
         *value = ORBIS_SYSTEM_PARAM_DATE_FORMAT_DDMMYYYY;

src/emulator.cpp

@@ -128,6 +128,7 @@ void Emulator::Run(const std::filesystem::path& file) {
         std::filesystem::create_directory(mount_temp_dir);
     }
     mnt->Mount(mount_temp_dir, "/temp0"); // called in app_content ==> stat/mkdir
+    mnt->Mount(mount_temp_dir, "/temp");
 
     const auto& mount_download_dir =
         Common::FS::GetUserPath(Common::FS::PathType::DownloadDir) / id;
@@ -182,7 +183,7 @@ void Emulator::Run(const std::filesystem::path& file) {
 }
 
 void Emulator::LoadSystemModules(const std::filesystem::path& file) {
-    constexpr std::array<SysModules, 10> ModulesToLoad{
+    constexpr std::array<SysModules, 9> ModulesToLoad{
         {{"libSceNgs2.sprx", nullptr},
          {"libSceFiber.sprx", nullptr},
          {"libSceUlt.sprx", nullptr},
@@ -191,8 +192,7 @@ void Emulator::LoadSystemModules(const std::filesystem::path& file) {
          {"libSceLibcInternal.sprx", &Libraries::LibcInternal::RegisterlibSceLibcInternal},
          {"libSceDiscMap.sprx", &Libraries::DiscMap::RegisterlibSceDiscMap},
          {"libSceRtc.sprx", &Libraries::Rtc::RegisterlibSceRtc},
-         {"libSceJpegEnc.sprx", nullptr},
-         {"libSceJson2.sprx", nullptr}},
+         {"libSceJpegEnc.sprx", nullptr}},
     };
 
     std::vector<std::filesystem::path> found_modules;

src/qt_gui/main_window.cpp

@@ -16,6 +16,7 @@
 #include "game_install_dialog.h"
 #include "main_window.h"
 #include "sdl_window_manager.h"
+#include "settings_dialog.h"
 
 MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWindow) {
     ui->setupUi(this);
@@ -186,7 +187,13 @@ void MainWindow::CreateConnects() {
     connect(m_game_list_frame.get(), &QTableWidget::cellDoubleClicked, this,
             &MainWindow::StartGame);
 
+
     connect(ui->stopButton, &QPushButton::clicked, this, &MainWindow::StopGame);
+    
+    connect(ui->settingsButton, &QPushButton::clicked, this, [this]() {
+        auto settingsDialog = new SettingsDialog(this);
+        settingsDialog->exec();
+    });
 
     connect(ui->setIconSizeTinyAct, &QAction::triggered, this, [this]() {
         if (isTableList) {

src/qt_gui/settings_dialog.cpp

@@ -0,0 +1,124 @@
+// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "settings_dialog.h"
+#include "ui_settings_dialog.h"
+
+SettingsDialog::SettingsDialog(QWidget* parent) : QDialog(parent), ui(new Ui::SettingsDialog) {
+    ui->setupUi(this);
+    ui->tabWidgetSettings->setUsesScrollButtons(false);
+    const auto config_dir = Common::FS::GetUserPath(Common::FS::PathType::UserDir);
+
+    ui->buttonBox->button(QDialogButtonBox::StandardButton::Close)->setFocus();
+
+    LoadValuesFromConfig();
+
+    connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QWidget::close);
+
+    connect(ui->buttonBox, &QDialogButtonBox::clicked, this,
+            [this, config_dir](QAbstractButton* button) {
+                if (button == ui->buttonBox->button(QDialogButtonBox::Save)) {
+                    Config::save(config_dir / "config.toml");
+                    QWidget::close();
+                } else if (button == ui->buttonBox->button(QDialogButtonBox::Apply)) {
+                    Config::save(config_dir / "config.toml");
+                } else if (button == ui->buttonBox->button(QDialogButtonBox::RestoreDefaults)) {
+                    Config::setDefaultValues();
+                    LoadValuesFromConfig();
+                }
+            });
+
+    connect(ui->tabWidgetSettings, &QTabWidget::currentChanged, this, [this]() {
+        ui->buttonBox->button(QDialogButtonBox::StandardButton::Close)->setFocus();
+    });
+
+    // EMULATOR TAB
+    {
+        connect(ui->consoleLanguageComboBox, &QComboBox::currentIndexChanged, this,
+                [](int index) { Config::setLanguage(index); });
+    }
+
+    // GPU TAB
+    {
+        // TODO: Implement graphics device changing
+
+        connect(ui->widthSpinBox, &QSpinBox::valueChanged, this,
+                [](int val) { Config::setScreenWidth(val); });
+
+        connect(ui->heightSpinBox, &QSpinBox::valueChanged, this,
+                [](int val) { Config::setScreenHeight(val); });
+
+        connect(ui->vblankSpinBox, &QSpinBox::valueChanged, this,
+                [](int val) { Config::setVblankDiv(val); });
+
+        connect(ui->dumpShadersCheckBox, &QCheckBox::stateChanged, this,
+                [](int val) { Config::setDumpShaders(val); });
+
+        connect(ui->nullGpuCheckBox, &QCheckBox::stateChanged, this,
+                [](int val) { Config::setNullGpu(val); });
+
+        connect(ui->dumpPM4CheckBox, &QCheckBox::stateChanged, this,
+                [](int val) { Config::setDumpPM4(val); });
+    }
+
+    // GENERAL TAB
+    {
+        connect(ui->fullscreenCheckBox, &QCheckBox::stateChanged, this,
+                [](int val) { Config::setFullscreenMode(val); });
+
+        connect(ui->showSplashCheckBox, &QCheckBox::stateChanged, this,
+                [](int val) { Config::setShowSplash(val); });
+
+        connect(ui->ps4proCheckBox, &QCheckBox::stateChanged, this,
+                [](int val) { Config::setNeoMode(val); });
+
+        connect(ui->logTypeComboBox, &QComboBox::currentTextChanged, this,
+                [](const QString& text) { Config::setLogType(text.toStdString()); });
+
+        connect(ui->logFilterLineEdit, &QLineEdit::textChanged, this,
+                [](const QString& text) { Config::setLogFilter(text.toStdString()); });
+    }
+
+    // DEBUG TAB
+    {
+        connect(ui->debugDump, &QCheckBox::stateChanged, this,
+                [](int val) { Config::setDebugDump(val); });
+
+        connect(ui->vkValidationCheckBox, &QCheckBox::stateChanged, this,
+                [](int val) { Config::setVkValidation(val); });
+
+        connect(ui->vkSyncValidationCheckBox, &QCheckBox::stateChanged, this,
+                [](int val) { Config::setVkSyncValidation(val); });
+
+        connect(ui->rdocCheckBox, &QCheckBox::stateChanged, this,
+                [](int val) { Config::setRdocEnabled(val); });
+    }
+}
+
+void SettingsDialog::LoadValuesFromConfig() {
+    ui->consoleLanguageComboBox->setCurrentIndex(Config::GetLanguage());
+
+    ui->widthSpinBox->setValue(Config::getScreenWidth());
+    ui->heightSpinBox->setValue(Config::getScreenHeight());
+    ui->vblankSpinBox->setValue(Config::vblankDiv());
+    ui->dumpShadersCheckBox->setChecked(Config::dumpShaders());
+    ui->nullGpuCheckBox->setChecked(Config::nullGpu());
+    ui->dumpPM4CheckBox->setChecked(Config::dumpPM4());
+
+    ui->fullscreenCheckBox->setChecked(Config::isFullscreenMode());
+    ui->showSplashCheckBox->setChecked(Config::showSplash());
+    ui->ps4proCheckBox->setChecked(Config::isNeoMode());
+    ui->logTypeComboBox->setCurrentText(QString::fromStdString(Config::getLogType()));
+    ui->logFilterLineEdit->setText(QString::fromStdString(Config::getLogFilter()));
+
+    ui->debugDump->setChecked(Config::debugDump());
+    ui->vkValidationCheckBox->setChecked(Config::vkValidationEnabled());
+    ui->vkSyncValidationCheckBox->setChecked(Config::vkValidationSyncEnabled());
+    ui->rdocCheckBox->setChecked(Config::isRdocEnabled());
+}
+
+int SettingsDialog::exec() {
+    return QDialog::exec();
+}
+
+SettingsDialog::~SettingsDialog() {}

src/qt_gui/settings_dialog.h

@@ -0,0 +1,28 @@
+// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <QDialog>
+#include <QPushButton>
+
+#include "common/config.h"
+#include "common/path_util.h"
+
+namespace Ui {
+class SettingsDialog;
+}
+
+class SettingsDialog : public QDialog {
+    Q_OBJECT
+public:
+    explicit SettingsDialog(QWidget* parent = nullptr);
+    ~SettingsDialog();
+
+    int exec() override;
+
+private:
+    void LoadValuesFromConfig();
+
+    std::unique_ptr<Ui::SettingsDialog> ui;
+};

src/qt_gui/settings_dialog.ui

@@ -0,0 +1,908 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
+     SPDX-License-Identifier: GPL-2.0-or-later -->
+
+<ui version="4.0">
+ <class>SettingsDialog</class>
+ <widget class="QDialog" name="SettingsDialog">
+  <property name="windowModality">
+   <enum>Qt::WindowModality::WindowModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>1024</width>
+    <height>768</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Settings</string>
+  </property>
+  <property name="windowIcon">
+   <iconset>
+    <normaloff>:/images/shadps4.ico</normaloff>:/images/shadps4.ico</iconset>
+  </property>
+  <layout class="QVBoxLayout" name="settingsDialogLayout">
+   <item>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="frameShape">
+      <enum>QFrame::Shape::NoFrame</enum>
+     </property>
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <widget class="QTabWidget" name="tabWidgetSettings">
+      <property name="enabled">
+       <bool>true</bool>
+      </property>
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>1006</width>
+        <height>720</height>
+       </rect>
+      </property>
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="currentIndex">
+       <number>0</number>
+      </property>
+      <widget class="QWidget" name="emulatorTab">
+       <attribute name="title">
+        <string>Emulator</string>
+       </attribute>
+       <layout class="QVBoxLayout" name="emulatorTabVLayout" stretch="0,0">
+        <item>
+         <layout class="QHBoxLayout" name="emulatorTabHLayout" stretch="1,1,1">
+          <item>
+           <layout class="QVBoxLayout" name="emulatorTabLayoutLeft">
+            <item>
+             <widget class="QGroupBox" name="consoleLanguageGroupBox">
+              <property name="title">
+               <string>Console Language</string>
+              </property>
+              <layout class="QVBoxLayout" name="settingsLayout">
+               <item>
+                <widget class="QComboBox" name="consoleLanguageComboBox">
+                 <item>
+                  <property name="text">
+                   <string>Japanese</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>English (United States)</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>French (France)</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Spanish (Spain)</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>German</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Italian</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Dutch</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Portuguese (Portugal)</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Russian</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Korean</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Traditional Chinese</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Simplified Chinese</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Finnish</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Swedish</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Danish</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Norwegian</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Polish</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Portuguese (Brazil)</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>English (United Kingdom)</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Turkish</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Spanish (Latin America)</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Arabic</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>French (Canada)</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Czech</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Hungarian</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Greek</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Romanian</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Thai</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Vietnamese</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Indonesian</string>
+                  </property>
+                 </item>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <widget class="QWidget" name="widgetSettingsTop" native="true">
+              <layout class="QHBoxLayout" name="widgetGpuTopLayout">
+               <property name="leftMargin">
+                <number>0</number>
+               </property>
+               <property name="topMargin">
+                <number>0</number>
+               </property>
+               <property name="rightMargin">
+                <number>0</number>
+               </property>
+               <property name="bottomMargin">
+                <number>0</number>
+               </property>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <widget class="QWidget" name="widgetSettingsBottom" native="true">
+              <layout class="QHBoxLayout" name="widgetGpuBottomLayout">
+               <property name="leftMargin">
+                <number>0</number>
+               </property>
+               <property name="topMargin">
+                <number>0</number>
+               </property>
+               <property name="rightMargin">
+                <number>0</number>
+               </property>
+               <property name="bottomMargin">
+                <number>0</number>
+               </property>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <spacer name="emulator_tab_layout_right_spacer">
+              <property name="orientation">
+               <enum>Qt::Orientation::Vertical</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>0</width>
+                <height>0</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QVBoxLayout" name="emulatorTabLayoutMiddle_2"/>
+          </item>
+          <item>
+           <layout class="QVBoxLayout" name="emulatorTabLayoutRight">
+            <property name="rightMargin">
+             <number>12</number>
+            </property>
+            <property name="bottomMargin">
+             <number>12</number>
+            </property>
+           </layout>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <spacer name="emulatorTabSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Orientation::Vertical</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </widget>
+      <widget class="QWidget" name="gpuTab">
+       <attribute name="title">
+        <string>GPU</string>
+       </attribute>
+       <layout class="QVBoxLayout" name="gpuTabVLayout" stretch="0,0">
+        <item>
+         <layout class="QHBoxLayout" name="gpuTabHLayout" stretch="1,1,1">
+          <item>
+           <layout class="QVBoxLayout" name="gpuTabLayoutLeft">
+            <item>
+             <widget class="QGroupBox" name="graphicsAdapterGroupBox">
+              <property name="title">
+               <string>Graphics Device</string>
+              </property>
+              <layout class="QVBoxLayout" name="graphicsAdapterLayout">
+               <item>
+                <widget class="QComboBox" name="graphicsAdapterBox"/>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <widget class="QWidget" name="widgetGpuTop" native="true">
+              <layout class="QHBoxLayout" name="widgetGpuTopHLayout">
+               <property name="leftMargin">
+                <number>0</number>
+               </property>
+               <property name="topMargin">
+                <number>0</number>
+               </property>
+               <property name="rightMargin">
+                <number>0</number>
+               </property>
+               <property name="bottomMargin">
+                <number>0</number>
+               </property>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <widget class="QWidget" name="widgetGpuBottom" native="true">
+              <layout class="QHBoxLayout" name="widgetGpuBottomHLayout">
+               <property name="leftMargin">
+                <number>0</number>
+               </property>
+               <property name="topMargin">
+                <number>0</number>
+               </property>
+               <property name="rightMargin">
+                <number>0</number>
+               </property>
+               <property name="bottomMargin">
+                <number>0</number>
+               </property>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <spacer name="gpu_tab_layout_right_spacer">
+              <property name="orientation">
+               <enum>Qt::Orientation::Vertical</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>0</width>
+                <height>0</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QVBoxLayout" name="gpuTabLayoutMiddle">
+            <item>
+             <layout class="QVBoxLayout" name="layoutResolution">
+              <property name="spacing">
+               <number>6</number>
+              </property>
+              <property name="leftMargin">
+               <number>0</number>
+              </property>
+              <item>
+               <layout class="QHBoxLayout" name="resolutionLayout">
+                <item>
+                 <widget class="QGroupBox" name="widthGroupBox">
+                  <property name="title">
+                   <string>Width</string>
+                  </property>
+                  <layout class="QVBoxLayout" name="widthLayout">
+                   <item>
+                    <widget class="QSpinBox" name="widthSpinBox">
+                     <property name="accelerated">
+                      <bool>true</bool>
+                     </property>
+                     <property name="correctionMode">
+                      <enum>QAbstractSpinBox::CorrectionMode::CorrectToNearestValue</enum>
+                     </property>
+                     <property name="keyboardTracking">
+                      <bool>false</bool>
+                     </property>
+                     <property name="minimum">
+                      <number>0</number>
+                     </property>
+                     <property name="maximum">
+                      <number>9999</number>
+                     </property>
+                     <property name="value">
+                      <number>1280</number>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QGroupBox" name="heightGroupBox">
+                  <property name="title">
+                   <string>Height</string>
+                  </property>
+                  <layout class="QVBoxLayout" name="heightLayout">
+                   <item>
+                    <widget class="QSpinBox" name="heightSpinBox">
+                     <property name="frame">
+                      <bool>true</bool>
+                     </property>
+                     <property name="accelerated">
+                      <bool>true</bool>
+                     </property>
+                     <property name="correctionMode">
+                      <enum>QAbstractSpinBox::CorrectionMode::CorrectToNearestValue</enum>
+                     </property>
+                     <property name="keyboardTracking">
+                      <bool>false</bool>
+                     </property>
+                     <property name="minimum">
+                      <number>0</number>
+                     </property>
+                     <property name="maximum">
+                      <number>9999</number>
+                     </property>
+                     <property name="value">
+                      <number>720</number>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QVBoxLayout" name="vLayoutVblank">
+              <property name="spacing">
+               <number>6</number>
+              </property>
+              <property name="leftMargin">
+               <number>0</number>
+              </property>
+              <item>
+               <layout class="QHBoxLayout" name="hLayoutVblank">
+                <item>
+                 <widget class="QGroupBox" name="heightDivider">
+                  <property name="title">
+                   <string>Vblank Divider</string>
+                  </property>
+                  <layout class="QVBoxLayout" name="vblankLayout">
+                   <item>
+                    <widget class="QSpinBox" name="vblankSpinBox">
+                     <property name="frame">
+                      <bool>true</bool>
+                     </property>
+                     <property name="accelerated">
+                      <bool>true</bool>
+                     </property>
+                     <property name="correctionMode">
+                      <enum>QAbstractSpinBox::CorrectionMode::CorrectToNearestValue</enum>
+                     </property>
+                     <property name="keyboardTracking">
+                      <bool>false</bool>
+                     </property>
+                     <property name="minimum">
+                      <number>1</number>
+                     </property>
+                     <property name="maximum">
+                      <number>9999</number>
+                     </property>
+                     <property name="value">
+                      <number>1</number>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <spacer name="gpuTabLayoutMiddleSpacer">
+              <property name="orientation">
+               <enum>Qt::Orientation::Vertical</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>0</width>
+                <height>0</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QVBoxLayout" name="gpuTabLayoutRight">
+            <property name="rightMargin">
+             <number>12</number>
+            </property>
+            <property name="bottomMargin">
+             <number>12</number>
+            </property>
+            <item>
+             <widget class="QGroupBox" name="additionalSettingsGroupBox">
+              <property name="title">
+               <string>Additional Settings</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
+              </property>
+              <layout class="QVBoxLayout" name="additionalSettingsLayout">
+               <item>
+                <widget class="QCheckBox" name="dumpShadersCheckBox">
+                 <property name="text">
+                  <string>Enable Shaders Dumping</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QCheckBox" name="nullGpuCheckBox">
+                 <property name="text">
+                  <string>Enable NULL GPU</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QCheckBox" name="dumpPM4CheckBox">
+                 <property name="text">
+                  <string>Enable PM4 Dumping</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <spacer name="additionalSettingsSpacer">
+              <property name="orientation">
+               <enum>Qt::Orientation::Vertical</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>0</width>
+                <height>0</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <spacer name="gpuTabSpacer">
+          <property name="orientation">
+           <enum>Qt::Orientation::Vertical</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </widget>
+      <widget class="QWidget" name="generalTab">
+       <attribute name="title">
+        <string>General</string>
+       </attribute>
+       <layout class="QVBoxLayout" name="generalTabVLayout" stretch="0,1">
+        <item>
+         <layout class="QHBoxLayout" name="generalTabHLayout" stretch="1,1,1">
+          <item>
+           <layout class="QVBoxLayout" name="generalTabLayoutLeft">
+            <item>
+             <widget class="QGroupBox" name="emuSettings">
+              <property name="title">
+               <string>Emulator Settings</string>
+              </property>
+              <layout class="QVBoxLayout" name="emuSettingsLayout">
+               <item>
+                <widget class="QCheckBox" name="fullscreenCheckBox">
+                 <property name="text">
+                  <string>Enable Fullscreen</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QCheckBox" name="showSplashCheckBox">
+                 <property name="text">
+                  <string>Show Splash</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QCheckBox" name="ps4proCheckBox">
+                 <property name="text">
+                  <string>Is PS4 Pro</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <spacer name="emulatorTabSpacerLeft">
+                 <property name="orientation">
+                  <enum>Qt::Orientation::Vertical</enum>
+                 </property>
+                 <property name="sizeType">
+                  <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>0</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+              </layout>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QVBoxLayout" name="emulatorTabLayoutMiddle">
+            <item>
+             <widget class="QGroupBox" name="loggerGroupBox">
+              <property name="title">
+               <string>Logger Settings</string>
+              </property>
+              <layout class="QVBoxLayout" name="loggerLayout">
+               <item>
+                <widget class="QWidget" name="LogTypeWidget" native="true">
+                 <layout class="QVBoxLayout" name="LogTypeLayout">
+                  <property name="leftMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="topMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="rightMargin">
+                   <number>0</number>
+                  </property>
+                  <property name="bottomMargin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QGroupBox" name="logTypeGroupBox">
+                    <property name="title">
+                     <string>Log Type</string>
+                    </property>
+                    <layout class="QVBoxLayout" name="logTypeBoxLayout">
+                     <item>
+                      <widget class="QComboBox" name="logTypeComboBox">
+                       <item>
+                        <property name="text">
+                         <string>async</string>
+                        </property>
+                       </item>
+                       <item>
+                        <property name="text">
+                         <string>sync</string>
+                        </property>
+                       </item>
+                      </widget>
+                     </item>
+                    </layout>
+                   </widget>
+                  </item>
+                 </layout>
+                </widget>
+               </item>
+               <item>
+                <layout class="QVBoxLayout" name="vLayoutLogFilter">
+                 <property name="spacing">
+                  <number>6</number>
+                 </property>
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <layout class="QHBoxLayout" name="hLayoutLogFilter">
+                   <item>
+                    <widget class="QGroupBox" name="logFilter">
+                     <property name="title">
+                      <string>Log Filter</string>
+                     </property>
+                     <layout class="QVBoxLayout" name="logFilterLayout">
+                      <item>
+                       <widget class="QLineEdit" name="logFilterLineEdit"/>
+                      </item>
+                     </layout>
+                    </widget>
+                   </item>
+                  </layout>
+                 </item>
+                </layout>
+               </item>
+              </layout>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QVBoxLayout" name="generalTabLayoutRight">
+            <item>
+             <widget class="QGroupBox" name="additionalSettings">
+              <property name="title">
+               <string>Additional Settings</string>
+              </property>
+              <layout class="QVBoxLayout" name="additionalSettingsVLayout">
+               <item>
+                <spacer name="emulatorTabSpacerRight">
+                 <property name="orientation">
+                  <enum>Qt::Orientation::Vertical</enum>
+                 </property>
+                 <property name="sizeType">
+                  <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>0</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+              </layout>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <spacer name="emulatorTabSpacer">
+          <property name="orientation">
+           <enum>Qt::Orientation::Vertical</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </widget>
+      <widget class="QWidget" name="debugTab">
+       <attribute name="title">
+        <string>Debug</string>
+       </attribute>
+       <layout class="QVBoxLayout" name="debugTabVLayout" stretch="0,1">
+        <item>
+         <layout class="QHBoxLayout" name="debugTabHLayout" stretch="1">
+          <item>
+           <widget class="QGroupBox" name="debugTabGroupBox">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="title">
+             <string>General</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
+            </property>
+            <layout class="QVBoxLayout" name="debugTabLayout">
+             <item alignment="Qt::AlignmentFlag::AlignTop">
+              <widget class="QCheckBox" name="debugDump">
+               <property name="text">
+                <string>Enable Debug Dumping</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="verticalSpacer">
+               <property name="orientation">
+                <enum>Qt::Orientation::Vertical</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>0</width>
+                 <height>0</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <widget class="QCheckBox" name="vkValidationCheckBox">
+               <property name="text">
+                <string>Enable Vulkan Validation Layers</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QCheckBox" name="vkSyncValidationCheckBox">
+               <property name="text">
+                <string>Enable Vulkan Synchronization Validation</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QCheckBox" name="rdocCheckBox">
+               <property name="text">
+                <string>Enable RenderDoc Debugging</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <spacer name="debugTabSpacer">
+          <property name="orientation">
+           <enum>Qt::Orientation::Vertical</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </widget>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::StandardButton::Apply|QDialogButtonBox::StandardButton::Close|QDialogButtonBox::StandardButton::RestoreDefaults|QDialogButtonBox::StandardButton::Save</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/sdl_window.cpp

@@ -46,21 +46,21 @@ WindowSDL::WindowSDL(s32 width_, s32 height_, Input::GameController* controller_
 
 #if defined(SDL_PLATFORM_WIN32)
     window_info.type = WindowSystemType::Windows;
-    window_info.render_surface =
-        SDL_GetProperty(SDL_GetWindowProperties(window), SDL_PROP_WINDOW_WIN32_HWND_POINTER, NULL);
+    window_info.render_surface = SDL_GetPointerProperty(SDL_GetWindowProperties(window),
+                                                        SDL_PROP_WINDOW_WIN32_HWND_POINTER, NULL);
 #elif defined(SDL_PLATFORM_LINUX)
     if (SDL_strcmp(SDL_GetCurrentVideoDriver(), "x11") == 0) {
         window_info.type = WindowSystemType::X11;
-        window_info.display_connection = SDL_GetProperty(SDL_GetWindowProperties(window),
-                                                         SDL_PROP_WINDOW_X11_DISPLAY_POINTER, NULL);
+        window_info.display_connection = SDL_GetPointerProperty(
+            SDL_GetWindowProperties(window), SDL_PROP_WINDOW_X11_DISPLAY_POINTER, NULL);
         window_info.render_surface = (void*)SDL_GetNumberProperty(
             SDL_GetWindowProperties(window), SDL_PROP_WINDOW_X11_WINDOW_NUMBER, 0);
     } else if (SDL_strcmp(SDL_GetCurrentVideoDriver(), "wayland") == 0) {
         window_info.type = WindowSystemType::Wayland;
-        window_info.display_connection = SDL_GetProperty(
+        window_info.display_connection = SDL_GetPointerProperty(
             SDL_GetWindowProperties(window), SDL_PROP_WINDOW_WAYLAND_DISPLAY_POINTER, NULL);
-        window_info.render_surface = SDL_GetProperty(SDL_GetWindowProperties(window),
-                                                     SDL_PROP_WINDOW_WAYLAND_SURFACE_POINTER, NULL);
+        window_info.render_surface = SDL_GetPointerProperty(
+            SDL_GetWindowProperties(window), SDL_PROP_WINDOW_WAYLAND_SURFACE_POINTER, NULL);
     }
 #elif defined(SDL_PLATFORM_MACOS)
     window_info.type = WindowSystemType::Metal;