Merge branch 'syncchanges' of https://git.eden-emu.dev/Ribbit/ribbitvulkanadditions into syncchanges

2025-09-27 12:44:52 -07:00 · 2025-09-27 12:44:52 -07:00 · 12b00214b1
commit 12b00214b1
parent 6b1e22632e e690f86f9d
349 changed files with 244 additions and 159 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -310,6 +310,7 @@ endif()
 if (ARCHITECTURE_arm64 AND (ANDROID OR PLATFORM_LINUX))
    set(HAS_NCE 1)
    add_compile_definitions(HAS_NCE=1)
+    find_package(oaknut 2.0.1)
 endif()

 if (YUZU_ROOM)
--- a/CMakeModules/Findsirit.cmake
+++ b/CMakeModules/Findsirit.cmake
@ -1,11 +0,0 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-include(FindPackageHandleStandardArgs)
-
-find_package(PkgConfig QUIET)
-pkg_search_module(sirit QUIET IMPORTED_TARGET sirit)
-find_package_handle_standard_args(sirit
-    REQUIRED_VARS sirit_LINK_LIBRARIES
-    VERSION_VAR sirit_VERSION
-)
--- a/dist/icons/controller/applet_dual_joycon.png
+++ b/dist/icons/controller/applet_dual_joycon.png
--- a/dist/icons/controller/applet_dual_joycon_dark.png
+++ b/dist/icons/controller/applet_dual_joycon_dark.png
--- a/dist/icons/controller/applet_dual_joycon_dark_disabled.png
+++ b/dist/icons/controller/applet_dual_joycon_dark_disabled.png
--- a/dist/icons/controller/applet_dual_joycon_disabled.png
+++ b/dist/icons/controller/applet_dual_joycon_disabled.png
--- a/dist/icons/controller/applet_dual_joycon_midnight.png
+++ b/dist/icons/controller/applet_dual_joycon_midnight.png
--- a/dist/icons/controller/applet_dual_joycon_midnight_disabled.png
+++ b/dist/icons/controller/applet_dual_joycon_midnight_disabled.png
--- a/dist/icons/controller/applet_handheld.png
+++ b/dist/icons/controller/applet_handheld.png
--- a/dist/icons/controller/applet_handheld_dark.png
+++ b/dist/icons/controller/applet_handheld_dark.png
--- a/dist/icons/controller/applet_handheld_dark_disabled.png
+++ b/dist/icons/controller/applet_handheld_dark_disabled.png
--- a/dist/icons/controller/applet_handheld_disabled.png
+++ b/dist/icons/controller/applet_handheld_disabled.png
--- a/dist/icons/controller/applet_handheld_midnight.png
+++ b/dist/icons/controller/applet_handheld_midnight.png
--- a/dist/icons/controller/applet_handheld_midnight_disabled.png
+++ b/dist/icons/controller/applet_handheld_midnight_disabled.png
--- a/dist/icons/controller/applet_pro_controller.png
+++ b/dist/icons/controller/applet_pro_controller.png
--- a/dist/icons/controller/applet_pro_controller_dark.png
+++ b/dist/icons/controller/applet_pro_controller_dark.png
--- a/dist/icons/controller/applet_pro_controller_midnight.png
+++ b/dist/icons/controller/applet_pro_controller_midnight.png
--- a/dist/icons/controller/applet_single_joycon_left.png
+++ b/dist/icons/controller/applet_single_joycon_left.png
--- a/dist/icons/controller/applet_single_joycon_left_dark.png
+++ b/dist/icons/controller/applet_single_joycon_left_dark.png
--- a/dist/icons/controller/applet_single_joycon_left_dark_disabled.png
+++ b/dist/icons/controller/applet_single_joycon_left_dark_disabled.png
--- a/dist/icons/controller/applet_single_joycon_left_disabled.png
+++ b/dist/icons/controller/applet_single_joycon_left_disabled.png
--- a/dist/icons/controller/applet_single_joycon_left_midnight.png
+++ b/dist/icons/controller/applet_single_joycon_left_midnight.png
--- a/dist/icons/controller/applet_single_joycon_left_midnight_disabled.png
+++ b/dist/icons/controller/applet_single_joycon_left_midnight_disabled.png
--- a/dist/icons/controller/applet_single_joycon_right.png
+++ b/dist/icons/controller/applet_single_joycon_right.png
--- a/dist/icons/controller/applet_single_joycon_right_dark.png
+++ b/dist/icons/controller/applet_single_joycon_right_dark.png
--- a/dist/icons/controller/applet_single_joycon_right_dark_disabled.png
+++ b/dist/icons/controller/applet_single_joycon_right_dark_disabled.png
--- a/dist/icons/controller/applet_single_joycon_right_disabled.png
+++ b/dist/icons/controller/applet_single_joycon_right_disabled.png
--- a/dist/icons/controller/applet_single_joycon_right_midnight.png
+++ b/dist/icons/controller/applet_single_joycon_right_midnight.png
--- a/dist/icons/controller/applet_single_joycon_right_midnight_disabled.png
+++ b/dist/icons/controller/applet_single_joycon_right_midnight_disabled.png
--- a/dist/icons/overlay/arrow_left.png
+++ b/dist/icons/overlay/arrow_left.png
--- a/dist/icons/overlay/arrow_left_dark.png
+++ b/dist/icons/overlay/arrow_left_dark.png
--- a/dist/icons/overlay/arrow_right.png
+++ b/dist/icons/overlay/arrow_right.png
--- a/dist/icons/overlay/arrow_right_dark.png
+++ b/dist/icons/overlay/arrow_right_dark.png
--- a/dist/icons/overlay/button_A_dark.png
+++ b/dist/icons/overlay/button_A_dark.png
--- a/dist/icons/overlay/button_B_dark.png
+++ b/dist/icons/overlay/button_B_dark.png
--- a/dist/icons/overlay/button_L.png
+++ b/dist/icons/overlay/button_L.png
--- a/dist/icons/overlay/button_L_dark.png
+++ b/dist/icons/overlay/button_L_dark.png
--- a/dist/icons/overlay/button_R.png
+++ b/dist/icons/overlay/button_R.png
--- a/dist/icons/overlay/button_R_dark.png
+++ b/dist/icons/overlay/button_R_dark.png
--- a/dist/icons/overlay/button_X_dark.png
+++ b/dist/icons/overlay/button_X_dark.png
--- a/dist/icons/overlay/button_Y_dark.png
+++ b/dist/icons/overlay/button_Y_dark.png
--- a/dist/icons/overlay/button_minus.png
+++ b/dist/icons/overlay/button_minus.png
--- a/dist/icons/overlay/button_minus_dark.png
+++ b/dist/icons/overlay/button_minus_dark.png
--- a/dist/icons/overlay/button_plus.png
+++ b/dist/icons/overlay/button_plus.png
--- a/dist/icons/overlay/button_plus_dark.png
+++ b/dist/icons/overlay/button_plus_dark.png
--- a/dist/icons/overlay/button_press_stick_dark.png
+++ b/dist/icons/overlay/button_press_stick_dark.png
--- a/dist/icons/overlay/controller_single_joycon_left_a.png
+++ b/dist/icons/overlay/controller_single_joycon_left_a.png
--- a/dist/icons/overlay/controller_single_joycon_left_a_dark.png
+++ b/dist/icons/overlay/controller_single_joycon_left_a_dark.png
--- a/dist/icons/overlay/controller_single_joycon_left_b.png
+++ b/dist/icons/overlay/controller_single_joycon_left_b.png
--- a/dist/icons/overlay/controller_single_joycon_left_b_dark.png
+++ b/dist/icons/overlay/controller_single_joycon_left_b_dark.png
--- a/dist/icons/overlay/controller_single_joycon_left_x.png
+++ b/dist/icons/overlay/controller_single_joycon_left_x.png
--- a/dist/icons/overlay/controller_single_joycon_left_x_dark.png
+++ b/dist/icons/overlay/controller_single_joycon_left_x_dark.png
--- a/dist/icons/overlay/controller_single_joycon_left_y.png
+++ b/dist/icons/overlay/controller_single_joycon_left_y.png
--- a/dist/icons/overlay/osk_button_B.png
+++ b/dist/icons/overlay/osk_button_B.png
--- a/dist/icons/overlay/osk_button_B_dark.png
+++ b/dist/icons/overlay/osk_button_B_dark.png
--- a/dist/icons/overlay/osk_button_B_dark_disabled.png
+++ b/dist/icons/overlay/osk_button_B_dark_disabled.png
--- a/dist/icons/overlay/osk_button_B_disabled.png
+++ b/dist/icons/overlay/osk_button_B_disabled.png
--- a/dist/icons/overlay/osk_button_Y.png
+++ b/dist/icons/overlay/osk_button_Y.png
--- a/dist/icons/overlay/osk_button_Y_dark.png
+++ b/dist/icons/overlay/osk_button_Y_dark.png
--- a/dist/icons/overlay/osk_button_Y_dark_disabled.png
+++ b/dist/icons/overlay/osk_button_Y_dark_disabled.png
--- a/dist/icons/overlay/osk_button_Y_disabled.png
+++ b/dist/icons/overlay/osk_button_Y_disabled.png
--- a/dist/icons/overlay/osk_button_plus.png
+++ b/dist/icons/overlay/osk_button_plus.png
--- a/dist/icons/overlay/osk_button_plus_dark.png
+++ b/dist/icons/overlay/osk_button_plus_dark.png
--- a/dist/icons/overlay/osk_button_plus_dark_disabled.png
+++ b/dist/icons/overlay/osk_button_plus_dark_disabled.png
--- a/dist/icons/overlay/osk_button_plus_disabled.png
+++ b/dist/icons/overlay/osk_button_plus_disabled.png
--- a/dist/icons/overlay/osk_button_shift_lock_off.png
+++ b/dist/icons/overlay/osk_button_shift_lock_off.png
--- a/dist/icons/overlay/osk_button_shift_lock_on.png
+++ b/dist/icons/overlay/osk_button_shift_lock_on.png
--- a/dist/icons/overlay/osk_button_shift_on_dark.png
+++ b/dist/icons/overlay/osk_button_shift_on_dark.png
--- a/dist/qt_themes/colorful/icons/16x16/checked.png
+++ b/dist/qt_themes/colorful/icons/16x16/checked.png
--- a/dist/qt_themes/colorful/icons/16x16/info.png
+++ b/dist/qt_themes/colorful/icons/16x16/info.png
--- a/dist/qt_themes/colorful/icons/256x256/plus_folder.png
+++ b/dist/qt_themes/colorful/icons/256x256/plus_folder.png
--- a/dist/qt_themes/colorful/icons/48x48/chip.png
+++ b/dist/qt_themes/colorful/icons/48x48/chip.png
--- a/dist/qt_themes/colorful/icons/48x48/folder.png
+++ b/dist/qt_themes/colorful/icons/48x48/folder.png
--- a/dist/qt_themes/colorful/icons/48x48/list-add.png
+++ b/dist/qt_themes/colorful/icons/48x48/list-add.png
--- a/dist/qt_themes/colorful/icons/48x48/sd_card.png
+++ b/dist/qt_themes/colorful/icons/48x48/sd_card.png
--- a/dist/qt_themes/colorful/icons/48x48/star.png
+++ b/dist/qt_themes/colorful/icons/48x48/star.png
--- a/dist/qt_themes/default/icons/256x256/eden.png
+++ b/dist/qt_themes/default/icons/256x256/eden.png
--- a/dist/qt_themes/default/icons/256x256/eden_named.png
+++ b/dist/qt_themes/default/icons/256x256/eden_named.png
--- a/dist/qt_themes/default/icons/48x48/bad_folder.png
+++ b/dist/qt_themes/default/icons/48x48/bad_folder.png
--- a/dist/qt_themes/default/icons/48x48/list-add.png
+++ b/dist/qt_themes/default/icons/48x48/list-add.png
--- a/dist/qt_themes/default/icons/48x48/sd_card.png
+++ b/dist/qt_themes/default/icons/48x48/sd_card.png
--- a/dist/qt_themes/qdarkstyle/icons/16x16/lock.png
+++ b/dist/qt_themes/qdarkstyle/icons/16x16/lock.png
--- a/dist/qt_themes/qdarkstyle/icons/48x48/bad_folder.png
+++ b/dist/qt_themes/qdarkstyle/icons/48x48/bad_folder.png
--- a/dist/qt_themes/qdarkstyle/icons/48x48/chip.png
+++ b/dist/qt_themes/qdarkstyle/icons/48x48/chip.png
--- a/dist/qt_themes/qdarkstyle/icons/48x48/list-add.png
+++ b/dist/qt_themes/qdarkstyle/icons/48x48/list-add.png
--- a/dist/qt_themes/qdarkstyle/icons/48x48/sd_card.png
+++ b/dist/qt_themes/qdarkstyle/icons/48x48/sd_card.png
--- a/dist/qt_themes/qdarkstyle/rc/Hmovetoolbar.png
+++ b/dist/qt_themes/qdarkstyle/rc/Hmovetoolbar.png
--- a/dist/qt_themes/qdarkstyle/rc/Vmovetoolbar.png
+++ b/dist/qt_themes/qdarkstyle/rc/Vmovetoolbar.png
--- a/dist/qt_themes/qdarkstyle/rc/checkbox_indeterminate.png
+++ b/dist/qt_themes/qdarkstyle/rc/checkbox_indeterminate.png
--- a/dist/qt_themes/qdarkstyle/rc/checkbox_indeterminate_disabled.png
+++ b/dist/qt_themes/qdarkstyle/rc/checkbox_indeterminate_disabled.png
--- a/dist/qt_themes/qdarkstyle/rc/checkbox_indeterminate_focus.png
+++ b/dist/qt_themes/qdarkstyle/rc/checkbox_indeterminate_focus.png
--- a/dist/qt_themes/qdarkstyle/rc/checkbox_unchecked.png
+++ b/dist/qt_themes/qdarkstyle/rc/checkbox_unchecked.png
--- a/dist/qt_themes/qdarkstyle/rc/checkbox_unchecked_disabled.png
+++ b/dist/qt_themes/qdarkstyle/rc/checkbox_unchecked_disabled.png
--- a/dist/qt_themes/qdarkstyle/rc/checkbox_unchecked_focus.png
+++ b/dist/qt_themes/qdarkstyle/rc/checkbox_unchecked_focus.png
--- a/dist/qt_themes/qdarkstyle/rc/close-hover.png
+++ b/dist/qt_themes/qdarkstyle/rc/close-hover.png
--- a/dist/qt_themes/qdarkstyle/rc/close-pressed.png
+++ b/dist/qt_themes/qdarkstyle/rc/close-pressed.png
--- a/dist/qt_themes/qdarkstyle/rc/close.png
+++ b/dist/qt_themes/qdarkstyle/rc/close.png
--- a/dist/qt_themes/qdarkstyle/rc/radio_checked.png
+++ b/dist/qt_themes/qdarkstyle/rc/radio_checked.png
--- a/dist/qt_themes/qdarkstyle/rc/radio_checked_disabled.png
+++ b/dist/qt_themes/qdarkstyle/rc/radio_checked_disabled.png
--- a/dist/qt_themes/qdarkstyle/rc/radio_checked_focus.png
+++ b/dist/qt_themes/qdarkstyle/rc/radio_checked_focus.png
--- a/Show more
+++ b/Show more