early-access version 1591

README.md

@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 1588.
+This is the source code for early-access 1591.
 
 ## Legal Notice
 

dist/qt_themes/default/style.qss

@@ -281,380 +281,3 @@ QWidget#controllerPlayer7,
 QWidget#controllerPlayer8 {
     background: transparent;
 }
-
-QDialog#QtSoftwareKeyboardDialog,
-QStackedWidget#topOSK {
-    background: rgba(51, 51, 51, .9);
-}
-
-
-QDialog#OverlayDialog,
-QStackedWidget#stackedDialog {
-    background: rgba(51, 51, 51, .7);
-}
-
-QWidget#boxOSK,
-QWidget#lineOSK,
-QWidget#richDialog,
-QWidget#lineDialog {
-    background: transparent;
-}
-
-QStackedWidget#bottomOSK,
-QWidget#contentDialog,
-QWidget#contentRichDialog {
-    background: rgba(240, 240, 240, 1);
-}
-
-QWidget#contentDialog,
-QWidget#contentRichDialog {
-    margin: 5px;
-    border-radius: 6px;
-}
-
-QWidget#buttonsDialog,
-QWidget#buttonsRichDialog {
-    margin: 5px;
-    border-top: 2px solid rgba(44, 44, 44, 1);
-}
-
-QWidget#legendOSKnum {
-    border-top: 1px solid rgba(44, 44, 44, 1);
-}
-
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::vertical {
-    background: #cdcdcd;
-    width: 15px;
-    margin: 15px 3px 15px 3px;
-    border: 1px transparent;
-    border-radius: 4px;
-}
-
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::horizoncal {
-    background: #cdcdcd;
-    height: 15px;
-    margin: 3px 15px 3px 15px;
-    border: 1px transparent;
-    border-radius: 4px;
-}
-
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::handle {
-    background: #fff;
-    border-radius: 4px;
-    min-height: 5px;
-    min-width: 5px;
-}
-
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::add-line,
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::sub-line,
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::add-page,
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::sub-page {
-    background: none;
-}
-
-QWidget#inputOSK {
-    border-bottom: 3px solid rgba(255, 255, 255, .9);
-}
-
-QWidget#inputOSK QLineEdit {
-    background: transparent;
-    border: none;
-    color: #ccc;
-}
-
-QWidget#inputBoxOSK {
-    border: 2px solid rgba(255, 255, 255, .9);
-}
-
-QWidget#inputBoxOSK QTextEdit {
-    background: transparent;
-    border: none;
-    color: #ccc;
-}
-
-QWidget#richDialog QTextBrowser {
-    background: transparent;
-    border: none;
-    padding: 35px 65px;
-}
-
-
-QWidget#lineOSK QLabel#label_header {
-    color: #f0f0f0;
-}
-
-QWidget#lineOSK QLabel#label_sub,
-QWidget#lineOSK QLabel#label_characters,
-QWidget#boxOSK QLabel#label_characters_box {
-    color: #ccc;
-}
-
-QWidget#contentDialog QLabel#label_title,
-QWidget#contentRichDialog QLabel#label_title_rich {
-    color: #888;
-}
-
-QWidget#contentDialog QLabel#label_dialog {
-    padding: 20px 65px;
-}
-
-QWidget#contentDialog QLabel#label_title,
-QWidget#contentRichDialog QLabel#label_title_rich {
-    padding: 0px 65px;
-}
-
-QDialog#OverlayDialog QPushButton {
-    color: rgba(49, 79, 239, 1);
-    background: transparent;
-    border: none;
-    padding: 0px;
-    min-width: 0px;
-}
-
-QDialog#OverlayDialog QPushButton:focus,
-QDialog#OverlayDialog QPushButton:hover {
-    color: rgba(49, 79, 239, 1);
-    background: rgba(255, 255, 255, 1);
-    border: 5px solid rgba(148, 250, 202, 1);
-    border-radius: 6px;
-    outline: none;
-}
-
-QDialog#OverlayDialog QPushButton:pressed {
-    color: rgba(240, 240, 240, 1);
-    background: rgba(150, 150, 150, 1);
-    border: 5px solid rgba(148, 250, 202, 1);
-    border-radius: 6px;
-    outline: none;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton {
-    background: rgba(232, 232, 232, 1);
-    border: 2px solid rgba(240, 240, 240, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift {
-    background: rgba(218, 218, 218, 1);
-    border: 2px solid rgba(240, 240, 240, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num {
-    color: rgba(240, 240, 240, 1);
-    background: rgba(44, 44, 44, 1);
-    border: 2px solid rgba(240, 240, 240, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num {
-    color: rgba(240, 240, 240, 1);
-    background: rgba(49, 79, 239, 1);
-    border: 2px solid rgba(240, 240, 240, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:focus,
-
-QDialog#QtSoftwareKeyboardDialog QPushButton:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:hover {
-    color: rgba(0, 0, 0, 1);
-    background: rgba(255, 255, 255, 1);
-    border: 5px solid rgba(148, 250, 202, 1);
-    border-radius: 6px;
-    outline: none;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:pressed {
-    color: rgba(240, 240, 240, 1);
-    background: rgba(150, 150, 150, 1);
-    border: 5px solid rgba(148, 250, 202, 1);
-    border-radius: 6px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num {
-    background-position: right top;
-    background-repeat: no-repeat;
-    background-origin: content;
-    background-image: url(:/overlay/osk_button_B.png);
-    qproperty-icon: url(:/overlay/osk_button_backspace.png);
-    qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift {
-    background-position: right top;
-    background-repeat: no-repeat;
-    background-origin: content;
-    background-image: url(:/overlay/osk_button_Y.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num {
-    background-position: right top;
-    background-repeat: no-repeat;
-    background-origin: content;
-    background-image: url(:/overlay/osk_button_plus.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift {
-    background-position: left top;
-    background-repeat: no-repeat;
-    background-origin: content;
-    background-image: url(:/overlay/osk_button_shift_lock_off.png);
-    qproperty-icon: url(:/overlay/osk_button_shift.png);
-    qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift {
-    background-position: left top;
-    background-repeat: no-repeat;
-    background-origin: content;
-    background-image: url(:/overlay/osk_button_shift_lock_off.png);
-    qproperty-icon: url(:/overlay/osk_button_shift_on.png);
-    qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_left_bracket,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_right_bracket,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_left_parenthesis,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_right_parenthesis {
-    padding-bottom: 7px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#titleOSK QLabel {
-    background: transparent;
-    color: #ccc;
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L_num {
-    image: url(:/overlay/button_L.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left_num {
-    image: url(:/overlay/arrow_left.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R_num {
-    image: url(:/overlay/button_R.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right_num {
-    image: url(:/overlay/arrow_right.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_press_stick,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_press_stick_shift {
-    image: url(:/overlay/button_press_stick.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X_num {
-    image: url(:/overlay/button_X.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A_num {
-    image: url(:/overlay/button_A.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled {
-    color: rgba(164, 164, 164, 1);
-    background-color: rgba(218, 218, 218, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_at:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_slash:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_percent:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_1:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_2:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_3:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_4:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_5:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_6:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_7:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_8:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_9:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_0:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled {
-    color: rgba(164, 164, 164, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled {
-    background-image: url(:/overlay/osk_button_plus_disabled.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled {
-    background-image: url(:/overlay/osk_button_B_disabled.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled {
-    background-image: url(:/overlay/osk_button_Y_disabled.png);
-}

dist/qt_themes/qdarkstyle/style.qss

@@ -1560,400 +1560,7 @@ QWidget#controllerPlayer8 {
     background: transparent;
 }
 
-QDialog#QtSoftwareKeyboardDialog,
+/* touchscreen mapping widget */
-QStackedWidget#topOSK {
+TouchScreenPreview {
-    background: rgba(41, 41, 41, .9);
+    qproperty-dotHighlightColor: #3daee9;
-}
-
-
-QDialog#OverlayDialog,
-QStackedWidget#stackedDialog {
-    background: rgba(41, 41, 41, .7);
-}
-
-QWidget#boxOSK,
-QWidget#lineOSK,
-QWidget#richDialog,
-QWidget#lineDialog {
-    background: transparent;
-}
-
-QStackedWidget#bottomOSK,
-QWidget#contentDialog,
-QWidget#contentRichDialog {
-    background: rgba(71, 69, 71, 1);
-}
-
-QWidget#contentDialog,
-QWidget#contentRichDialog {
-    margin: 5px;
-    border-radius: 6px;
-}
-
-QWidget#buttonsDialog,
-QWidget#buttonsRichDialog {
-    margin: 5px;
-    border-top: 2px solid rgba(255, 255, 255, .9);
-}
-
-QWidget#legendOSKnum {
-    border-top: 1px solid rgba(255, 255, 255, 1);
-}
-
-QStackedWidget#stackedDialog QTextBrowser QWidget {
-    background: transparent;
-}
-
-QStackedWidget#stackedDialog QTextBrowser QScrollBar {
-    background: #2a2929;
-}
-
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::sub-line,
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::add-line {
-    border-image: none;
-}
-
-QWidget#inputOSK {
-    border-bottom: 3px solid rgba(255, 255, 255, .9);
-}
-
-QWidget#inputOSK QLineEdit {
-    background: transparent;
-    border: none;
-    color: #ccc;
-    padding: 0px;
-}
-
-QWidget#inputBoxOSK {
-    border: 2px solid rgba(255, 255, 255, .9);
-}
-
-QWidget#inputBoxOSK QTextEdit {
-    background: transparent;
-    border: none;
-    color: #ccc;
-}
-
-QWidget#richDialog QTextBrowser {
-    background: transparent;
-    border: none;
-    color: #fff;
-    padding: 35px 65px;
-}
-
-QWidget#lineOSK QLabel#label_header {
-    color: #f0f0f0;
-}
-
-QWidget#lineOSK QLabel#label_sub,
-QWidget#lineOSK QLabel#label_characters,
-QWidget#contentDialog QLabel#label_title,
-QWidget#contentRichDialog QLabel#label_title_rich,
-QWidget#boxOSK QLabel#label_characters_box {
-    color: #ccc;
-}
-
-QWidget#buttonsDialog,
-QWidget#buttonsRichDialog,
-QWidget#mainOSK,
-QWidget#headerOSK,
-QWidget#normalOSK,
-QWidget#shiftOSK,
-QWidget#numOSK,
-QWidget#subOSK,
-QWidget#inputOSK,
-QWidget#inputBoxOSK,
-QWidget#charactersOSK,
-QWidget#charactersBoxOSK,
-QWidget#legendOSK,
-QWidget#legendOSK QWidget,
-QWidget#legendOSKshift,
-QWidget#legendOSKshift QWidget,
-QWidget#legendOSKnum,
-QWidget#legendOSKnum QWidget {
-    background: transparent;
-}
-
-QWidget#contentDialog QLabel,
-QWidget#legendOSK QLabel,
-QWidget#legendOSKshift QLabel,
-QWidget#legendOSKnum QLabel {
-    color: rgba(255, 255, 255, 1);
-}
-
-QWidget#contentDialog QLabel#label_dialog {
-    padding: 20px 65px;
-}
-
-QWidget#contentDialog QLabel#label_title,
-QWidget#contentRichDialog QLabel#label_title_rich {
-    padding: 0px 65px;
-}
-
-QDialog#OverlayDialog QPushButton {
-    color: rgba(1, 253, 201, 1);
-    background: transparent;
-    border: none;
-    padding: 0px;
-    min-width: 0px;
-}
-
-QDialog#OverlayDialog QPushButton:focus,
-QDialog#OverlayDialog QPushButton:hover {
-    color: rgba(1, 253, 201, 1);
-    background: rgba(58, 61, 66, 1);
-    border: 5px solid rgba(56, 189, 225, 1);
-    border-radius: 6px;
-    outline: none;
-}
-
-QDialog#OverlayDialog QPushButton:pressed {
-    color: rgba(240, 240, 240, 1);
-    background: rgba(150, 150, 150, 1);
-    border: 5px solid rgba(56, 189, 225, 1);
-    border-radius: 6px;
-    outline: none;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton {
-    color: rgba(255, 255, 255, 1);
-    background: rgba(80, 79, 80, 1);
-    border: 2px solid rgba(71, 69, 71, 1);
-    padding: 0px;
-    min-width: 0px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift {
-    background: rgba(95, 94, 95, 1);
-    border: 2px solid rgba(71, 69, 71, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num {
-    color: rgba(240, 240, 240, 1);
-    background: rgba(255, 255, 255, 1);
-    border: 2px solid rgba(71, 69, 71, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num {
-    color: rgba(0, 0, 0, 1);
-    background: rgba(1, 253, 201, 1);
-    border: 2px solid rgba(71, 69, 71, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:focus,
-
-QDialog#QtSoftwareKeyboardDialog QPushButton:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:hover {
-    color: rgba(255, 255, 255, 1);
-    background: rgba(58, 61, 66, 1);
-    border: 5px solid rgba(56, 189, 225, 1);
-    border-radius: 6px;
-    outline: none;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:pressed {
-    color: rgba(240, 240, 240, 1);
-    background: rgba(150, 150, 150, 1);
-    border: 5px solid rgba(56, 189, 225, 1);
-    border-radius: 6px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num {
-    background-position: right top;
-    background-repeat: no-repeat;
-    background-origin: content;
-    background-image: url(:/overlay/osk_button_B_dark.png);
-    qproperty-icon: url(:/overlay/osk_button_backspace_dark.png);
-    qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift {
-    background-position: right top;
-    background-repeat: no-repeat;
-    background-origin: content;
-    background-image: url(:/overlay/osk_button_Y_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num {
-    color: rgba(44, 44, 44, 1);
-    background-position: right top;
-    background-repeat: no-repeat;
-    background-origin: content;
-    background-image: url(:/overlay/osk_button_plus_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift {
-    background-position: left top;
-    background-repeat: no-repeat;
-    background-origin: content;
-    background-image: url(:/overlay/osk_button_shift_lock_off.png);
-    qproperty-icon: url(:/overlay/osk_button_shift_dark.png);
-    qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift {
-    background-position: left top;
-    background-repeat: no-repeat;
-    background-origin: content;
-    background-image: url(:/overlay/osk_button_shift_lock_off.png);
-    qproperty-icon: url(:/overlay/osk_button_shift_on_dark.png);
-    qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_left_bracket,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_right_bracket,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_left_parenthesis,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_right_parenthesis {
-    padding-bottom: 7px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#titleOSK QLabel {
-    background: transparent;
-    color: #ccc;
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L_num {
-    image: url(:/overlay/button_L_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left_num {
-    image: url(:/overlay/arrow_left_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R_num {
-    image: url(:/overlay/button_R_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right_num {
-    image: url(:/overlay/arrow_right_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_press_stick,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_press_stick_shift {
-    image: url(:/overlay/button_press_stick_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X_num {
-    image: url(:/overlay/button_X_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A_num {
-    image: url(:/overlay/button_A_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled {
-    color: rgba(144, 144, 144, 1);
-    background-color: rgba(95, 94, 95, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_at:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_slash:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_percent:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_1:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_2:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_3:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_4:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_5:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_6:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_7:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_8:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_9:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_0:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled {
-    color: rgba(144, 144, 144, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled {
-    background-image: url(:/overlay/osk_button_plus_dark_disabled.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled {
-    background-image: url(:/overlay/osk_button_B_dark_disabled.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled {
-    background-image: url(:/overlay/osk_button_Y_dark_disabled.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QFrame,
-QDialog#QtSoftwareKeyboardDialog QFrame[frameShape="0"],
-QDialog#OverlayDialog QFrame,
-QDialog#OverlayDialog QFrame[frameShape="0"] {
-    border-radius: 0px;
-    border: none;
 }

dist/qt_themes/qdarkstyle_midnight_blue/style.qss

@@ -1,10 +1,10 @@
 /* ---------------------------------------------------------------------------
 
-  Created by the qtsass compiler v0.1.1
+    Created by the qtsass compiler v0.1.1
 
-  The definitions are in the "qdarkstyle.qss._styles.scss" module
+    The definitions are in the "qdarkstyle.qss._styles.scss" module
 
-  WARNING! All changes made in this file will be lost!
+    WARNING! All changes made in this file will be lost!
 
 --------------------------------------------------------------------------- */
 /* QDarkStyleSheet -----------------------------------------------------------
@@ -15,34 +15,34 @@ It is based on three selecting colors, three greyish (background) colors
 plus three whitish (foreground) colors. Each set of widgets of the same
 type have a header like this:
 
-  ------------------
+    ------------------
-  GroupName --------
+    GroupName --------
-  ------------------
+    ------------------
 
 And each widget is separated with a header like this:
 
-  QWidgetName ------
+    QWidgetName ------
 
 This makes more easy to find and change some css field. The basic
 configuration is described bellow.
 
-  BACKGROUND -----------
+    BACKGROUND -----------
 
-    Light   (unpressed)
+        Light   (unpressed)
-    Normal  (border, disabled, pressed, checked, toolbars, menus)
+        Normal  (border, disabled, pressed, checked, toolbars, menus)
-    Dark    (background)
+        Dark    (background)
 
-  FOREGROUND -----------
+    FOREGROUND -----------
 
-    Light   (texts/labels)
+        Light   (texts/labels)
-    Normal  (not used yet)
+        Normal  (not used yet)
-    Dark    (disabled texts)
+        Dark    (disabled texts)
 
-  SELECTION ------------
+    SELECTION ------------
 
-    Light  (selection/hover/active)
+        Light  (selection/hover/active)
-    Normal (selected)
+        Normal (selected)
-    Dark   (selected disabled)
+        Dark   (selected disabled)
 
 If a stranger configuration is required because of a bugfix or anything
 else, keep the comment on the line above so nobody changes it, including the
@@ -2483,404 +2483,3 @@ QWidget#controllerPlayer7,
 QWidget#controllerPlayer8 {
   background: transparent;
 }
-
-QDialog#QtSoftwareKeyboardDialog,
-QStackedWidget#topOSK {
-  background: rgba(15, 25, 34, .9);
-}
-
-QDialog#OverlayDialog,
-QStackedWidget#stackedDialog {
-  background: rgba(15, 25, 34, .7);
-}
-
-QWidget#boxOSK,
-QWidget#lineOSK,
-QWidget#richDialog,
-QWidget#lineDialog {
-  background: transparent;
-}
-
-QStackedWidget#bottomOSK,
-QWidget#contentDialog,
-QWidget#contentRichDialog {
-  background: rgba(31, 41, 51, 1);
-}
-
-QWidget#contentDialog,
-QWidget#contentRichDialog {
-  margin: 5px;
-  border-radius: 6px;
-}
-
-QWidget#buttonsDialog,
-QWidget#buttonsRichDialog {
-  margin: 5px;
-  border-top: 2px solid rgba(255, 255, 255, .9);
-}
-
-QWidget#legendOSKnum {
-  border-top: 1px solid rgba(255, 255, 255, 1);
-}
-
-QStackedWidget#stackedDialog QTextBrowser QWidget {
-  background: transparent;
-}
-
-QStackedWidget#stackedDialog QTextBrowser QScrollBar {
-  background: #19232d;
-  border: none;
-}
-
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::sub-line,
-QStackedWidget#stackedDialog QTextBrowser QScrollBar::add-line {
-  border-image: none;
-}
-
-QWidget#mainOSK QStackedWidget,
-QDialog#OverlayDialog QStackedWidget {
-  border: none;
-  padding: 0px;
-}
-
-QWidget#inputOSK {
-  border-bottom: 3px solid rgba(255, 255, 255, .9);
-}
-
-QWidget#inputOSK QLineEdit {
-  background: transparent;
-  border: none;
-  color: #ccc;
-  padding: 0px;
-}
-
-QWidget#inputBoxOSK {
-  border: 2px solid rgba(255, 255, 255, .9);
-}
-
-QWidget#inputBoxOSK QTextEdit {
-  background: transparent;
-  border: none;
-  color: #ccc;
-}
-
-QWidget#richDialog QTextBrowser {
-  background: transparent;
-  border: none;
-  color: #fff;
-  padding: 35px 65px;
-}
-
-QWidget#lineOSK QLabel#label_header {
-  color: #f0f0f0;
-}
-
-QWidget#lineOSK QLabel#label_sub,
-QWidget#lineOSK QLabel#label_characters,
-QWidget#contentDialog QLabel#label_title,
-QWidget#contentRichDialog QLabel#label_title_rich,
-QWidget#boxOSK QLabel#label_characters_box {
-  color: #ccc;
-}
-
-QWidget#buttonsDialog,
-QWidget#buttonsRichDialog,
-QWidget#mainOSK,
-QWidget#headerOSK,
-QWidget#normalOSK,
-QWidget#shiftOSK,
-QWidget#numOSK,
-QWidget#subOSK,
-QWidget#inputOSK,
-QWidget#inputBoxOSK,
-QWidget#charactersOSK,
-QWidget#charactersBoxOSK,
-QWidget#legendOSK,
-QWidget#legendOSK QWidget,
-QWidget#legendOSKshift,
-QWidget#legendOSKshift QWidget,
-QWidget#legendOSKnum,
-QWidget#legendOSKnum QWidget {
-  background: transparent;
-}
-
-QWidget#contentDialog QLabel,
-QWidget#legendOSK QLabel,
-QWidget#legendOSKshift QLabel,
-QWidget#legendOSKnum QLabel {
-  color: rgba(255, 255, 255, 1);
-}
-
-QWidget#contentDialog QLabel#label_dialog {
-  padding: 20px 65px;
-}
-
-QWidget#contentDialog QLabel#label_title,
-QWidget#contentRichDialog QLabel#label_title_rich {
-  padding: 0px 65px;
-}
-
-QDialog#OverlayDialog QPushButton {
-  color: rgba(1, 253, 201, 1);
-  background: transparent;
-  border: none;
-  padding: 0px;
-  min-width: 0px;
-}
-
-QDialog#OverlayDialog QPushButton:focus,
-QDialog#OverlayDialog QPushButton:hover {
-  color: rgba(1, 253, 201, 1);
-  background: rgba(18, 33, 46, 1);
-  border: 5px solid rgba(56, 189, 225, 1);
-  border-radius: 6px;
-  outline: none;
-}
-
-QDialog#OverlayDialog QPushButton:pressed {
-  color: rgba(240, 240, 240, 1);
-  background: rgba(110, 122, 130, 1);
-  border: 5px solid rgba(56, 189, 225, 1);
-  border-radius: 6px;
-  outline: none;
-}
-
-QDialog#QtSoftwareKeyboardDialog QLabel {
-  padding: 0px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton {
-  color: rgba(255, 255, 255, 1);
-  background: rgba(40, 51, 60, 1);
-  border: 2px solid rgba(31, 41, 51, 1);
-  border-radius: 0px;
-  padding: 0px;
-  min-width: 0px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift {
-  background: rgba(55, 66, 75, 1);
-  border: 2px solid rgba(31, 41, 51, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num {
-  color: rgba(240, 240, 240, 1);
-  background: rgba(255, 255, 255, 1);
-  border: 2px solid rgba(31, 41, 51, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num {
-  color: rgba(0, 0, 0, 1);
-  background: rgba(1, 253, 201, 1);
-  border: 2px solid rgba(31, 41, 51, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:focus,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:focus,
-
-QDialog#QtSoftwareKeyboardDialog QPushButton:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:hover,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:hover {
-  color: rgba(255, 255, 255, 1);
-  background: rgba(18, 33, 46, 1);
-  border: 5px solid rgba(56, 189, 225, 1);
-  border-radius: 6px;
-  outline: none;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:pressed,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:pressed {
-  color: rgba(240, 240, 240, 1);
-  background: rgba(110, 122, 130, 1);
-  border: 5px solid rgba(56, 189, 225, 1);
-  border-radius: 6px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num {
-  background-position: right top;
-  background-repeat: no-repeat;
-  background-origin: content;
-  background-image: url(:/overlay/osk_button_B_dark.png);
-  qproperty-icon: url(:/overlay/osk_button_backspace_dark.png);
-  qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift {
-  background-position: right top;
-  background-repeat: no-repeat;
-  background-origin: content;
-  background-image: url(:/overlay/osk_button_Y_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num {
-  color: rgba(44, 44, 44, 1);
-  background-position: right top;
-  background-repeat: no-repeat;
-  background-origin: content;
-  background-image: url(:/overlay/osk_button_plus_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift {
-  background-position: left top;
-  background-repeat: no-repeat;
-  background-origin: content;
-  background-image: url(:/overlay/osk_button_shift_lock_off.png);
-  qproperty-icon: url(:/overlay/osk_button_shift_dark.png);
-  qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_shift_shift {
-  background-position: left top;
-  background-repeat: no-repeat;
-  background-origin: content;
-  background-image: url(:/overlay/osk_button_shift_lock_off.png);
-  qproperty-icon: url(:/overlay/osk_button_shift_on_dark.png);
-  qproperty-iconSize: 36px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_left_bracket,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_right_bracket,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_left_parenthesis,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_right_parenthesis {
-  padding-bottom: 7px;
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#titleOSK QLabel {
-  background: transparent;
-  color: #ccc;
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_L_num {
-  image: url(:/overlay/button_L_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_left_num {
-  image: url(:/overlay/arrow_left_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_R_num {
-  image: url(:/overlay/button_R_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#arrow_right_num {
-  image: url(:/overlay/arrow_right_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_press_stick,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_press_stick_shift {
-  image: url(:/overlay/button_press_stick_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_X_num {
-  image: url(:/overlay/button_X_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A_shift,
-QDialog#QtSoftwareKeyboardDialog QWidget#button_A_num {
-  image: url(:/overlay/button_A_dark.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled {
-  color: rgba(144, 144, 144, 1);
-  background-color: rgba(55, 66, 75, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_at:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_slash:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_percent:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_1:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_2:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_3:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_4:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_5:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_6:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_7:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_8:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_9:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_0:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_return:disabled {
-  color: rgba(144, 144, 144, 1);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_ok_num:disabled {
-  background-image: url(:/overlay/osk_button_plus_dark_disabled.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_shift:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_backspace_num:disabled {
-  background-image: url(:/overlay/osk_button_B_dark_disabled.png);
-}
-
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space:disabled,
-QDialog#QtSoftwareKeyboardDialog QPushButton#button_space_shift:disabled {
-  background-image: url(:/overlay/osk_button_Y_dark_disabled.png);
-}

dist/yuzu.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 612.15 680.17"><defs><style>.cls-1{fill:#c6c6c6;}.cls-2{fill:#ffdc00;}</style></defs><title>newAsset 7</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><g id="g823"><g id="right"><g id="g827"><g id="g833"><path id="path835" class="cls-1" d="M340.08,136V680.17c150.26,0,272.07-121.81,272.07-272.07S490.34,136,340.08,136m53.14,59.6a219.06,219.06,0,0,1,0,424.94V195.63"/></g></g></g><g id="left"><g id="g839"><g id="g845"><path id="path847" class="cls-2" d="M272.07,0C121.81,0,0,121.81,0,272.07S121.81,544.13,272.07,544.13ZM218.93,59.6V484.54A219,219,0,0,1,117.26,117.26,217.44,217.44,0,0,1,218.93,59.6"/></g></g></g></g></g></g></svg>
+<svg id="svg815" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 614.4 682.67"><defs><style>.cls-1{fill:none;}.cls-2{clip-path:url(#clip-path);}.cls-3{fill:#ff3c28;}.cls-4{fill:#0ab9e6;}</style><clipPath id="clip-path"><rect class="cls-1" x="-43" y="-46.67" width="699.6" height="777.33"/></clipPath></defs><title>Artboard 1</title><g id="g823"><g id="right"><g class="cls-2"><g id="g827"><g id="g833"><path id="path835" class="cls-3" d="M340.81,138V682.08c150.26,0,272.06-121.81,272.06-272.06S491.07,138,340.81,138M394,197.55a219.06,219.06,0,0,1,0,424.94V197.55"/></g></g></g></g><g id="left"><g class="cls-2"><g id="g839"><g id="g845"><path id="path847" class="cls-4" d="M272.79,1.92C122.53,1.92.73,123.73.73,274s121.8,272.07,272.06,272.07ZM219.65,61.51v425A219,219,0,0,1,118,119.18,217.51,217.51,0,0,1,219.65,61.51"/></g></g></g></g></g></svg>

src/common/assert.cpp

@@ -4,4 +4,8 @@
 
 #include "common/assert.h"
 
-void assert_handle_failure() {}
+#include "common/common_funcs.h"
+
+void assert_handle_failure() {
+    Crash();
+}

src/core/CMakeLists.txt

@@ -273,7 +273,6 @@ add_library(core STATIC
     hle/service/am/applets/profile_select.h
     hle/service/am/applets/software_keyboard.cpp
     hle/service/am/applets/software_keyboard.h
-    hle/service/am/applets/software_keyboard_types.h
     hle/service/am/applets/web_browser.cpp
     hle/service/am/applets/web_browser.h
     hle/service/am/applets/web_types.h

src/core/frontend/applets/software_keyboard.cpp

@@ -1,149 +1,29 @@
-// Copyright 2021 yuzu Emulator Project
+// Copyright 2018 yuzu emulator team
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <thread>
+#include "common/logging/backend.h"
-
-#include "common/logging/log.h"
 #include "common/string_util.h"
 #include "core/frontend/applets/software_keyboard.h"
 
 namespace Core::Frontend {
-
 SoftwareKeyboardApplet::~SoftwareKeyboardApplet() = default;
 
-DefaultSoftwareKeyboardApplet::~DefaultSoftwareKeyboardApplet() = default;
+void DefaultSoftwareKeyboardApplet::RequestText(
+    std::function<void(std::optional<std::u16string>)> out,
+    SoftwareKeyboardParameters parameters) const {
+    if (parameters.initial_text.empty())
+        out(u"yuzu");
 
-void DefaultSoftwareKeyboardApplet::InitializeKeyboard(
+    out(parameters.initial_text);
-    bool is_inline, KeyboardInitializeParameters initialize_parameters,
-    std::function<void(Service::AM::Applets::SwkbdResult, std::u16string)> submit_normal_callback_,
-    std::function<void(Service::AM::Applets::SwkbdReplyType, std::u16string, s32)>
-        submit_inline_callback_) {
-    if (is_inline) {
-        LOG_WARNING(
-            Service_AM,
-            "(STUBBED) called, backend requested to initialize the inline software keyboard.");
-
-        submit_inline_callback = std::move(submit_inline_callback_);
-    } else {
-        LOG_WARNING(
-            Service_AM,
-            "(STUBBED) called, backend requested to initialize the normal software keyboard.");
-
-        submit_normal_callback = std::move(submit_normal_callback_);
-    }
-
-    parameters = std::move(initialize_parameters);
-
-    LOG_INFO(Service_AM,
-             "\nKeyboardInitializeParameters:"
-             "\nok_text={}"
-             "\nheader_text={}"
-             "\nsub_text={}"
-             "\nguide_text={}"
-             "\ninitial_text={}"
-             "\nmax_text_length={}"
-             "\nmin_text_length={}"
-             "\ninitial_cursor_position={}"
-             "\ntype={}"
-             "\npassword_mode={}"
-             "\ntext_draw_type={}"
-             "\nkey_disable_flags={}"
-             "\nuse_blur_background={}"
-             "\nenable_backspace_button={}"
-             "\nenable_return_button={}"
-             "\ndisable_cancel_button={}",
-             Common::UTF16ToUTF8(parameters.ok_text), Common::UTF16ToUTF8(parameters.header_text),
-             Common::UTF16ToUTF8(parameters.sub_text), Common::UTF16ToUTF8(parameters.guide_text),
-             Common::UTF16ToUTF8(parameters.initial_text), parameters.max_text_length,
-             parameters.min_text_length, parameters.initial_cursor_position, parameters.type,
-             parameters.password_mode, parameters.text_draw_type, parameters.key_disable_flags.raw,
-             parameters.use_blur_background, parameters.enable_backspace_button,
-             parameters.enable_return_button, parameters.disable_cancel_button);
 }
 
-void DefaultSoftwareKeyboardApplet::ShowNormalKeyboard() const {
+void DefaultSoftwareKeyboardApplet::SendTextCheckDialog(
+    std::u16string error_message, std::function<void()> finished_check) const {
     LOG_WARNING(Service_AM,
-                "(STUBBED) called, backend requested to show the normal software keyboard.");
+                "(STUBBED) called - Default fallback software keyboard does not support text "
-
+                "check! (error_message={})",
-    SubmitNormalText(u"yuzu");
+                Common::UTF16ToUTF8(error_message));
+    finished_check();
 }
-
-void DefaultSoftwareKeyboardApplet::ShowTextCheckDialog(
-    Service::AM::Applets::SwkbdTextCheckResult text_check_result,
-    std::u16string text_check_message) const {
-    LOG_WARNING(Service_AM, "(STUBBED) called, backend requested to show the text check dialog.");
-}
-
-void DefaultSoftwareKeyboardApplet::ShowInlineKeyboard(
-    InlineAppearParameters appear_parameters) const {
-    LOG_WARNING(Service_AM,
-                "(STUBBED) called, backend requested to show the inline software keyboard.");
-
-    LOG_INFO(Service_AM,
-             "\nInlineAppearParameters:"
-             "\nmax_text_length={}"
-             "\nmin_text_length={}"
-             "\nkey_top_scale_x={}"
-             "\nkey_top_scale_y={}"
-             "\nkey_top_translate_x={}"
-             "\nkey_top_translate_y={}"
-             "\ntype={}"
-             "\nkey_disable_flags={}"
-             "\nkey_top_as_floating={}"
-             "\nenable_backspace_button={}"
-             "\nenable_return_button={}"
-             "\ndisable_cancel_button={}",
-             appear_parameters.max_text_length, appear_parameters.min_text_length,
-             appear_parameters.key_top_scale_x, appear_parameters.key_top_scale_y,
-             appear_parameters.key_top_translate_x, appear_parameters.key_top_translate_y,
-             appear_parameters.type, appear_parameters.key_disable_flags.raw,
-             appear_parameters.key_top_as_floating, appear_parameters.enable_backspace_button,
-             appear_parameters.enable_return_button, appear_parameters.disable_cancel_button);
-
-    std::thread([this] { SubmitInlineText(u"yuzu"); }).detach();
-}
-
-void DefaultSoftwareKeyboardApplet::HideInlineKeyboard() const {
-    LOG_WARNING(Service_AM,
-                "(STUBBED) called, backend requested to hide the inline software keyboard.");
-}
-
-void DefaultSoftwareKeyboardApplet::InlineTextChanged(InlineTextParameters text_parameters) const {
-    LOG_WARNING(Service_AM,
-                "(STUBBED) called, backend requested to change the inline keyboard text.");
-
-    LOG_INFO(Service_AM,
-             "\nInlineTextParameters:"
-             "\ninput_text={}"
-             "\ncursor_position={}",
-             Common::UTF16ToUTF8(text_parameters.input_text), text_parameters.cursor_position);
-
-    submit_inline_callback(Service::AM::Applets::SwkbdReplyType::ChangedString,
-                           text_parameters.input_text, text_parameters.cursor_position);
-}
-
-void DefaultSoftwareKeyboardApplet::ExitKeyboard() const {
-    LOG_WARNING(Service_AM, "(STUBBED) called, backend requested to exit the software keyboard.");
-}
-
-void DefaultSoftwareKeyboardApplet::SubmitNormalText(std::u16string text) const {
-    submit_normal_callback(Service::AM::Applets::SwkbdResult::Ok, text);
-}
-
-void DefaultSoftwareKeyboardApplet::SubmitInlineText(std::u16string_view text) const {
-    std::this_thread::sleep_for(std::chrono::milliseconds(500));
-
-    for (std::size_t index = 0; index < text.size(); ++index) {
-        submit_inline_callback(Service::AM::Applets::SwkbdReplyType::ChangedString,
-                               std::u16string(text.data(), text.data() + index + 1),
-                               static_cast<s32>(index) + 1);
-
-        std::this_thread::sleep_for(std::chrono::milliseconds(250));
-    }
-
-    submit_inline_callback(Service::AM::Applets::SwkbdReplyType::DecidedEnter, std::u16string(text),
-                           static_cast<s32>(text.size()));
-}
-
 } // namespace Core::Frontend

src/core/frontend/applets/software_keyboard.h

@@ -1,116 +1,54 @@
-// Copyright 2021 yuzu Emulator Project
+// Copyright 2018 yuzu emulator team
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
 #pragma once
 
 #include <functional>
-#include <thread>
+#include <optional>
-
+#include <string>
+#include "common/bit_field.h"
 #include "common/common_types.h"
 
-#include "core/hle/service/am/applets/software_keyboard_types.h"
-
 namespace Core::Frontend {
-
+struct SoftwareKeyboardParameters {
-struct KeyboardInitializeParameters {
+    std::u16string submit_text;
-    std::u16string ok_text;
     std::u16string header_text;
     std::u16string sub_text;
     std::u16string guide_text;
     std::u16string initial_text;
-    u32 max_text_length;
+    std::size_t max_length;
-    u32 min_text_length;
+    bool password;
-    s32 initial_cursor_position;
+    bool cursor_at_beginning;
-    Service::AM::Applets::SwkbdType type;
-    Service::AM::Applets::SwkbdPasswordMode password_mode;
-    Service::AM::Applets::SwkbdTextDrawType text_draw_type;
-    Service::AM::Applets::SwkbdKeyDisableFlags key_disable_flags;
-    bool use_blur_background;
-    bool enable_backspace_button;
-    bool enable_return_button;
-    bool disable_cancel_button;
-};
 
-struct InlineAppearParameters {
+    union {
-    u32 max_text_length;
+        u8 value;
-    u32 min_text_length;
-    f32 key_top_scale_x;
-    f32 key_top_scale_y;
-    f32 key_top_translate_x;
-    f32 key_top_translate_y;
-    Service::AM::Applets::SwkbdType type;
-    Service::AM::Applets::SwkbdKeyDisableFlags key_disable_flags;
-    bool key_top_as_floating;
-    bool enable_backspace_button;
-    bool enable_return_button;
-    bool disable_cancel_button;
-};
 
-struct InlineTextParameters {
+        BitField<1, 1, u8> disable_space;
-    std::u16string input_text;
+        BitField<2, 1, u8> disable_address;
-    s32 cursor_position;
+        BitField<3, 1, u8> disable_percent;
+        BitField<4, 1, u8> disable_slash;
+        BitField<6, 1, u8> disable_number;
+        BitField<7, 1, u8> disable_download_code;
+    };
 };
 
 class SoftwareKeyboardApplet {
 public:
     virtual ~SoftwareKeyboardApplet();
 
-    virtual void InitializeKeyboard(
+    virtual void RequestText(std::function<void(std::optional<std::u16string>)> out,
-        bool is_inline, KeyboardInitializeParameters initialize_parameters,
+                             SoftwareKeyboardParameters parameters) const = 0;
-        std::function<void(Service::AM::Applets::SwkbdResult, std::u16string)>
+    virtual void SendTextCheckDialog(std::u16string error_message,
-            submit_normal_callback_,
+                                     std::function<void()> finished_check) const = 0;
-        std::function<void(Service::AM::Applets::SwkbdReplyType, std::u16string, s32)>
-            submit_inline_callback_) = 0;
-
-    virtual void ShowNormalKeyboard() const = 0;
-
-    virtual void ShowTextCheckDialog(Service::AM::Applets::SwkbdTextCheckResult text_check_result,
-                                     std::u16string text_check_message) const = 0;
-
-    virtual void ShowInlineKeyboard(InlineAppearParameters appear_parameters) const = 0;
-
-    virtual void HideInlineKeyboard() const = 0;
-
-    virtual void InlineTextChanged(InlineTextParameters text_parameters) const = 0;
-
-    virtual void ExitKeyboard() const = 0;
 };
 
 class DefaultSoftwareKeyboardApplet final : public SoftwareKeyboardApplet {
 public:
-    ~DefaultSoftwareKeyboardApplet() override;
+    void RequestText(std::function<void(std::optional<std::u16string>)> out,
-
+                     SoftwareKeyboardParameters parameters) const override;
-    void InitializeKeyboard(
+    void SendTextCheckDialog(std::u16string error_message,
-        bool is_inline, KeyboardInitializeParameters initialize_parameters,
+                             std::function<void()> finished_check) const override;
-        std::function<void(Service::AM::Applets::SwkbdResult, std::u16string)>
-            submit_normal_callback_,
-        std::function<void(Service::AM::Applets::SwkbdReplyType, std::u16string, s32)>
-            submit_inline_callback_) override;
-
-    void ShowNormalKeyboard() const override;
-
-    void ShowTextCheckDialog(Service::AM::Applets::SwkbdTextCheckResult text_check_result,
-                             std::u16string text_check_message) const override;
-
-    void ShowInlineKeyboard(InlineAppearParameters appear_parameters) const override;
-
-    void HideInlineKeyboard() const override;
-
-    void InlineTextChanged(InlineTextParameters text_parameters) const override;
-
-    void ExitKeyboard() const override;
-
-private:
-    void SubmitNormalText(std::u16string text) const;
-    void SubmitInlineText(std::u16string_view text) const;
-
-    KeyboardInitializeParameters parameters;
-
-    mutable std::function<void(Service::AM::Applets::SwkbdResult, std::u16string)>
-        submit_normal_callback;
-    mutable std::function<void(Service::AM::Applets::SwkbdReplyType, std::u16string, s32)>
-        submit_inline_callback;
 };
 
 } // namespace Core::Frontend

src/core/frontend/input_interpreter.cpp

@@ -12,9 +12,7 @@ InputInterpreter::InputInterpreter(Core::System& system)
     : npad{system.ServiceManager()
                .GetService<Service::HID::Hid>("hid")
                ->GetAppletResource()
-               ->GetController<Service::HID::Controller_NPad>(Service::HID::HidController::NPad)} {
+               ->GetController<Service::HID::Controller_NPad>(Service::HID::HidController::NPad)} {}
-    ResetButtonStates();
-}
 
 InputInterpreter::~InputInterpreter() = default;
 
@@ -27,17 +25,6 @@ void InputInterpreter::PollInput() {
     button_states[current_index] = button_state;
 }
 
-void InputInterpreter::ResetButtonStates() {
-    previous_index = 0;
-    current_index = 0;
-
-    button_states[0] = 0xFFFFFFFF;
-
-    for (std::size_t i = 1; i < button_states.size(); ++i) {
-        button_states[i] = 0;
-    }
-}
-
 bool InputInterpreter::IsButtonPressed(HIDButton button) const {
     return (button_states[current_index] & (1U << static_cast<u8>(button))) != 0;
 }

src/core/frontend/input_interpreter.h

@@ -66,9 +66,6 @@ public:
     /// Gets a button state from HID and inserts it into the array of button states.
     void PollInput();
 
-    /// Resets all the button states to their defaults.
-    void ResetButtonStates();
-
     /**
      * Checks whether the button is pressed.
      *

src/core/hle/kernel/hle_ipc.cpp

@@ -75,14 +75,10 @@ void HLERequestContext::ParseCommandBuffer(const HandleTable& handle_table, u32_
         if (incoming) {
             // Populate the object lists with the data in the IPC request.
             for (u32 handle = 0; handle < handle_descriptor_header->num_handles_to_copy; ++handle) {
-                const u32 copy_handle{rp.Pop<Handle>()};
+                copy_objects.push_back(handle_table.GetGeneric(rp.Pop<Handle>()));
-                copy_handles.push_back(copy_handle);
-                copy_objects.push_back(handle_table.GetGeneric(copy_handle));
             }
             for (u32 handle = 0; handle < handle_descriptor_header->num_handles_to_move; ++handle) {
-                const u32 move_handle{rp.Pop<Handle>()};
+                move_objects.push_back(handle_table.GetGeneric(rp.Pop<Handle>()));
-                move_handles.push_back(move_handle);
-                move_objects.push_back(handle_table.GetGeneric(move_handle));
             }
         } else {
             // For responses we just ignore the handles, they're empty and will be populated when

src/core/hle/kernel/hle_ipc.h

@@ -210,14 +210,6 @@ public:
     /// Helper function to test whether the output buffer at buffer_index can be written
     bool CanWriteBuffer(std::size_t buffer_index = 0) const;
 
-    Handle GetCopyHandle(std::size_t index) const {
-        return copy_handles.at(index);
-    }
-
-    Handle GetMoveHandle(std::size_t index) const {
-        return move_handles.at(index);
-    }
-
     template <typename T>
     std::shared_ptr<T> GetCopyObject(std::size_t index) {
         return DynamicObjectCast<T>(copy_objects.at(index));
@@ -293,8 +285,6 @@ private:
     std::shared_ptr<Kernel::ServerSession> server_session;
     std::shared_ptr<KThread> thread;
     // TODO(yuriks): Check common usage of this and optimize size accordingly
-    boost::container::small_vector<Handle, 8> move_handles;
-    boost::container::small_vector<Handle, 8> copy_handles;
     boost::container::small_vector<std::shared_ptr<Object>, 8> move_objects;
     boost::container::small_vector<std::shared_ptr<Object>, 8> copy_objects;
     boost::container::small_vector<std::shared_ptr<SessionRequestHandler>, 8> domain_objects;

src/core/hle/kernel/k_thread.h

@@ -402,7 +402,7 @@ public:
         return wait_cancelled;
     }
 
-    [[nodiscard]] void ClearWaitCancelled() {
+    void ClearWaitCancelled() {
         wait_cancelled = false;
     }
 

src/core/hle/kernel/kernel.cpp

@@ -67,13 +67,8 @@ struct KernelCore::Impl {
         is_phantom_mode_for_singlecore = false;
 
         InitializePhysicalCores();
-
+        InitializeSystemResourceLimit(kernel, system);
-        // Derive the initial memory layout from the emulated board
+        InitializeMemoryLayout();
-        KMemoryLayout memory_layout;
-        DeriveInitialMemoryLayout(memory_layout);
-        InitializeMemoryLayout(memory_layout);
-        InitializeSystemResourceLimit(kernel, system, memory_layout);
-        InitializeSlabHeaps();
         InitializeSchedulers();
         InitializeSuspendThreads();
         InitializePreemption(kernel);
@@ -142,32 +137,27 @@ struct KernelCore::Impl {
     }
 
     // Creates the default system resource limit
-    void InitializeSystemResourceLimit(KernelCore& kernel, Core::System& system,
+    void InitializeSystemResourceLimit(KernelCore& kernel, Core::System& system) {
-                                       const KMemoryLayout& memory_layout) {
         system_resource_limit = std::make_shared<KResourceLimit>(kernel, system);
-        const auto [total_size, kernel_size] = memory_layout.GetTotalAndKernelMemorySizes();
 
         // If setting the default system values fails, then something seriously wrong has occurred.
-        ASSERT(system_resource_limit->SetLimitValue(LimitableResource::PhysicalMemory, total_size)
+        ASSERT(system_resource_limit->SetLimitValue(LimitableResource::PhysicalMemory, 0x100000000)
                    .IsSuccess());
         ASSERT(system_resource_limit->SetLimitValue(LimitableResource::Threads, 800).IsSuccess());
         ASSERT(system_resource_limit->SetLimitValue(LimitableResource::Events, 900).IsSuccess());
         ASSERT(system_resource_limit->SetLimitValue(LimitableResource::TransferMemory, 200)
                    .IsSuccess());
         ASSERT(system_resource_limit->SetLimitValue(LimitableResource::Sessions, 1133).IsSuccess());
-        system_resource_limit->Reserve(LimitableResource::PhysicalMemory, kernel_size);
 
+        // Derived from recent software updates. The kernel reserves 27MB
+        constexpr u64 kernel_size{0x1b00000};
+        if (!system_resource_limit->Reserve(LimitableResource::PhysicalMemory, kernel_size)) {
+            UNREACHABLE();
+        }
         // Reserve secure applet memory, introduced in firmware 5.0.0
-        constexpr u64 secure_applet_memory_size{Common::Size_4_MB};
+        constexpr u64 secure_applet_memory_size{0x400000};
         ASSERT(system_resource_limit->Reserve(LimitableResource::PhysicalMemory,
                                               secure_applet_memory_size));
-
-        // This memory seems to be reserved on hardware, but is not reserved/used by yuzu.
-        // Likely Horizon OS reserved memory
-        // TODO(ameerj): Derive the memory rather than hardcode it.
-        constexpr u64 unknown_reserved_memory{0x2f896000};
-        ASSERT(system_resource_limit->Reserve(LimitableResource::PhysicalMemory,
-                                              unknown_reserved_memory));
     }
 
     void InitializePreemption(KernelCore& kernel) {
@@ -541,7 +531,11 @@ struct KernelCore::Impl {
                                                         linear_region_start);
     }
 
-    void InitializeMemoryLayout(const KMemoryLayout& memory_layout) {
+    void InitializeMemoryLayout() {
+        // Derive the initial memory layout from the emulated board
+        KMemoryLayout memory_layout;
+        DeriveInitialMemoryLayout(memory_layout);
+
         const auto system_pool = memory_layout.GetKernelSystemPoolRegionPhysicalExtents();
         const auto applet_pool = memory_layout.GetKernelAppletPoolRegionPhysicalExtents();
         const auto application_pool = memory_layout.GetKernelApplicationPoolRegionPhysicalExtents();
@@ -584,14 +578,11 @@ struct KernelCore::Impl {
             system.Kernel(), system.DeviceMemory(), nullptr, {time_phys_addr, time_size / PageSize},
             KMemoryPermission::None, KMemoryPermission::Read, time_phys_addr, time_size,
             "Time:SharedMemory");
-    }
 
-    void InitializeSlabHeaps() {
         // Allocate slab heaps
         user_slab_heap_pages = std::make_unique<KSlabHeap<Page>>();
 
-        // TODO(ameerj): This should be derived, not hardcoded within the kernel
+        constexpr u64 user_slab_heap_size{0x1ef000};
-        constexpr u64 user_slab_heap_size{0x3de000};
         // Reserve slab heaps
         ASSERT(
             system_resource_limit->Reserve(LimitableResource::PhysicalMemory, user_slab_heap_size));

src/core/hle/kernel/process.cpp

@@ -120,7 +120,9 @@ std::shared_ptr<Process> Process::Create(Core::System& system, std::string name,
     std::shared_ptr<Process> process = std::make_shared<Process>(system);
     process->name = std::move(name);
 
-    process->resource_limit = kernel.GetSystemResourceLimit();
+    // TODO: This is inaccurate
+    // The process should hold a reference to the kernel-wide resource limit.
+    process->resource_limit = std::make_shared<KResourceLimit>(kernel, system);
     process->status = ProcessStatus::Created;
     process->program_id = 0;
     process->process_id = type == ProcessType::KernelInternal ? kernel.CreateNewKernelProcessID()
@@ -158,6 +160,9 @@ void Process::DecrementThreadCount() {
 }
 
 u64 Process::GetTotalPhysicalMemoryAvailable() const {
+    // TODO: This is expected to always return the application memory pool size after accurately
+    // reserving kernel resources. The current workaround uses a process-local resource limit of
+    // application memory pool size, which is inaccurate.
     const u64 capacity{resource_limit->GetFreeValue(LimitableResource::PhysicalMemory) +
                        page_table->GetTotalHeapSize() + GetSystemResourceSize() + image_size +
                        main_thread_stack_size};
@@ -165,6 +170,7 @@ u64 Process::GetTotalPhysicalMemoryAvailable() const {
     if (capacity < memory_usage_capacity) {
         return capacity;
     }
+
     return memory_usage_capacity;
 }
 
@@ -266,6 +272,10 @@ ResultCode Process::LoadFromMetadata(const FileSys::ProgramMetadata& metadata,
     system_resource_size = metadata.GetSystemResourceSize();
     image_size = code_size;
 
+    // Set initial resource limits
+    resource_limit->SetLimitValue(
+        LimitableResource::PhysicalMemory,
+        kernel.MemoryManager().GetSize(KMemoryManager::Pool::Application));
     KScopedResourceReservation memory_reservation(resource_limit, LimitableResource::PhysicalMemory,
                                                   code_size + system_resource_size);
     if (!memory_reservation.Succeeded()) {
@@ -314,6 +324,16 @@ ResultCode Process::LoadFromMetadata(const FileSys::ProgramMetadata& metadata,
         UNREACHABLE();
     }
 
+    // Set initial resource limits
+    resource_limit->SetLimitValue(
+        LimitableResource::PhysicalMemory,
+        kernel.MemoryManager().GetSize(KMemoryManager::Pool::Application));
+
+    resource_limit->SetLimitValue(LimitableResource::Threads, 608);
+    resource_limit->SetLimitValue(LimitableResource::Events, 700);
+    resource_limit->SetLimitValue(LimitableResource::TransferMemory, 128);
+    resource_limit->SetLimitValue(LimitableResource::Sessions, 894);
+
     // Create TLS region
     tls_region_address = CreateTLSRegion();
     memory_reservation.Commit();

src/core/hle/service/am/am.cpp

@@ -971,7 +971,7 @@ private:
 
         auto storage = applet->GetBroker().PopNormalDataToGame();
         if (storage == nullptr) {
-            LOG_DEBUG(Service_AM,
+            LOG_ERROR(Service_AM,
                       "storage is a nullptr. There is no data in the current normal channel");
             IPC::ResponseBuilder rb{ctx, 2};
             rb.Push(ERR_NO_DATA_IN_CHANNEL);
@@ -1002,7 +1002,7 @@ private:
 
         auto storage = applet->GetBroker().PopInteractiveDataToGame();
         if (storage == nullptr) {
-            LOG_DEBUG(Service_AM,
+            LOG_ERROR(Service_AM,
                       "storage is a nullptr. There is no data in the current interactive channel");
             IPC::ResponseBuilder rb{ctx, 2};
             rb.Push(ERR_NO_DATA_IN_CHANNEL);
@@ -1125,7 +1125,7 @@ ILibraryAppletCreator::ILibraryAppletCreator(Core::System& system_)
         {2, nullptr, "AreAnyLibraryAppletsLeft"},
         {10, &ILibraryAppletCreator::CreateStorage, "CreateStorage"},
         {11, &ILibraryAppletCreator::CreateTransferMemoryStorage, "CreateTransferMemoryStorage"},
-        {12, &ILibraryAppletCreator::CreateHandleStorage, "CreateHandleStorage"},
+        {12, nullptr, "CreateHandleStorage"},
     };
     RegisterHandlers(functions);
 }
@@ -1134,15 +1134,14 @@ ILibraryAppletCreator::~ILibraryAppletCreator() = default;
 
 void ILibraryAppletCreator::CreateLibraryApplet(Kernel::HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
-
     const auto applet_id = rp.PopRaw<Applets::AppletId>();
-    const auto applet_mode = rp.PopRaw<Applets::LibraryAppletMode>();
+    const auto applet_mode = rp.PopRaw<u32>();
 
     LOG_DEBUG(Service_AM, "called with applet_id={:08X}, applet_mode={:08X}", applet_id,
               applet_mode);
 
     const auto& applet_manager{system.GetAppletManager()};
-    const auto applet = applet_manager.GetApplet(applet_id, applet_mode);
+    const auto applet = applet_manager.GetApplet(applet_id);
 
     if (applet == nullptr) {
         LOG_ERROR(Service_AM, "Applet doesn't exist! applet_id={}", applet_id);
@@ -1160,18 +1159,9 @@ void ILibraryAppletCreator::CreateLibraryApplet(Kernel::HLERequestContext& ctx)
 
 void ILibraryAppletCreator::CreateStorage(Kernel::HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
-
+    const u64 size{rp.Pop<u64>()};
-    const s64 size{rp.Pop<s64>()};
-
     LOG_DEBUG(Service_AM, "called, size={}", size);
 
-    if (size <= 0) {
-        LOG_ERROR(Service_AM, "size is less than or equal to 0");
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(RESULT_UNKNOWN);
-        return;
-    }
-
     std::vector<u8> buffer(size);
 
     IPC::ResponseBuilder rb{ctx, 2, 0, 1};
@@ -1180,65 +1170,18 @@ void ILibraryAppletCreator::CreateStorage(Kernel::HLERequestContext& ctx) {
 }
 
 void ILibraryAppletCreator::CreateTransferMemoryStorage(Kernel::HLERequestContext& ctx) {
+    LOG_DEBUG(Service_AM, "called");
+
     IPC::RequestParser rp{ctx};
 
-    struct Parameters {
+    rp.SetCurrentOffset(3);
-        u8 permissions;
+    const auto handle{rp.Pop<Kernel::Handle>()};
-        s64 size;
-    };
-
-    const auto parameters{rp.PopRaw<Parameters>()};
-    const auto handle{ctx.GetCopyHandle(0)};
-
-    LOG_DEBUG(Service_AM, "called, permissions={}, size={}, handle={:08X}", parameters.permissions,
-              parameters.size, handle);
-
-    if (parameters.size <= 0) {
-        LOG_ERROR(Service_AM, "size is less than or equal to 0");
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(RESULT_UNKNOWN);
-        return;
-    }
 
     auto transfer_mem =
         system.CurrentProcess()->GetHandleTable().Get<Kernel::TransferMemory>(handle);
 
     if (transfer_mem == nullptr) {
-        LOG_ERROR(Service_AM, "transfer_mem is a nullptr for handle={:08X}", handle);
+        LOG_ERROR(Service_AM, "shared_mem is a nullpr for handle={:08X}", handle);
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(RESULT_UNKNOWN);
-        return;
-    }
-
-    const u8* const mem_begin = transfer_mem->GetPointer();
-    const u8* const mem_end = mem_begin + transfer_mem->GetSize();
-    std::vector<u8> memory{mem_begin, mem_end};
-
-    IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-    rb.Push(RESULT_SUCCESS);
-    rb.PushIpcInterface<IStorage>(system, std::move(memory));
-}
-
-void ILibraryAppletCreator::CreateHandleStorage(Kernel::HLERequestContext& ctx) {
-    IPC::RequestParser rp{ctx};
-
-    const s64 size{rp.Pop<s64>()};
-    const auto handle{ctx.GetCopyHandle(0)};
-
-    LOG_DEBUG(Service_AM, "called, size={}, handle={:08X}", size, handle);
-
-    if (size <= 0) {
-        LOG_ERROR(Service_AM, "size is less than or equal to 0");
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(RESULT_UNKNOWN);
-        return;
-    }
-
-    auto transfer_mem =
-        system.CurrentProcess()->GetHandleTable().Get<Kernel::TransferMemory>(handle);
-
-    if (transfer_mem == nullptr) {
-        LOG_ERROR(Service_AM, "transfer_mem is a nullptr for handle={:08X}", handle);
         IPC::ResponseBuilder rb{ctx, 2};
         rb.Push(RESULT_UNKNOWN);
         return;

src/core/hle/service/am/am.h

@@ -254,7 +254,6 @@ private:
     void CreateLibraryApplet(Kernel::HLERequestContext& ctx);
     void CreateStorage(Kernel::HLERequestContext& ctx);
     void CreateTransferMemoryStorage(Kernel::HLERequestContext& ctx);
-    void CreateHandleStorage(Kernel::HLERequestContext& ctx);
 };
 
 class IApplicationFunctions final : public ServiceFramework<IApplicationFunctions> {

src/core/hle/service/am/applets/applets.cpp

@@ -241,31 +241,31 @@ void AppletManager::ClearAll() {
     frontend = {};
 }
 
-std::shared_ptr<Applet> AppletManager::GetApplet(AppletId id, LibraryAppletMode mode) const {
+std::shared_ptr<Applet> AppletManager::GetApplet(AppletId id) const {
     switch (id) {
     case AppletId::Auth:
-        return std::make_shared<Auth>(system, mode, *frontend.parental_controls);
+        return std::make_shared<Auth>(system, *frontend.parental_controls);
     case AppletId::Controller:
-        return std::make_shared<Controller>(system, mode, *frontend.controller);
+        return std::make_shared<Controller>(system, *frontend.controller);
     case AppletId::Error:
-        return std::make_shared<Error>(system, mode, *frontend.error);
+        return std::make_shared<Error>(system, *frontend.error);
     case AppletId::ProfileSelect:
-        return std::make_shared<ProfileSelect>(system, mode, *frontend.profile_select);
+        return std::make_shared<ProfileSelect>(system, *frontend.profile_select);
     case AppletId::SoftwareKeyboard:
-        return std::make_shared<SoftwareKeyboard>(system, mode, *frontend.software_keyboard);
+        return std::make_shared<SoftwareKeyboard>(system, *frontend.software_keyboard);
     case AppletId::Web:
     case AppletId::Shop:
     case AppletId::OfflineWeb:
     case AppletId::LoginShare:
     case AppletId::WebAuth:
-        return std::make_shared<WebBrowser>(system, mode, *frontend.web_browser);
+        return std::make_shared<WebBrowser>(system, *frontend.web_browser);
     case AppletId::PhotoViewer:
-        return std::make_shared<PhotoViewer>(system, mode, *frontend.photo_viewer);
+        return std::make_shared<PhotoViewer>(system, *frontend.photo_viewer);
     default:
         UNIMPLEMENTED_MSG(
             "No backend implementation exists for applet_id={:02X}! Falling back to stub applet.",
             static_cast<u8>(id));
-        return std::make_shared<StubApplet>(system, id, mode);
+        return std::make_shared<StubApplet>(system, id);
     }
 }
 

src/core/hle/service/am/applets/applets.h

@@ -62,14 +62,6 @@ enum class AppletId : u32 {
     MyPage = 0x1A,
 };
 
-enum class LibraryAppletMode : u32 {
-    AllForeground = 0,
-    Background = 1,
-    NoUI = 2,
-    BackgroundIndirectDisplay = 3,
-    AllForegroundInitiallyHidden = 4,
-};
-
 class AppletDataBroker final {
 public:
     explicit AppletDataBroker(Kernel::KernelCore& kernel_);
@@ -208,7 +200,7 @@ public:
     void SetDefaultAppletsIfMissing();
     void ClearAll();
 
-    std::shared_ptr<Applet> GetApplet(AppletId id, LibraryAppletMode mode) const;
+    std::shared_ptr<Applet> GetApplet(AppletId id) const;
 
 private:
     AppletFrontendSet frontend;

src/core/hle/service/am/applets/controller.cpp

@@ -45,9 +45,8 @@ static Core::Frontend::ControllerParameters ConvertToFrontendParameters(
     };
 }
 
-Controller::Controller(Core::System& system_, LibraryAppletMode applet_mode_,
+Controller::Controller(Core::System& system_, const Core::Frontend::ControllerApplet& frontend_)
-                       const Core::Frontend::ControllerApplet& frontend_)
+    : Applet{system_.Kernel()}, frontend{frontend_}, system{system_} {}
-    : Applet{system_.Kernel()}, applet_mode{applet_mode_}, frontend{frontend_}, system{system_} {}
 
 Controller::~Controller() = default;
 

src/core/hle/service/am/applets/controller.h

@@ -106,8 +106,7 @@ static_assert(sizeof(ControllerSupportResultInfo) == 0xC,
 
 class Controller final : public Applet {
 public:
-    explicit Controller(Core::System& system_, LibraryAppletMode applet_mode_,
+    explicit Controller(Core::System& system_, const Core::Frontend::ControllerApplet& frontend_);
-                        const Core::Frontend::ControllerApplet& frontend_);
     ~Controller() override;
 
     void Initialize() override;
@@ -120,7 +119,6 @@ public:
     void ConfigurationComplete();
 
 private:
-    LibraryAppletMode applet_mode;
     const Core::Frontend::ControllerApplet& frontend;
     Core::System& system;
 

src/core/hle/service/am/applets/error.cpp

@@ -86,9 +86,8 @@ ResultCode Decode64BitError(u64 error) {
 
 } // Anonymous namespace
 
-Error::Error(Core::System& system_, LibraryAppletMode applet_mode_,
+Error::Error(Core::System& system_, const Core::Frontend::ErrorApplet& frontend_)
-             const Core::Frontend::ErrorApplet& frontend_)
+    : Applet{system_.Kernel()}, frontend{frontend_}, system{system_} {}
-    : Applet{system_.Kernel()}, applet_mode{applet_mode_}, frontend{frontend_}, system{system_} {}
 
 Error::~Error() = default;
 

src/core/hle/service/am/applets/error.h

@@ -25,8 +25,7 @@ enum class ErrorAppletMode : u8 {
 
 class Error final : public Applet {
 public:
-    explicit Error(Core::System& system_, LibraryAppletMode applet_mode_,
+    explicit Error(Core::System& system_, const Core::Frontend::ErrorApplet& frontend_);
-                   const Core::Frontend::ErrorApplet& frontend_);
     ~Error() override;
 
     void Initialize() override;
@@ -41,7 +40,6 @@ public:
 private:
     union ErrorArguments;
 
-    LibraryAppletMode applet_mode;
     const Core::Frontend::ErrorApplet& frontend;
     ResultCode error_code = RESULT_SUCCESS;
     ErrorAppletMode mode = ErrorAppletMode::ShowError;

src/core/hle/service/am/applets/general_backend.cpp

@@ -37,9 +37,8 @@ static void LogCurrentStorage(AppletDataBroker& broker, std::string_view prefix)
     }
 }
 
-Auth::Auth(Core::System& system_, LibraryAppletMode applet_mode_,
+Auth::Auth(Core::System& system_, Core::Frontend::ParentalControlsApplet& frontend_)
-           Core::Frontend::ParentalControlsApplet& frontend_)
+    : Applet{system_.Kernel()}, frontend{frontend_}, system{system_} {}
-    : Applet{system_.Kernel()}, applet_mode{applet_mode_}, frontend{frontend_}, system{system_} {}
 
 Auth::~Auth() = default;
 
@@ -153,9 +152,8 @@ void Auth::AuthFinished(bool is_successful) {
     broker.SignalStateChanged();
 }
 
-PhotoViewer::PhotoViewer(Core::System& system_, LibraryAppletMode applet_mode_,
+PhotoViewer::PhotoViewer(Core::System& system_, const Core::Frontend::PhotoViewerApplet& frontend_)
-                         const Core::Frontend::PhotoViewerApplet& frontend_)
+    : Applet{system_.Kernel()}, frontend{frontend_}, system{system_} {}
-    : Applet{system_.Kernel()}, applet_mode{applet_mode_}, frontend{frontend_}, system{system_} {}
 
 PhotoViewer::~PhotoViewer() = default;
 
@@ -204,8 +202,8 @@ void PhotoViewer::ViewFinished() {
     broker.SignalStateChanged();
 }
 
-StubApplet::StubApplet(Core::System& system_, AppletId id_, LibraryAppletMode applet_mode_)
+StubApplet::StubApplet(Core::System& system_, AppletId id_)
-    : Applet{system_.Kernel()}, id{id_}, applet_mode{applet_mode_}, system{system_} {}
+    : Applet{system_.Kernel()}, id{id_}, system{system_} {}
 
 StubApplet::~StubApplet() = default;
 

src/core/hle/service/am/applets/general_backend.h

@@ -20,8 +20,7 @@ enum class AuthAppletType : u32 {
 
 class Auth final : public Applet {
 public:
-    explicit Auth(Core::System& system_, LibraryAppletMode applet_mode_,
+    explicit Auth(Core::System& system_, Core::Frontend::ParentalControlsApplet& frontend_);
-                  Core::Frontend::ParentalControlsApplet& frontend_);
     ~Auth() override;
 
     void Initialize() override;
@@ -33,7 +32,6 @@ public:
     void AuthFinished(bool is_successful = true);
 
 private:
-    LibraryAppletMode applet_mode;
     Core::Frontend::ParentalControlsApplet& frontend;
     Core::System& system;
     bool complete = false;
@@ -52,8 +50,7 @@ enum class PhotoViewerAppletMode : u8 {
 
 class PhotoViewer final : public Applet {
 public:
-    explicit PhotoViewer(Core::System& system_, LibraryAppletMode applet_mode_,
+    explicit PhotoViewer(Core::System& system_, const Core::Frontend::PhotoViewerApplet& frontend_);
-                         const Core::Frontend::PhotoViewerApplet& frontend_);
     ~PhotoViewer() override;
 
     void Initialize() override;
@@ -65,7 +62,6 @@ public:
     void ViewFinished();
 
 private:
-    LibraryAppletMode applet_mode;
     const Core::Frontend::PhotoViewerApplet& frontend;
     bool complete = false;
     PhotoViewerAppletMode mode = PhotoViewerAppletMode::CurrentApp;
@@ -74,7 +70,7 @@ private:
 
 class StubApplet final : public Applet {
 public:
-    explicit StubApplet(Core::System& system_, AppletId id_, LibraryAppletMode applet_mode_);
+    explicit StubApplet(Core::System& system_, AppletId id_);
     ~StubApplet() override;
 
     void Initialize() override;
@@ -86,7 +82,6 @@ public:
 
 private:
     AppletId id;
-    LibraryAppletMode applet_mode;
     Core::System& system;
 };
 

src/core/hle/service/am/applets/profile_select.cpp

@@ -15,9 +15,9 @@ namespace Service::AM::Applets {
 
 constexpr ResultCode ERR_USER_CANCELLED_SELECTION{ErrorModule::Account, 1};
 
-ProfileSelect::ProfileSelect(Core::System& system_, LibraryAppletMode applet_mode_,
+ProfileSelect::ProfileSelect(Core::System& system_,
                              const Core::Frontend::ProfileSelectApplet& frontend_)
-    : Applet{system_.Kernel()}, applet_mode{applet_mode_}, frontend{frontend_}, system{system_} {}
+    : Applet{system_.Kernel()}, frontend{frontend_}, system{system_} {}
 
 ProfileSelect::~ProfileSelect() = default;
 

src/core/hle/service/am/applets/profile_select.h

@@ -33,7 +33,7 @@ static_assert(sizeof(UserSelectionOutput) == 0x18, "UserSelectionOutput has inco
 
 class ProfileSelect final : public Applet {
 public:
-    explicit ProfileSelect(Core::System& system_, LibraryAppletMode applet_mode_,
+    explicit ProfileSelect(Core::System& system_,
                            const Core::Frontend::ProfileSelectApplet& frontend_);
     ~ProfileSelect() override;
 
@@ -47,7 +47,6 @@ public:
     void SelectionComplete(std::optional<Common::UUID> uuid);
 
 private:
-    LibraryAppletMode applet_mode;
     const Core::Frontend::ProfileSelectApplet& frontend;
 
     UserSelectionConfig config;

src/core/hle/service/am/applets/software_keyboard.h

@@ -1,14 +1,20 @@
-// Copyright 2021 yuzu Emulator Project
+// Copyright 2018 yuzu emulator team
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
 #pragma once
 
+#include <array>
+#include <string>
+#include <vector>
+
 #include "common/common_funcs.h"
 #include "common/common_types.h"
-#include "core/hle/result.h"
+#include "common/swap.h"
+#include "core/hle/service/am/am.h"
 #include "core/hle/service/am/applets/applets.h"
-#include "core/hle/service/am/applets/software_keyboard_types.h"
+
+union ResultCode;
 
 namespace Core {
 class System;
@@ -16,10 +22,45 @@ class System;
 
 namespace Service::AM::Applets {
 
+enum class KeysetDisable : u32 {
+    Space = 0x02,
+    Address = 0x04,
+    Percent = 0x08,
+    Slashes = 0x10,
+    Numbers = 0x40,
+    DownloadCode = 0x80,
+};
+
+struct KeyboardConfig {
+    INSERT_PADDING_BYTES(4);
+    std::array<char16_t, 9> submit_text;
+    u16_le left_symbol_key;
+    u16_le right_symbol_key;
+    INSERT_PADDING_BYTES(1);
+    KeysetDisable keyset_disable_bitmask;
+    u32_le initial_cursor_position;
+    std::array<char16_t, 65> header_text;
+    std::array<char16_t, 129> sub_text;
+    std::array<char16_t, 257> guide_text;
+    u32_le length_limit;
+    INSERT_PADDING_BYTES(4);
+    u32_le is_password;
+    INSERT_PADDING_BYTES(5);
+    bool utf_8;
+    bool draw_background;
+    u32_le initial_string_offset;
+    u32_le initial_string_size;
+    u32_le user_dictionary_offset;
+    u32_le user_dictionary_size;
+    bool text_check;
+    u64_le text_check_callback;
+};
+static_assert(sizeof(KeyboardConfig) == 0x3E0, "KeyboardConfig has incorrect size.");
+
 class SoftwareKeyboard final : public Applet {
 public:
-    explicit SoftwareKeyboard(Core::System& system_, LibraryAppletMode applet_mode_,
+    explicit SoftwareKeyboard(Core::System& system_,
-                              Core::Frontend::SoftwareKeyboardApplet& frontend_);
+                              const Core::Frontend::SoftwareKeyboardApplet& frontend_);
     ~SoftwareKeyboard() override;
 
     void Initialize() override;
@@ -29,139 +70,17 @@ public:
     void ExecuteInteractive() override;
     void Execute() override;
 
-    /**
+    void WriteText(std::optional<std::u16string> text);
-     * Submits the input text to the application.
-     * If text checking is enabled, the application will verify the input text.
-     * If use_utf8 is enabled, the input text will be converted to UTF-8 prior to being submitted.
-     * This should only be used by the normal software keyboard.
-     *
-     * @param result SwkbdResult enum
-     * @param submitted_text UTF-16 encoded string
-     */
-    void SubmitTextNormal(SwkbdResult result, std::u16string submitted_text);
-
-    /**
-     * Submits the input text to the application.
-     * If utf8_mode is enabled, the input text will be converted to UTF-8 prior to being submitted.
-     * This should only be used by the inline software keyboard.
-     *
-     * @param reply_type SwkbdReplyType enum
-     * @param submitted_text UTF-16 encoded string
-     * @param cursor_position The current position of the text cursor
-     */
-    void SubmitTextInline(SwkbdReplyType reply_type, std::u16string submitted_text,
-                          s32 cursor_position);
 
 private:
-    /// Initializes the normal software keyboard.
+    const Core::Frontend::SoftwareKeyboardApplet& frontend;
-    void InitializeForeground();
 
-    /// Initializes the inline software keyboard.
+    KeyboardConfig config;
-    void InitializeBackground(LibraryAppletMode applet_mode);
-
-    /// Processes the text check sent by the application.
-    void ProcessTextCheck();
-
-    /// Processes the inline software keyboard request command sent by the application.
-    void ProcessInlineKeyboardRequest();
-
-    /// Submits the input text and exits the applet.
-    void SubmitNormalOutputAndExit(SwkbdResult result, std::u16string submitted_text);
-
-    /// Submits the input text for text checking.
-    void SubmitForTextCheck(std::u16string submitted_text);
-
-    /// Sends a reply to the application after processing a request command.
-    void SendReply(SwkbdReplyType reply_type);
-
-    /// Changes the inline keyboard state.
-    void ChangeState(SwkbdState state);
-
-    /**
-     * Signals the frontend to initialize the software keyboard with common parameters.
-     * This initializes either the normal software keyboard or the inline software keyboard
-     * depending on the state of is_background.
-     * Note that this does not cause the keyboard to appear.
-     * Use the respective Show*Keyboard() functions to cause the respective keyboards to appear.
-     */
-    void InitializeFrontendKeyboard();
-
-    /// Signals the frontend to show the normal software keyboard.
-    void ShowNormalKeyboard();
-
-    /// Signals the frontend to show the text check dialog.
-    void ShowTextCheckDialog(SwkbdTextCheckResult text_check_result,
-                             std::u16string text_check_message);
-
-    /// Signals the frontend to show the inline software keyboard.
-    void ShowInlineKeyboard();
-
-    /// Signals the frontend to hide the inline software keyboard.
-    void HideInlineKeyboard();
-
-    /// Signals the frontend that the current inline keyboard text has changed.
-    void InlineTextChanged();
-
-    /// Signals both the frontend and application that the software keyboard is exiting.
-    void ExitKeyboard();
-
-    // Inline Software Keyboard Requests
-
-    void RequestFinalize(const std::vector<u8>& request_data);
-    void RequestSetUserWordInfo(const std::vector<u8>& request_data);
-    void RequestSetCustomizeDic(const std::vector<u8>& request_data);
-    void RequestCalc(const std::vector<u8>& request_data);
-    void RequestSetCustomizedDictionaries(const std::vector<u8>& request_data);
-    void RequestUnsetCustomizedDictionaries(const std::vector<u8>& request_data);
-    void RequestSetChangedStringV2Flag(const std::vector<u8>& request_data);
-    void RequestSetMovedCursorV2Flag(const std::vector<u8>& request_data);
-
-    // Inline Software Keyboard Replies
-
-    void ReplyFinishedInitialize();
-    void ReplyDefault();
-    void ReplyChangedString();
-    void ReplyMovedCursor();
-    void ReplyMovedTab();
-    void ReplyDecidedEnter();
-    void ReplyDecidedCancel();
-    void ReplyChangedStringUtf8();
-    void ReplyMovedCursorUtf8();
-    void ReplyDecidedEnterUtf8();
-    void ReplyUnsetCustomizeDic();
-    void ReplyReleasedUserWordInfo();
-    void ReplyUnsetCustomizedDictionaries();
-    void ReplyChangedStringV2();
-    void ReplyMovedCursorV2();
-    void ReplyChangedStringUtf8V2();
-    void ReplyMovedCursorUtf8V2();
-
-    LibraryAppletMode applet_mode;
-    Core::Frontend::SoftwareKeyboardApplet& frontend;
-    Core::System& system;
-
-    SwkbdAppletVersion swkbd_applet_version;
-
-    SwkbdConfigCommon swkbd_config_common;
-    SwkbdConfigOld swkbd_config_old;
-    SwkbdConfigOld2 swkbd_config_old2;
-    SwkbdConfigNew swkbd_config_new;
     std::u16string initial_text;
-
+    bool complete = false;
-    SwkbdState swkbd_state{SwkbdState::NotInitialized};
+    bool is_inline = false;
-    SwkbdInitializeArg swkbd_initialize_arg;
+    std::vector<u8> final_data;
-    SwkbdCalcArg swkbd_calc_arg;
+    Core::System& system;
-    bool use_changed_string_v2{false};
-    bool use_moved_cursor_v2{false};
-    bool inline_use_utf8{false};
-    s32 current_cursor_position{};
-
-    std::u16string current_text;
-
-    bool is_background{false};
-
-    bool complete{false};
-    ResultCode status{RESULT_SUCCESS};
 };
 
 } // namespace Service::AM::Applets

src/core/hle/service/am/applets/web_browser.cpp

@@ -208,9 +208,8 @@ void ExtractSharedFonts(Core::System& system) {
 
 } // namespace
 
-WebBrowser::WebBrowser(Core::System& system_, LibraryAppletMode applet_mode_,
+WebBrowser::WebBrowser(Core::System& system_, const Core::Frontend::WebBrowserApplet& frontend_)
-                       const Core::Frontend::WebBrowserApplet& frontend_)
+    : Applet{system_.Kernel()}, frontend(frontend_), system{system_} {}
-    : Applet{system_.Kernel()}, applet_mode{applet_mode_}, frontend(frontend_), system{system_} {}
 
 WebBrowser::~WebBrowser() = default;
 

src/core/hle/service/am/applets/web_browser.h

@@ -25,8 +25,7 @@ namespace Service::AM::Applets {
 
 class WebBrowser final : public Applet {
 public:
-    WebBrowser(Core::System& system_, LibraryAppletMode applet_mode_,
+    WebBrowser(Core::System& system_, const Core::Frontend::WebBrowserApplet& frontend_);
-               const Core::Frontend::WebBrowserApplet& frontend_);
 
     ~WebBrowser() override;
 
@@ -64,7 +63,6 @@ private:
     void ExecuteWifi();
     void ExecuteLobby();
 
-    LibraryAppletMode applet_mode;
     const Core::Frontend::WebBrowserApplet& frontend;
 
     bool complete{false};

src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp

@@ -36,7 +36,6 @@ NvResult nvhost_nvdec::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>&
                 LOG_INFO(Service_NVDRV, "NVDEC video stream ended");
                 Tegra::ChCommandHeaderList cmdlist{{0xDEADB33F}};
                 system.GPU().PushCommandBuffer(cmdlist);
-                system.GPU().MemoryManager().InvalidateQueuedCaches();
             }
             return UnmapBuffer(input, output);
         }

src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp

@@ -198,13 +198,7 @@ NvResult nvhost_nvdec_common::UnmapBuffer(const std::vector<u8>& input, std::vec
             return NvResult::InvalidState;
         }
         if (const auto size{RemoveBufferMap(object->dma_map_addr)}; size) {
-            if (vic_device) {
+            gpu.MemoryManager().Unmap(object->dma_map_addr, *size);
-                // UnmapVicFrame defers texture_cache invalidation of the frame address until
-                // the stream is over
-                gpu.MemoryManager().UnmapVicFrame(object->dma_map_addr, *size);
-            } else {
-                gpu.MemoryManager().Unmap(object->dma_map_addr, *size);
-            }
         } else {
             // This occurs quite frequently, however does not seem to impact functionality
             LOG_DEBUG(Service_NVDRV, "invalid offset=0x{:X} dma=0x{:X}", object->addr,

src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h

@@ -160,7 +160,6 @@ protected:
 
     s32_le nvmap_fd{};
     u32_le submit_timeout{};
-    bool vic_device{};
     std::shared_ptr<nvmap> nvmap_dev;
     SyncpointManager& syncpoint_manager;
     std::array<u32, MaxSyncPoints> device_syncpoints{};

src/core/hle/service/nvdrv/devices/nvhost_vic.cpp

@@ -12,9 +12,8 @@
 namespace Service::Nvidia::Devices {
 nvhost_vic::nvhost_vic(Core::System& system, std::shared_ptr<nvmap> nvmap_dev,
                        SyncpointManager& syncpoint_manager)
-    : nvhost_nvdec_common(system, std::move(nvmap_dev), syncpoint_manager) {
+    : nvhost_nvdec_common(system, std::move(nvmap_dev), syncpoint_manager) {}
-    vic_device = true;
+
-}
 nvhost_vic::~nvhost_vic() = default;
 
 NvResult nvhost_vic::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& input,

src/input_common/sdl/sdl_impl.cpp

@@ -761,7 +761,7 @@ std::vector<Common::ParamPackage> SDLState::GetInputDevices() {
         for (const auto& joystick : value) {
             if (auto* const controller = joystick->GetSDLGameController()) {
                 std::string name =
-                    fmt::format("{} {}", GetControllerName(controller), joystick->GetPort());
+                    fmt::format("{} {}", SDL_GameControllerName(controller), joystick->GetPort());
                 devices.emplace_back(Common::ParamPackage{
                     {"class", "sdl"},
                     {"display", std::move(name)},
@@ -782,17 +782,6 @@ std::vector<Common::ParamPackage> SDLState::GetInputDevices() {
     return devices;
 }
 
-std::string SDLState::GetControllerName(SDL_GameController* controller) const {
-    switch (SDL_GameControllerGetType(controller)) {
-    case SDL_CONTROLLER_TYPE_XBOX360:
-        return "XBox 360 Controller";
-    case SDL_CONTROLLER_TYPE_XBOXONE:
-        return "XBox One Controller";
-    default:
-        return SDL_GameControllerName(controller);
-    }
-}
-
 namespace {
 Common::ParamPackage BuildAnalogParamPackageForButton(int port, std::string guid, s32 axis,
                                                       float value = 0.1f) {
@@ -941,19 +930,16 @@ ButtonMapping SDLState::GetButtonMappingForDevice(const Common::ParamPackage& pa
         return {};
     }
 
-    const bool invert =
-        SDL_GameControllerGetType(controller) != SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO;
-
     // This list is missing ZL/ZR since those are not considered buttons in SDL GameController.
     // We will add those afterwards
     // This list also excludes Screenshot since theres not really a mapping for that
     using ButtonBindings =
         std::array<std::pair<Settings::NativeButton::Values, SDL_GameControllerButton>, 17>;
-    const ButtonBindings switch_to_sdl_button{{
+    static constexpr ButtonBindings switch_to_sdl_button{{
-        {Settings::NativeButton::A, invert ? SDL_CONTROLLER_BUTTON_B : SDL_CONTROLLER_BUTTON_A},
+        {Settings::NativeButton::A, SDL_CONTROLLER_BUTTON_B},
-        {Settings::NativeButton::B, invert ? SDL_CONTROLLER_BUTTON_A : SDL_CONTROLLER_BUTTON_B},
+        {Settings::NativeButton::B, SDL_CONTROLLER_BUTTON_A},
-        {Settings::NativeButton::X, invert ? SDL_CONTROLLER_BUTTON_Y : SDL_CONTROLLER_BUTTON_X},
+        {Settings::NativeButton::X, SDL_CONTROLLER_BUTTON_Y},
-        {Settings::NativeButton::Y, invert ? SDL_CONTROLLER_BUTTON_X : SDL_CONTROLLER_BUTTON_Y},
+        {Settings::NativeButton::Y, SDL_CONTROLLER_BUTTON_X},
         {Settings::NativeButton::LStick, SDL_CONTROLLER_BUTTON_LEFTSTICK},
         {Settings::NativeButton::RStick, SDL_CONTROLLER_BUTTON_RIGHTSTICK},
         {Settings::NativeButton::L, SDL_CONTROLLER_BUTTON_LEFTSHOULDER},

src/input_common/sdl/sdl_impl.h

@@ -14,7 +14,6 @@
 #include "input_common/sdl/sdl.h"
 
 union SDL_Event;
-using SDL_GameController = struct _SDL_GameController;
 using SDL_Joystick = struct _SDL_Joystick;
 using SDL_JoystickID = s32;
 
@@ -65,9 +64,6 @@ private:
     /// Needs to be called before SDL_QuitSubSystem.
     void CloseJoysticks();
 
-    /// Returns a custom name for specific controllers because the default name is not correct
-    std::string GetControllerName(SDL_GameController* controller) const;
-
     // Set to true if SDL supports game controller subsystem
     bool has_gamecontroller = false;
 

src/video_core/engines/shader_bytecode.h

@@ -1785,8 +1785,6 @@ public:
         SSY,
         SYNC,
         BRK,
-        CAL,
-        RET,
         DEPBAR,
         VOTE,
         VOTE_VTG,
@@ -2110,8 +2108,6 @@ private:
             INST("1111000011111---", Id::SYNC, Type::Flow, "SYNC"),
             INST("111000110100----", Id::BRK, Type::Flow, "BRK"),
             INST("111000110000----", Id::EXIT, Type::Flow, "EXIT"),
-            INST("111000100110----", Id::CAL, Type::Flow, "CAL"),
-            INST("111000110010----", Id::RET, Type::Flow, "RET"),
             INST("1111000011110---", Id::DEPBAR, Type::Synch, "DEPBAR"),
             INST("0101000011011---", Id::VOTE, Type::Warp, "VOTE"),
             INST("0101000011100---", Id::VOTE_VTG, Type::Warp, "VOTE_VTG"),

src/video_core/memory_manager.cpp

@@ -114,25 +114,6 @@ void MemoryManager::TryUnlockPage(PageEntry page_entry, std::size_t size) {
                .IsSuccess());
 }
 
-void MemoryManager::UnmapVicFrame(GPUVAddr gpu_addr, std::size_t size) {
-    if (!size) {
-        return;
-    }
-
-    const std::optional<VAddr> cpu_addr = GpuToCpuAddress(gpu_addr);
-    ASSERT(cpu_addr);
-    rasterizer->InvalidateExceptTextureCache(*cpu_addr, size);
-    cache_invalidate_queue.push_back({*cpu_addr, size});
-
-    UpdateRange(gpu_addr, PageEntry::State::Unmapped, size);
-}
-
-void MemoryManager::InvalidateQueuedCaches() {
-    for (const auto& entry : cache_invalidate_queue) {
-        rasterizer->InvalidateTextureCache(entry.first, entry.second);
-    }
-    cache_invalidate_queue.clear();
-}
 PageEntry MemoryManager::GetPageEntry(GPUVAddr gpu_addr) const {
     return page_table[PageEntryIndex(gpu_addr)];
 }

src/video_core/memory_manager.h

@@ -123,14 +123,6 @@ public:
     [[nodiscard]] GPUVAddr Allocate(std::size_t size, std::size_t align);
     void Unmap(GPUVAddr gpu_addr, std::size_t size);
 
-    /**
-     * Some Decoded NVDEC frames require that texture cache does not get invalidated.
-     * UnmapVicFrame defers the texture cache invalidation until the stream ends
-     * by invoking InvalidateQueuedCaches to invalidate all frame texture caches.
-     */
-    void UnmapVicFrame(GPUVAddr gpu_addr, std::size_t size);
-    void InvalidateQueuedCaches();
-
 private:
     [[nodiscard]] PageEntry GetPageEntry(GPUVAddr gpu_addr) const;
     void SetPageEntry(GPUVAddr gpu_addr, PageEntry page_entry, std::size_t size = page_size);

src/video_core/rasterizer_interface.h

@@ -69,12 +69,6 @@ public:
     /// Notify rasterizer that any caches of the specified region should be flushed to Switch memory
     virtual void FlushRegion(VAddr addr, u64 size) = 0;
 
-    /// Notify rasterizer to flush the texture cache to Switch memory
-    virtual void InvalidateExceptTextureCache(VAddr addr, u64 size) = 0;
-
-    /// Notify rasterizer to invalidate the texture cache
-    virtual void InvalidateTextureCache(VAddr addr, u64 size) = 0;
-
     /// Check if the the specified memory area requires flushing to CPU Memory.
     virtual bool MustFlushRegion(VAddr addr, u64 size) = 0;
 

src/video_core/renderer_opengl/gl_arb_decompiler.cpp

@@ -491,9 +491,6 @@ private:
     const Registry& registry;
     const ShaderType stage;
 
-    std::shared_ptr<ShaderFunctionIR> context_func;
-    u32 ast_var_base{};
-
     std::size_t num_temporaries = 0;
     std::size_t max_temporaries = 0;
 
@@ -810,33 +807,13 @@ ARBDecompiler::ARBDecompiler(const Device& device_, const ShaderIR& ir_, const R
     : device{device_}, ir{ir_}, registry{registry_}, stage{stage_} {
     DefineGlobalMemory();
 
-    context_func = ir.GetMainFunction();
-    ast_var_base = 0;
-
     AddLine("TEMP RC;");
     AddLine("TEMP FSWZA[4];");
     AddLine("TEMP FSWZB[4];");
-    InitializeVariables();
+    if (ir.IsDecompiled()) {
-    AddLine("main:");
-    if (context_func->IsDecompiled()) {
         DecompileAST();
     } else {
         DecompileBranchMode();
-        AddLine("RET;");
-    }
-
-    const auto& subfunctions = ir.GetSubFunctions();
-    auto it = subfunctions.begin();
-    while (it != subfunctions.end()) {
-        context_func = *it;
-        AddLine("func_{}:", context_func->GetId());
-        if (context_func->IsDecompiled()) {
-            DecompileAST();
-        } else {
-            DecompileBranchMode();
-            AddLine("RET;");
-        }
-        it++;
     }
     AddLine("END");
 
@@ -1083,38 +1060,41 @@ void ARBDecompiler::InitializeVariables() {
 }
 
 void ARBDecompiler::DecompileAST() {
-    const u32 num_flow_variables = context_func->GetASTNumVariables();
+    const u32 num_flow_variables = ir.GetASTNumVariables();
     for (u32 i = 0; i < num_flow_variables; ++i) {
-        AddLine("TEMP F{};", i + ast_var_base);
+        AddLine("TEMP F{};", i);
     }
     for (u32 i = 0; i < num_flow_variables; ++i) {
-        AddLine("MOV.U F{}, {{0, 0, 0, 0}};", i + ast_var_base);
+        AddLine("MOV.U F{}, {{0, 0, 0, 0}};", i);
     }
 
-    VisitAST(context_func->GetASTProgram());
+    InitializeVariables();
-    ast_var_base += num_flow_variables;
+
+    VisitAST(ir.GetASTProgram());
 }
 
 void ARBDecompiler::DecompileBranchMode() {
     static constexpr u32 FLOW_STACK_SIZE = 20;
-    if (!context_func->IsFlowStackDisabled()) {
+    if (!ir.IsFlowStackDisabled()) {
         AddLine("TEMP SSY[{}];", FLOW_STACK_SIZE);
         AddLine("TEMP PBK[{}];", FLOW_STACK_SIZE);
         AddLine("TEMP SSY_TOP;");
         AddLine("TEMP PBK_TOP;");
     }
 
-    AddLine("TEMP PC{};", context_func->GetId());
+    AddLine("TEMP PC;");
 
-    if (!context_func->IsFlowStackDisabled()) {
+    if (!ir.IsFlowStackDisabled()) {
         AddLine("MOV.U SSY_TOP.x, 0;");
         AddLine("MOV.U PBK_TOP.x, 0;");
     }
 
-    const auto basic_block_end = context_func->GetBasicBlocks().end();
+    InitializeVariables();
-    auto basic_block_it = context_func->GetBasicBlocks().begin();
+
+    const auto basic_block_end = ir.GetBasicBlocks().end();
+    auto basic_block_it = ir.GetBasicBlocks().begin();
     const u32 first_address = basic_block_it->first;
-    AddLine("MOV.U PC{}.x, {};", context_func->GetId(), first_address);
+    AddLine("MOV.U PC.x, {};", first_address);
 
     AddLine("REP;");
 
@@ -1123,7 +1103,7 @@ void ARBDecompiler::DecompileBranchMode() {
         const auto& [address, bb] = *basic_block_it;
         ++num_blocks;
 
-        AddLine("SEQ.S.CC RC.x, PC{}.x, {};", context_func->GetId(), address);
+        AddLine("SEQ.S.CC RC.x, PC.x, {};", address);
         AddLine("IF NE.x;");
 
         VisitBlock(bb);
@@ -1134,7 +1114,7 @@ void ARBDecompiler::DecompileBranchMode() {
             const auto op = std::get_if<OperationNode>(&*bb[bb.size() - 1]);
             if (!op || op->GetCode() != OperationCode::Branch) {
                 const u32 next_address = basic_block_it->first;
-                AddLine("MOV.U PC{}.x, {};", context_func->GetId(), next_address);
+                AddLine("MOV.U PC.x, {};", next_address);
                 AddLine("CONT;");
             }
         }
@@ -1172,8 +1152,7 @@ void ARBDecompiler::VisitAST(const ASTNode& node) {
     } else if (const auto decoded = std::get_if<ASTBlockDecoded>(&*node->GetInnerData())) {
         VisitBlock(decoded->nodes);
     } else if (const auto var_set = std::get_if<ASTVarSet>(&*node->GetInnerData())) {
-        AddLine("MOV.U F{}, {};", var_set->index + ast_var_base,
+        AddLine("MOV.U F{}, {};", var_set->index, VisitExpression(var_set->condition));
-                VisitExpression(var_set->condition));
         ResetTemporaries();
     } else if (const auto do_while = std::get_if<ASTDoWhile>(&*node->GetInnerData())) {
         const std::string condition = VisitExpression(do_while->condition);
@@ -1193,11 +1172,7 @@ void ARBDecompiler::VisitAST(const ASTNode& node) {
             ResetTemporaries();
         }
         if (ast_return->kills) {
-            if (stage == ShaderType::Fragment) {
+            AddLine("KIL TR;");
-                AddLine("KIL TR;");
-            } else {
-                AddLine("RET;");
-            }
         } else {
             Exit();
         }
@@ -1244,7 +1219,7 @@ std::string ARBDecompiler::VisitExpression(const Expr& node) {
         return Visit(ir.GetConditionCode(expr->cc));
     }
     if (const auto expr = std::get_if<ExprVar>(&*node)) {
-        return fmt::format("F{}.x", expr->var_index + ast_var_base);
+        return fmt::format("F{}.x", expr->var_index);
     }
     if (const auto expr = std::get_if<ExprBoolean>(&*node)) {
         return expr->value ? "0xffffffff" : "0";
@@ -1431,11 +1406,6 @@ std::string ARBDecompiler::Visit(const Node& node) {
         return {};
     }
 
-    if (const auto func_call = std::get_if<FunctionCallNode>(&*node)) {
-        AddLine("CAL func_{};", func_call->GetFuncId());
-        return {};
-    }
-
     if ([[maybe_unused]] const auto cmt = std::get_if<CommentNode>(&*node)) {
         // Uncommenting this will generate invalid code. GLASM lacks comments.
         // AddLine("// {}", cmt->GetText());
@@ -1509,7 +1479,7 @@ std::string ARBDecompiler::GlobalMemoryPointer(const GmemNode& gmem) {
 }
 
 void ARBDecompiler::Exit() {
-    if (!context_func->IsMain() || stage != ShaderType::Fragment) {
+    if (stage != ShaderType::Fragment) {
         AddLine("RET;");
         return;
     }
@@ -2051,13 +2021,13 @@ std::string ARBDecompiler::ImageStore(Operation operation) {
 
 std::string ARBDecompiler::Branch(Operation operation) {
     const auto target = std::get<ImmediateNode>(*operation[0]);
-    AddLine("MOV.U PC{}.x, {};", context_func->GetId(), target.GetValue());
+    AddLine("MOV.U PC.x, {};", target.GetValue());
     AddLine("CONT;");
     return {};
 }
 
 std::string ARBDecompiler::BranchIndirect(Operation operation) {
-    AddLine("MOV.U PC{}.x, {};", context_func->GetId(), Visit(operation[0]));
+    AddLine("MOV.U PC.x, {};", Visit(operation[0]));
     AddLine("CONT;");
     return {};
 }
@@ -2075,7 +2045,7 @@ std::string ARBDecompiler::PopFlowStack(Operation operation) {
     const auto stack = std::get<MetaStackClass>(operation.GetMeta());
     const std::string_view stack_name = StackName(stack);
     AddLine("SUB.S {}_TOP.x, {}_TOP.x, 1;", stack_name, stack_name);
-    AddLine("MOV.U PC{}.x, {}[{}_TOP.x].x;", context_func->GetId(), stack_name, stack_name);
+    AddLine("MOV.U PC.x, {}[{}_TOP.x].x;", stack_name, stack_name);
     AddLine("CONT;");
     return {};
 }
@@ -2086,10 +2056,6 @@ std::string ARBDecompiler::Exit(Operation) {
 }
 
 std::string ARBDecompiler::Discard(Operation) {
-    if (stage != ShaderType::Fragment) {
-        AddLine("RET;");
-        return {};
-    }
     AddLine("KIL TR;");
     return {};
 }

src/video_core/renderer_opengl/gl_rasterizer.cpp

@@ -544,26 +544,6 @@ void RasterizerOpenGL::FlushRegion(VAddr addr, u64 size) {
     query_cache.FlushRegion(addr, size);
 }
 
-void RasterizerOpenGL::InvalidateExceptTextureCache(VAddr addr, u64 size) {
-    if (addr == 0 || size == 0) {
-        return;
-    }
-    shader_cache.InvalidateRegion(addr, size);
-    {
-        std::scoped_lock lock{buffer_cache.mutex};
-        buffer_cache.WriteMemory(addr, size);
-    }
-    query_cache.InvalidateRegion(addr, size);
-}
-
-void RasterizerOpenGL::InvalidateTextureCache(VAddr addr, u64 size) {
-    if (addr == 0 || size == 0) {
-        return;
-    }
-    std::scoped_lock lock{texture_cache.mutex};
-    texture_cache.UnmapMemory(addr, size);
-}
-
 bool RasterizerOpenGL::MustFlushRegion(VAddr addr, u64 size) {
     std::scoped_lock lock{buffer_cache.mutex, texture_cache.mutex};
     if (!Settings::IsGPULevelHigh()) {

src/video_core/renderer_opengl/gl_rasterizer.h

@@ -74,8 +74,6 @@ public:
     void BindGraphicsUniformBuffer(size_t stage, u32 index, GPUVAddr gpu_addr, u32 size) override;
     void FlushAll() override;
     void FlushRegion(VAddr addr, u64 size) override;
-    void InvalidateExceptTextureCache(VAddr addr, u64 size) override;
-    void InvalidateTextureCache(VAddr addr, u64 size) override;
     bool MustFlushRegion(VAddr addr, u64 size) override;
     void InvalidateRegion(VAddr addr, u64 size) override;
     void OnCPUWrite(VAddr addr, u64 size) override;

src/video_core/renderer_opengl/gl_shader_decompiler.cpp

@@ -79,11 +79,6 @@ const float fswzadd_modifiers_a[] = float[4](-1.0f,  1.0f, -1.0f,  0.0f );
 const float fswzadd_modifiers_b[] = float[4](-1.0f, -1.0f,  1.0f, -1.0f );
 )";
 
-enum class HelperFunction {
-    SignedAtomic = 0,
-    Total,
-};
-
 class ShaderWriter final {
 public:
     void AddExpression(std::string_view text) {
@@ -439,28 +434,6 @@ public:
         DeclareInternalFlags();
         DeclareCustomVariables();
         DeclarePhysicalAttributeReader();
-        DeclareHelpersForward();
-
-        const auto& subfunctions = ir.GetSubFunctions();
-        auto it = subfunctions.rbegin();
-        while (it != subfunctions.rend()) {
-            context_func = *it;
-            code.AddLine("void func_{}() {{", context_func->GetId());
-            ++code.scope;
-
-            if (context_func->IsDecompiled()) {
-                DecompileAST();
-            } else {
-                DecompileBranchMode();
-            }
-
-            --code.scope;
-            code.AddLine("}}");
-
-            it++;
-        }
-
-        context_func = ir.GetMainFunction();
 
         code.AddLine("void main() {{");
         ++code.scope;
@@ -469,7 +442,7 @@ public:
             code.AddLine("gl_Position = vec4(0.0f, 0.0f, 0.0f, 1.0f);");
         }
 
-        if (context_func->IsDecompiled()) {
+        if (ir.IsDecompiled()) {
             DecompileAST();
         } else {
             DecompileBranchMode();
@@ -477,9 +450,6 @@ public:
 
         --code.scope;
         code.AddLine("}}");
-
-        code.AddNewLine();
-        DeclareHelpers();
     }
 
     std::string GetResult() {
@@ -492,13 +462,13 @@ private:
 
     void DecompileBranchMode() {
         // VM's program counter
-        const auto first_address = context_func->GetBasicBlocks().begin()->first;
+        const auto first_address = ir.GetBasicBlocks().begin()->first;
         code.AddLine("uint jmp_to = {}U;", first_address);
 
         // TODO(Subv): Figure out the actual depth of the flow stack, for now it seems
         // unlikely that shaders will use 20 nested SSYs and PBKs.
         constexpr u32 FLOW_STACK_SIZE = 20;
-        if (!context_func->IsFlowStackDisabled()) {
+        if (!ir.IsFlowStackDisabled()) {
             for (const auto stack : std::array{MetaStackClass::Ssy, MetaStackClass::Pbk}) {
                 code.AddLine("uint {}[{}];", FlowStackName(stack), FLOW_STACK_SIZE);
                 code.AddLine("uint {} = 0U;", FlowStackTopName(stack));
@@ -510,7 +480,7 @@ private:
 
         code.AddLine("switch (jmp_to) {{");
 
-        for (const auto& pair : context_func->GetBasicBlocks()) {
+        for (const auto& pair : ir.GetBasicBlocks()) {
             const auto& [address, bb] = pair;
             code.AddLine("case 0x{:X}U: {{", address);
             ++code.scope;
@@ -629,7 +599,7 @@ private:
                 size = limit;
             }
 
-            code.AddLine("shared uint {}[{}];", GetSharedMemory(), size / 4);
+            code.AddLine("shared uint smem[{}];", size / 4);
             code.AddNewLine();
         }
         code.AddLine("layout (local_size_x = {}, local_size_y = {}, local_size_z = {}) in;",
@@ -1013,27 +983,6 @@ private:
         }
     }
 
-    void DeclareHelpersForward() {
-        code.AddLine("int Helpers_AtomicShared(uint offset, int value, bool is_min);");
-        code.AddNewLine();
-    }
-
-    void DeclareHelpers() {
-        if (IsHelperEnabled(HelperFunction::SignedAtomic)) {
-            code.AddLine(
-                R"(int Helpers_AtomicShared(uint offset, int value, bool is_min) {{
-    uint oldValue, newValue;
-    do {{
-        oldValue = {}[offset];
-        newValue = is_min ? uint(min(int(oldValue), value)) : uint(max(int(oldValue), value));
-    }} while (atomicCompSwap({}[offset], newValue, oldValue) != oldValue);
-    return int(oldValue);
-}})",
-                GetSharedMemory(), GetSharedMemory());
-            code.AddNewLine();
-        }
-    }
-
     void VisitBlock(const NodeBlock& bb) {
         for (const auto& node : bb) {
             Visit(node).CheckVoid();
@@ -1160,9 +1109,7 @@ private:
         }
 
         if (const auto smem = std::get_if<SmemNode>(&*node)) {
-            return {
+            return {fmt::format("smem[{} >> 2]", Visit(smem->GetAddress()).AsUint()), Type::Uint};
-                fmt::format("{}[{} >> 2]", GetSharedMemory(), Visit(smem->GetAddress()).AsUint()),
-                Type::Uint};
         }
 
         if (const auto internal_flag = std::get_if<InternalFlagNode>(&*node)) {
@@ -1184,11 +1131,6 @@ private:
             return {};
         }
 
-        if (const auto func_call = std::get_if<FunctionCallNode>(&*node)) {
-            code.AddLine("func_{}();", func_call->GetFuncId());
-            return {};
-        }
-
         if (const auto comment = std::get_if<CommentNode>(&*node)) {
             code.AddLine("// " + comment->GetText());
             return {};
@@ -1656,9 +1598,7 @@ private:
                 Type::Uint};
         } else if (const auto smem = std::get_if<SmemNode>(&*dest)) {
             ASSERT(stage == ShaderType::Compute);
-            target = {
+            target = {fmt::format("smem[{} >> 2]", Visit(smem->GetAddress()).AsUint()), Type::Uint};
-                fmt::format("{}[{} >> 2]", GetSharedMemory(), Visit(smem->GetAddress()).AsUint()),
-                Type::Uint};
         } else if (const auto gmem = std::get_if<GmemNode>(&*dest)) {
             const std::string real = Visit(gmem->GetRealAddress()).AsUint();
             const std::string base = Visit(gmem->GetBaseAddress()).AsUint();
@@ -2175,14 +2115,7 @@ private:
         UNIMPLEMENTED_IF(meta->sampler.is_array);
         const std::size_t count = operation.GetOperandsCount();
 
-        std::string expr = "texelFetch";
+        std::string expr = "texelFetch(";
-
-        if (!meta->aoffi.empty()) {
-            expr += "Offset";
-        }
-
-        expr += '(';
-
         expr += GetSampler(meta->sampler);
         expr += ", ";
 
@@ -2204,20 +2137,6 @@ private:
             expr += ", ";
             expr += Visit(meta->lod).AsInt();
         }
-
-        if (!meta->aoffi.empty()) {
-            expr += ", ";
-            expr += constructors.at(meta->aoffi.size() - 1);
-            expr += '(';
-            for (size_t i = 0; i < meta->aoffi.size(); ++i) {
-                if (i > 0) {
-                    expr += ", ";
-                }
-                expr += Visit(meta->aoffi[i]).AsInt();
-            }
-            expr += ')';
-        }
-
         expr += ')';
         expr += GetSwizzle(meta->element);
 
@@ -2264,11 +2183,8 @@ private:
     template <const std::string_view& opname, Type type>
     Expression Atomic(Operation operation) {
         if ((opname == Func::Min || opname == Func::Max) && type == Type::Int) {
-            // Use a helper as a workaround due to memory being uint
+            UNIMPLEMENTED_MSG("Unimplemented Min & Max for atomic operations");
-            SetHelperEnabled(HelperFunction::SignedAtomic, true);
+            return {};
-            return {fmt::format("Helpers_AtomicShared({}, {}, {})", Visit(operation[0]).AsInt(),
-                                Visit(operation[1]).AsInt(), opname == Func::Min),
-                    Type::Int};
         }
         return {fmt::format("atomic{}({}, {})", opname, Visit(operation[0]).GetCode(),
                             Visit(operation[1]).AsUint()),
@@ -2351,9 +2267,7 @@ private:
     }
 
     Expression Exit(Operation operation) {
-        if (context_func->IsMain()) {
+        PreExit();
-            PreExit();
-        }
         code.AddLine("return;");
         return {};
     }
@@ -2363,11 +2277,7 @@ private:
         // about unexecuted instructions that may follow this.
         code.AddLine("if (true) {{");
         ++code.scope;
-        if (stage != ShaderType::Fragment) {
+        code.AddLine("discard;");
-            code.AddLine("return;");
-        } else {
-            code.AddLine("discard;");
-        }
         --code.scope;
         code.AddLine("}}");
         return {};
@@ -2478,7 +2388,7 @@ private:
     }
 
     Expression Barrier(Operation) {
-        if (!context_func->IsDecompiled()) {
+        if (!ir.IsDecompiled()) {
             LOG_ERROR(Render_OpenGL, "barrier() used but shader is not decompiled");
             return {};
         }
@@ -2795,10 +2705,6 @@ private:
         }
     }
 
-    constexpr std::string_view GetSharedMemory() const {
-        return "shared_mem";
-    }
-
     std::string GetInternalFlag(InternalFlag flag) const {
         constexpr std::array InternalFlagNames = {"zero_flag", "sign_flag", "carry_flag",
                                                   "overflow_flag"};
@@ -2840,14 +2746,6 @@ private:
         return std::min<u32>(device.GetMaxVaryings(), Maxwell::NumVaryings);
     }
 
-    void SetHelperEnabled(HelperFunction hf, bool enabled) {
-        helper_functions_enabled[static_cast<size_t>(hf)] = enabled;
-    }
-
-    bool IsHelperEnabled(HelperFunction hf) const {
-        return helper_functions_enabled[static_cast<size_t>(hf)];
-    }
-
     const Device& device;
     const ShaderIR& ir;
     const Registry& registry;
@@ -2857,13 +2755,9 @@ private:
     const Header header;
     std::unordered_map<u8, VaryingTFB> transform_feedback;
 
-    std::shared_ptr<ShaderFunctionIR> context_func;
-
     ShaderWriter code;
 
     std::optional<u32> max_input_vertices;
-
-    std::array<bool, static_cast<size_t>(HelperFunction::Total)> helper_functions_enabled{};
 };
 
 std::string GetFlowVariable(u32 index) {
@@ -3008,15 +2902,9 @@ public:
             decomp.code.scope++;
         }
         if (ast.kills) {
-            if (decomp.stage != ShaderType::Fragment) {
+            decomp.code.AddLine("discard;");
-                decomp.code.AddLine("return;");
-            } else {
-                decomp.code.AddLine("discard;");
-            }
         } else {
-            if (decomp.context_func->IsMain()) {
+            decomp.PreExit();
-                decomp.PreExit();
-            }
             decomp.code.AddLine("return;");
         }
         if (!is_true) {
@@ -3049,13 +2937,13 @@ private:
 };
 
 void GLSLDecompiler::DecompileAST() {
-    const u32 num_flow_variables = context_func->GetASTNumVariables();
+    const u32 num_flow_variables = ir.GetASTNumVariables();
     for (u32 i = 0; i < num_flow_variables; i++) {
         code.AddLine("bool {} = false;", GetFlowVariable(i));
     }
 
     ASTDecompiler decompiler{*this};
-    decompiler.Visit(context_func->GetASTProgram());
+    decompiler.Visit(ir.GetASTProgram());
 }
 
 } // Anonymous namespace

src/video_core/renderer_vulkan/vk_rasterizer.cpp

@@ -493,26 +493,6 @@ void RasterizerVulkan::FlushRegion(VAddr addr, u64 size) {
     query_cache.FlushRegion(addr, size);
 }
 
-void Vulkan::RasterizerVulkan::InvalidateExceptTextureCache(VAddr addr, u64 size) {
-    if (addr == 0 || size == 0) {
-        return;
-    }
-    pipeline_cache.InvalidateRegion(addr, size);
-    {
-        std::scoped_lock lock{buffer_cache.mutex};
-        buffer_cache.WriteMemory(addr, size);
-    }
-    query_cache.InvalidateRegion(addr, size);
-}
-
-void Vulkan::RasterizerVulkan::InvalidateTextureCache(VAddr addr, u64 size) {
-    if (addr == 0 || size == 0) {
-        return;
-    }
-    std::scoped_lock lock{texture_cache.mutex};
-    texture_cache.UnmapMemory(addr, size);
-}
-
 bool RasterizerVulkan::MustFlushRegion(VAddr addr, u64 size) {
     std::scoped_lock lock{texture_cache.mutex, buffer_cache.mutex};
     if (!Settings::IsGPULevelHigh()) {

src/video_core/renderer_vulkan/vk_rasterizer.h

@@ -66,8 +66,6 @@ public:
     void BindGraphicsUniformBuffer(size_t stage, u32 index, GPUVAddr gpu_addr, u32 size) override;
     void FlushAll() override;
     void FlushRegion(VAddr addr, u64 size) override;
-    void InvalidateExceptTextureCache(VAddr addr, u64 size) override;
-    void InvalidateTextureCache(VAddr addr, u64 size) override;
     bool MustFlushRegion(VAddr addr, u64 size) override;
     void InvalidateRegion(VAddr addr, u64 size) override;
     void OnCPUWrite(VAddr addr, u64 size) override;

src/video_core/renderer_vulkan/vk_shader_decompiler.cpp

@@ -406,38 +406,10 @@ private:
         binding = DeclareStorageTexels(binding);
         binding = DeclareImages(binding);
 
-        const auto& subfunctions = ir.GetSubFunctions();
-
-        labels.resize(subfunctions.size() + 1);
-        other_functions.resize(subfunctions.size());
-
-        auto it = subfunctions.rbegin();
-        while (it != subfunctions.rend()) {
-            context_func = *it;
-            other_functions[context_func->GetId() - 1] =
-                OpFunction(t_void, {}, TypeFunction(t_void));
-            AddLabel();
-
-            if (context_func->IsDecompiled()) {
-                DeclareFlowVariables();
-                DecompileAST();
-            } else {
-                AllocateLabels();
-                DecompileBranchMode();
-            }
-
-            OpReturn();
-            OpFunctionEnd();
-
-            it++;
-        }
-
-        context_func = ir.GetMainFunction();
-
         const Id main = OpFunction(t_void, {}, TypeFunction(t_void));
         AddLabel();
 
-        if (context_func->IsDecompiled()) {
+        if (ir.IsDecompiled()) {
             DeclareFlowVariables();
             DecompileAST();
         } else {
@@ -469,18 +441,16 @@ private:
     void DecompileAST();
 
     void DecompileBranchMode() {
-        const u32 first_address = context_func->GetBasicBlocks().begin()->first;
+        const u32 first_address = ir.GetBasicBlocks().begin()->first;
-        const u32 func_id = context_func->GetId();
+        const Id loop_label = OpLabel("loop");
-        const std::string func_id_msg = std::to_string(func_id);
+        const Id merge_label = OpLabel("merge");
-        const Id loop_label = OpLabel("loop_" + func_id_msg);
-        const Id merge_label = OpLabel("merge_" + func_id_msg);
         const Id dummy_label = OpLabel();
         const Id jump_label = OpLabel();
-        continue_label = OpLabel("continue_" + func_id_msg);
+        continue_label = OpLabel("continue");
 
         std::vector<Sirit::Literal> literals;
         std::vector<Id> branch_labels;
-        for (const auto& [literal, label] : labels[func_id]) {
+        for (const auto& [literal, label] : labels) {
             literals.push_back(literal);
             branch_labels.push_back(label);
         }
@@ -492,11 +462,11 @@ private:
         std::tie(ssy_flow_stack, ssy_flow_stack_top) = CreateFlowStack();
         std::tie(pbk_flow_stack, pbk_flow_stack_top) = CreateFlowStack();
 
-        Name(jmp_to, "jmp_to_" + func_id_msg);
+        Name(jmp_to, "jmp_to");
-        Name(ssy_flow_stack, "ssy_flow_stack_" + func_id_msg);
+        Name(ssy_flow_stack, "ssy_flow_stack");
-        Name(ssy_flow_stack_top, "ssy_flow_stack_top_" + func_id_msg);
+        Name(ssy_flow_stack_top, "ssy_flow_stack_top");
-        Name(pbk_flow_stack, "pbk_flow_stack_" + func_id_msg);
+        Name(pbk_flow_stack, "pbk_flow_stack");
-        Name(pbk_flow_stack_top, "pbk_flow_stack_top_" + func_id_msg);
+        Name(pbk_flow_stack_top, "pbk_flow_stack_top");
 
         DefinePrologue();
 
@@ -514,14 +484,13 @@ private:
         AddLabel(default_branch);
         OpReturn();
 
-        for (const auto& [address, bb] : context_func->GetBasicBlocks()) {
+        for (const auto& [address, bb] : ir.GetBasicBlocks()) {
-            AddLabel(labels[func_id].at(address));
+            AddLabel(labels.at(address));
 
             VisitBasicBlock(bb);
 
-            const auto next_it = labels[func_id].lower_bound(address + 1);
+            const auto next_it = labels.lower_bound(address + 1);
-            const Id next_label =
+            const Id next_label = next_it != labels.end() ? next_it->second : default_branch;
-                next_it != labels[func_id].end() ? next_it->second : default_branch;
             OpBranch(next_label);
         }
 
@@ -539,10 +508,9 @@ private:
     static constexpr auto INTERNAL_FLAGS_COUNT = static_cast<std::size_t>(InternalFlag::Amount);
 
     void AllocateLabels() {
-        const u32 func_id = context_func->GetId();
+        for (const auto& pair : ir.GetBasicBlocks()) {
-        for (const auto& pair : context_func->GetBasicBlocks()) {
             const u32 address = pair.first;
-            labels[func_id].emplace(address, OpLabel(fmt::format("label_0x{:x}", address)));
+            labels.emplace(address, OpLabel(fmt::format("label_0x{:x}", address)));
         }
     }
 
@@ -621,14 +589,6 @@ private:
         DeclareOutputVertex();
     }
 
-    void SafeKill() {
-        if (stage != ShaderType::Fragment) {
-            OpReturn();
-            return;
-        }
-        OpKill();
-    }
-
     void DeclareFragment() {
         if (stage != ShaderType::Fragment) {
             return;
@@ -696,7 +656,7 @@ private:
     }
 
     void DeclareFlowVariables() {
-        for (u32 i = 0; i < context_func->GetASTNumVariables(); i++) {
+        for (u32 i = 0; i < ir.GetASTNumVariables(); i++) {
             const Id id = OpVariable(t_prv_bool, spv::StorageClass::Private, v_false);
             Name(id, fmt::format("flow_var_{}", static_cast<u32>(i)));
             flow_variables.emplace(i, AddGlobalVariable(id));
@@ -1373,12 +1333,6 @@ private:
             return {};
         }
 
-        if (const auto func_call = std::get_if<FunctionCallNode>(&*node)) {
-            const u32 func_id = func_call->GetFuncId();
-            OpFunctionCall(t_void, other_functions[func_id - 1]);
-            return {};
-        }
-
         if (const auto comment = std::get_if<CommentNode>(&*node)) {
             if (device.HasDebuggingToolAttached()) {
                 // We should insert comments with OpString instead of using named variables
@@ -2170,7 +2124,7 @@ private:
 
         OpBranchConditional(condition, true_label, discard_label);
         AddLabel(discard_label);
-        SafeKill();
+        OpKill();
         AddLabel(true_label);
     }
 
@@ -2221,9 +2175,7 @@ private:
     }
 
     Expression Exit(Operation operation) {
-        if (context_func->IsMain()) {
+        PreExit();
-            PreExit();
-        }
         inside_branch = true;
         if (conditional_branch_set) {
             OpReturn();
@@ -2240,12 +2192,12 @@ private:
     Expression Discard(Operation operation) {
         inside_branch = true;
         if (conditional_branch_set) {
-            SafeKill();
+            OpKill();
         } else {
             const Id dummy = OpLabel();
             OpBranch(dummy);
             AddLabel(dummy);
-            SafeKill();
+            OpKill();
             AddLabel();
         }
         return {};
@@ -2324,7 +2276,7 @@ private:
     }
 
     Expression Barrier(Operation) {
-        if (!context_func->IsDecompiled()) {
+        if (!ir.IsDecompiled()) {
             LOG_ERROR(Render_Vulkan, "OpBarrier used by shader is not decompiled");
             return {};
         }
@@ -2818,8 +2770,6 @@ private:
     const Specialization& specialization;
     std::unordered_map<u8, VaryingTFB> transform_feedback;
 
-    std::shared_ptr<ShaderFunctionIR> context_func;
-
     const Id t_void = Name(TypeVoid(), "void");
 
     const Id t_bool = Name(TypeBool(), "bool");
@@ -2946,8 +2896,7 @@ private:
     Id ssy_flow_stack{};
     Id pbk_flow_stack{};
     Id continue_label{};
-    std::vector<std::map<u32, Id>> labels;
+    std::map<u32, Id> labels;
-    std::vector<Id> other_functions;
 
     bool conditional_branch_set{};
     bool inside_branch{};
@@ -3098,11 +3047,9 @@ public:
             decomp.OpBranchConditional(condition, then_label, endif_label);
             decomp.AddLabel(then_label);
             if (ast.kills) {
-                decomp.SafeKill();
+                decomp.OpKill();
             } else {
-                if (decomp.context_func->IsMain()) {
+                decomp.PreExit();
-                    decomp.PreExit();
-                }
                 decomp.OpReturn();
             }
             decomp.AddLabel(endif_label);
@@ -3111,11 +3058,9 @@ public:
             decomp.OpBranch(next_block);
             decomp.AddLabel(next_block);
             if (ast.kills) {
-                decomp.SafeKill();
+                decomp.OpKill();
             } else {
-                if (decomp.context_func->IsMain()) {
+                decomp.PreExit();
-                    decomp.PreExit();
-                }
                 decomp.OpReturn();
             }
             decomp.AddLabel(decomp.OpLabel());
@@ -3152,7 +3097,7 @@ private:
 };
 
 void SPIRVDecompiler::DecompileAST() {
-    const u32 num_flow_variables = context_func->GetASTNumVariables();
+    const u32 num_flow_variables = ir.GetASTNumVariables();
     for (u32 i = 0; i < num_flow_variables; i++) {
         const Id id = OpVariable(t_prv_bool, spv::StorageClass::Private, v_false);
         Name(id, fmt::format("flow_var_{}", i));
@@ -3161,7 +3106,7 @@ void SPIRVDecompiler::DecompileAST() {
 
     DefinePrologue();
 
-    const ASTNode program = context_func->GetASTProgram();
+    const ASTNode program = ir.GetASTProgram();
     ASTDecompiler decompiler{*this};
     decompiler.Visit(program);
 

src/video_core/shader/control_flow.cpp

@@ -7,7 +7,6 @@
 #include <set>
 #include <stack>
 #include <unordered_map>
-#include <unordered_set>
 #include <vector>
 
 #include "common/assert.h"
@@ -27,29 +26,17 @@ using Tegra::Shader::OpCode;
 
 constexpr s32 unassigned_branch = -2;
 
-enum class JumpLabel : u32 {
-    SSYClass = 0,
-    PBKClass = 1,
-};
-
-struct JumpItem {
-    JumpLabel type;
-    u32 address;
-
-    bool operator==(const JumpItem& other) const {
-        return std::tie(type, address) == std::tie(other.type, other.address);
-    }
-};
-
 struct Query {
     u32 address{};
-    std::stack<JumpItem> stack{};
+    std::stack<u32> ssy_stack{};
+    std::stack<u32> pbk_stack{};
 };
 
 struct BlockStack {
     BlockStack() = default;
-    explicit BlockStack(const Query& q) : stack{q.stack} {}
+    explicit BlockStack(const Query& q) : ssy_stack{q.ssy_stack}, pbk_stack{q.pbk_stack} {}
-    std::stack<JumpItem> stack{};
+    std::stack<u32> ssy_stack{};
+    std::stack<u32> pbk_stack{};
 };
 
 template <typename T, typename... Args>
@@ -78,36 +65,20 @@ struct BlockInfo {
     }
 };
 
-struct ProgramControl {
-    std::unordered_set<u32> found_functions{};
-    std::list<u32> pending_functions{};
-
-    void RegisterFunction(u32 address) {
-        if (found_functions.count(address) != 0) {
-            return;
-        }
-        found_functions.insert(address);
-        pending_functions.emplace_back(address);
-    }
-};
-
 struct CFGRebuildState {
-    explicit CFGRebuildState(ProgramControl& control_, const ProgramCode& program_code_, u32 start_,
+    explicit CFGRebuildState(const ProgramCode& program_code_, u32 start_, Registry& registry_)
-                             u32 base_start_, Registry& registry_)
+        : program_code{program_code_}, registry{registry_}, start{start_} {}
-        : control{control_}, program_code{program_code_}, registry{registry_}, start{start_},
-          base_start{base_start_} {}
 
-    ProgramControl& control;
     const ProgramCode& program_code;
     Registry& registry;
     u32 start{};
-    u32 base_start{};
     std::vector<BlockInfo> block_info;
     std::list<u32> inspect_queries;
     std::list<Query> queries;
     std::unordered_map<u32, u32> registered;
     std::set<u32> labels;
-    std::map<u32, JumpItem> jump_labels;
+    std::map<u32, u32> ssy_labels;
+    std::map<u32, u32> pbk_labels;
     std::unordered_map<u32, BlockStack> stacks;
     ASTManager* manager{};
 };
@@ -182,7 +153,7 @@ template <typename Result, typename TestCallable, typename PackCallable>
 std::optional<Result> TrackInstruction(const CFGRebuildState& state, u32& pos, TestCallable test,
                                        PackCallable pack) {
     for (; pos >= state.start; --pos) {
-        if (IsSchedInstruction(pos, state.base_start)) {
+        if (IsSchedInstruction(pos, state.start)) {
             continue;
         }
         const Instruction instr = state.program_code[pos];
@@ -291,7 +262,7 @@ std::pair<ParseResult, ParseInfo> ParseCode(CFGRebuildState& state, u32 address)
             single_branch.ignore = true;
             break;
         }
-        if (IsSchedInstruction(offset, state.base_start)) {
+        if (IsSchedInstruction(offset, state.start)) {
             offset++;
             continue;
         }
@@ -303,7 +274,6 @@ std::pair<ParseResult, ParseInfo> ParseCode(CFGRebuildState& state, u32 address)
         }
 
         switch (opcode->get().GetId()) {
-        case OpCode::Id::RET:
         case OpCode::Id::EXIT: {
             const auto pred_index = static_cast<u32>(instr.pred.pred_index);
             single_branch.condition.predicate = GetPredicate(pred_index, instr.negate_pred != 0);
@@ -441,20 +411,13 @@ std::pair<ParseResult, ParseInfo> ParseCode(CFGRebuildState& state, u32 address)
         case OpCode::Id::SSY: {
             const u32 target = offset + instr.bra.GetBranchTarget();
             insert_label(state, target);
-            JumpItem it = {JumpLabel::SSYClass, target};
+            state.ssy_labels.emplace(offset, target);
-            state.jump_labels.emplace(offset, it);
             break;
         }
         case OpCode::Id::PBK: {
             const u32 target = offset + instr.bra.GetBranchTarget();
             insert_label(state, target);
-            JumpItem it = {JumpLabel::PBKClass, target};
+            state.pbk_labels.emplace(offset, target);
-            state.jump_labels.emplace(offset, it);
-            break;
-        }
-        case OpCode::Id::CAL: {
-            const u32 target = offset + instr.bra.GetBranchTarget();
-            state.control.RegisterFunction(target);
             break;
         }
         case OpCode::Id::BRX: {
@@ -550,7 +513,7 @@ bool TryInspectAddress(CFGRebuildState& state) {
 }
 
 bool TryQuery(CFGRebuildState& state) {
-    const auto gather_labels = [](std::stack<JumpItem>& cc, std::map<u32, JumpItem>& labels,
+    const auto gather_labels = [](std::stack<u32>& cc, std::map<u32, u32>& labels,
                                   BlockInfo& block) {
         auto gather_start = labels.lower_bound(block.start);
         const auto gather_end = labels.upper_bound(block.end);
@@ -559,19 +522,6 @@ bool TryQuery(CFGRebuildState& state) {
             ++gather_start;
         }
     };
-    const auto pop_labels = [](JumpLabel type, SingleBranch* branch, Query& query) -> bool {
-        while (!query.stack.empty() && query.stack.top().type != type) {
-            query.stack.pop();
-        }
-        if (query.stack.empty()) {
-            return false;
-        }
-        if (branch->address == unassigned_branch) {
-            branch->address = query.stack.top().address;
-        }
-        query.stack.pop();
-        return true;
-    };
     if (state.queries.empty()) {
         return false;
     }
@@ -584,7 +534,8 @@ bool TryQuery(CFGRebuildState& state) {
     // consumes a label. Schedule new queries accordingly
     if (block.visited) {
         BlockStack& stack = state.stacks[q.address];
-        const bool all_okay = (stack.stack.empty() || q.stack == stack.stack);
+        const bool all_okay = (stack.ssy_stack.empty() || q.ssy_stack == stack.ssy_stack) &&
+                              (stack.pbk_stack.empty() || q.pbk_stack == stack.pbk_stack);
         state.queries.pop_front();
         return all_okay;
     }
@@ -593,7 +544,8 @@ bool TryQuery(CFGRebuildState& state) {
 
     Query q2(q);
     state.queries.pop_front();
-    gather_labels(q2.stack, state.jump_labels, block);
+    gather_labels(q2.ssy_stack, state.ssy_labels, block);
+    gather_labels(q2.pbk_stack, state.pbk_labels, block);
     if (std::holds_alternative<SingleBranch>(*block.branch)) {
         auto* branch = std::get_if<SingleBranch>(block.branch.get());
         if (!branch->condition.IsUnconditional()) {
@@ -603,10 +555,16 @@ bool TryQuery(CFGRebuildState& state) {
 
         auto& conditional_query = state.queries.emplace_back(q2);
         if (branch->is_sync) {
-            pop_labels(JumpLabel::SSYClass, branch, conditional_query);
+            if (branch->address == unassigned_branch) {
+                branch->address = conditional_query.ssy_stack.top();
+            }
+            conditional_query.ssy_stack.pop();
         }
         if (branch->is_brk) {
-            pop_labels(JumpLabel::PBKClass, branch, conditional_query);
+            if (branch->address == unassigned_branch) {
+                branch->address = conditional_query.pbk_stack.top();
+            }
+            conditional_query.pbk_stack.pop();
         }
         conditional_query.address = branch->address;
         return true;
@@ -688,23 +646,25 @@ void DecompileShader(CFGRebuildState& state) {
     state.manager->Decompile();
 }
 
-ShaderFunction ScanFunction(ProgramControl& control, const ProgramCode& program_code,
+} // Anonymous namespace
-                            u32 start_address, u32 base_start, const CompilerSettings& settings,
+
-                            Registry& registry) {
+std::unique_ptr<ShaderCharacteristics> ScanFlow(const ProgramCode& program_code, u32 start_address,
-    ShaderFunction result_out{};
+                                                const CompilerSettings& settings,
+                                                Registry& registry) {
+    auto result_out = std::make_unique<ShaderCharacteristics>();
     if (settings.depth == CompileDepth::BruteForce) {
-        result_out.settings.depth = CompileDepth::BruteForce;
+        result_out->settings.depth = CompileDepth::BruteForce;
         return result_out;
     }
 
-    CFGRebuildState state{control, program_code, start_address, base_start, registry};
+    CFGRebuildState state{program_code, start_address, registry};
     // Inspect Code and generate blocks
     state.labels.clear();
     state.labels.emplace(start_address);
     state.inspect_queries.push_back(state.start);
     while (!state.inspect_queries.empty()) {
         if (!TryInspectAddress(state)) {
-            result_out.settings.depth = CompileDepth::BruteForce;
+            result_out->settings.depth = CompileDepth::BruteForce;
             return result_out;
         }
     }
@@ -715,7 +675,7 @@ ShaderFunction ScanFunction(ProgramControl& control, const ProgramCode& program_
 
     if (settings.depth != CompileDepth::FlowStack) {
         // Decompile Stacks
-        state.queries.push_back(Query{state.start, {}});
+        state.queries.push_back(Query{state.start, {}, {}});
         decompiled = true;
         while (!state.queries.empty()) {
             if (!TryQuery(state)) {
@@ -745,18 +705,19 @@ ShaderFunction ScanFunction(ProgramControl& control, const ProgramCode& program_
             state.manager->ShowCurrentState("Of Shader");
             state.manager->Clear();
         } else {
-            result_out.start = start_address;
+            auto characteristics = std::make_unique<ShaderCharacteristics>();
-            result_out.settings.depth = settings.depth;
+            characteristics->start = start_address;
-            result_out.manager = std::move(manager);
+            characteristics->settings.depth = settings.depth;
-            result_out.end = state.block_info.back().end + 1;
+            characteristics->manager = std::move(manager);
-            return result_out;
+            characteristics->end = state.block_info.back().end + 1;
+            return characteristics;
         }
     }
 
-    result_out.start = start_address;
+    result_out->start = start_address;
-    result_out.settings.depth =
+    result_out->settings.depth =
         use_flow_stack ? CompileDepth::FlowStack : CompileDepth::NoFlowStack;
-    result_out.blocks.clear();
+    result_out->blocks.clear();
     for (auto& block : state.block_info) {
         ShaderBlock new_block{};
         new_block.start = block.start;
@@ -765,20 +726,20 @@ ShaderFunction ScanFunction(ProgramControl& control, const ProgramCode& program_
         if (!new_block.ignore_branch) {
             new_block.branch = block.branch;
         }
-        result_out.end = std::max(result_out.end, block.end);
+        result_out->end = std::max(result_out->end, block.end);
-        result_out.blocks.push_back(new_block);
+        result_out->blocks.push_back(new_block);
     }
     if (!use_flow_stack) {
-        result_out.labels = std::move(state.labels);
+        result_out->labels = std::move(state.labels);
         return result_out;
     }
 
-    auto back = result_out.blocks.begin();
+    auto back = result_out->blocks.begin();
     auto next = std::next(back);
-    while (next != result_out.blocks.end()) {
+    while (next != result_out->blocks.end()) {
         if (!state.labels.contains(next->start) && next->start == back->end + 1) {
             back->end = next->end;
-            next = result_out.blocks.erase(next);
+            next = result_out->blocks.erase(next);
             continue;
         }
         back = next;
@@ -787,22 +748,4 @@ ShaderFunction ScanFunction(ProgramControl& control, const ProgramCode& program_
 
     return result_out;
 }
-
-} // Anonymous namespace
-
-std::unique_ptr<ShaderProgram> ScanFlow(const ProgramCode& program_code, u32 start_address,
-                                        const CompilerSettings& settings, Registry& registry) {
-    ProgramControl control{};
-    auto result_out = std::make_unique<ShaderProgram>();
-    result_out->main =
-        ScanFunction(control, program_code, start_address, start_address, settings, registry);
-    while (!control.pending_functions.empty()) {
-        u32 address = control.pending_functions.front();
-        auto fun = ScanFunction(control, program_code, address, start_address, settings, registry);
-        result_out->subfunctions.emplace(address, std::move(fun));
-        control.pending_functions.pop_front();
-    }
-    return result_out;
-}
-
 } // namespace VideoCommon::Shader

src/video_core/shader/control_flow.h

@@ -5,7 +5,6 @@
 #pragma once
 
 #include <list>
-#include <map>
 #include <optional>
 #include <set>
 #include <variant>
@@ -102,7 +101,7 @@ struct ShaderBlock {
     }
 };
 
-struct ShaderFunction {
+struct ShaderCharacteristics {
     std::list<ShaderBlock> blocks{};
     std::set<u32> labels{};
     u32 start{};
@@ -111,12 +110,8 @@ struct ShaderFunction {
     CompilerSettings settings{};
 };
 
-struct ShaderProgram {
+std::unique_ptr<ShaderCharacteristics> ScanFlow(const ProgramCode& program_code, u32 start_address,
-    ShaderFunction main;
+                                                const CompilerSettings& settings,
-    std::map<u32, ShaderFunction> subfunctions;
+                                                Registry& registry);
-};
-
-std::unique_ptr<ShaderProgram> ScanFlow(const ProgramCode& program_code, u32 start_address,
-                                        const CompilerSettings& settings, Registry& registry);
 
 } // namespace VideoCommon::Shader

src/video_core/shader/decode.cpp

@@ -64,52 +64,9 @@ std::optional<u32> TryDeduceSamplerSize(const SamplerEntry& sampler_to_deduce,
 
 } // Anonymous namespace
 
-class ExprDecoder {
-public:
-    explicit ExprDecoder(ShaderIR& ir_) : ir(ir_) {}
-
-    void operator()(const ExprAnd& expr) {
-        Visit(expr.operand1);
-        Visit(expr.operand2);
-    }
-
-    void operator()(const ExprOr& expr) {
-        Visit(expr.operand1);
-        Visit(expr.operand2);
-    }
-
-    void operator()(const ExprNot& expr) {
-        Visit(expr.operand1);
-    }
-
-    void operator()(const ExprPredicate& expr) {
-        const auto pred = static_cast<Tegra::Shader::Pred>(expr.predicate);
-        if (pred != Pred::UnusedIndex && pred != Pred::NeverExecute) {
-            ir.used_predicates.insert(pred);
-        }
-    }
-
-    void operator()(const ExprCondCode& expr) {}
-
-    void operator()(const ExprVar& expr) {}
-
-    void operator()(const ExprBoolean& expr) {}
-
-    void operator()(const ExprGprEqual& expr) {
-        ir.used_registers.insert(expr.gpr);
-    }
-
-    void Visit(const Expr& node) {
-        return std::visit(*this, *node);
-    }
-
-private:
-    ShaderIR& ir;
-};
-
 class ASTDecoder {
 public:
-    explicit ASTDecoder(ShaderIR& ir_) : ir(ir_), decoder(ir_) {}
+    explicit ASTDecoder(ShaderIR& ir_) : ir(ir_) {}
 
     void operator()(ASTProgram& ast) {
         ASTNode current = ast.nodes.GetFirst();
@@ -120,7 +77,6 @@ public:
     }
 
     void operator()(ASTIfThen& ast) {
-        decoder.Visit(ast.condition);
         ASTNode current = ast.nodes.GetFirst();
         while (current) {
             Visit(current);
@@ -140,18 +96,13 @@ public:
 
     void operator()(ASTBlockDecoded& ast) {}
 
-    void operator()(ASTVarSet& ast) {
+    void operator()(ASTVarSet& ast) {}
-        decoder.Visit(ast.condition);
-    }
 
     void operator()(ASTLabel& ast) {}
 
-    void operator()(ASTGoto& ast) {
+    void operator()(ASTGoto& ast) {}
-        decoder.Visit(ast.condition);
-    }
 
     void operator()(ASTDoWhile& ast) {
-        decoder.Visit(ast.condition);
         ASTNode current = ast.nodes.GetFirst();
         while (current) {
             Visit(current);
@@ -159,13 +110,9 @@ public:
         }
     }
 
-    void operator()(ASTReturn& ast) {
+    void operator()(ASTReturn& ast) {}
-        decoder.Visit(ast.condition);
-    }
 
-    void operator()(ASTBreak& ast) {
+    void operator()(ASTBreak& ast) {}
-        decoder.Visit(ast.condition);
-    }
 
     void Visit(ASTNode& node) {
         std::visit(*this, *node->GetInnerData());
@@ -178,113 +125,77 @@ public:
 
 private:
     ShaderIR& ir;
-    ExprDecoder decoder;
 };
 
 void ShaderIR::Decode() {
-    const auto decode_function = ([this](ShaderFunction& shader_info) {
-        coverage_end = std::max<u32>(0, shader_info.end);
-        switch (shader_info.settings.depth) {
-        case CompileDepth::FlowStack: {
-            for (const auto& block : shader_info.blocks) {
-                basic_blocks.insert({block.start, DecodeRange(block.start, block.end + 1)});
-            }
-            break;
-        }
-        case CompileDepth::NoFlowStack: {
-            disable_flow_stack = true;
-            const auto insert_block = [this](NodeBlock& nodes, u32 label) {
-                if (label == static_cast<u32>(exit_branch)) {
-                    return;
-                }
-                basic_blocks.insert({label, nodes});
-            };
-            const auto& blocks = shader_info.blocks;
-            NodeBlock current_block;
-            u32 current_label = static_cast<u32>(exit_branch);
-            for (const auto& block : blocks) {
-                if (shader_info.labels.contains(block.start)) {
-                    insert_block(current_block, current_label);
-                    current_block.clear();
-                    current_label = block.start;
-                }
-                if (!block.ignore_branch) {
-                    DecodeRangeInner(current_block, block.start, block.end);
-                    InsertControlFlow(current_block, block);
-                } else {
-                    DecodeRangeInner(current_block, block.start, block.end + 1);
-                }
-            }
-            insert_block(current_block, current_label);
-            break;
-        }
-        case CompileDepth::DecompileBackwards:
-        case CompileDepth::FullDecompile: {
-            program_manager = std::move(shader_info.manager);
-            disable_flow_stack = true;
-            decompiled = true;
-            ASTDecoder decoder{*this};
-            ASTNode program = program_manager.GetProgram();
-            decoder.Visit(program);
-            break;
-        }
-        default:
-            LOG_CRITICAL(HW_GPU, "Unknown decompilation mode!");
-            [[fallthrough]];
-        case CompileDepth::BruteForce: {
-            const auto shader_end = static_cast<u32>(program_code.size());
-            coverage_begin = main_offset;
-            coverage_end = shader_end;
-            for (u32 label = main_offset; label < shader_end; ++label) {
-                basic_blocks.insert({label, DecodeRange(label, label + 1)});
-            }
-            break;
-        }
-        }
-        if (settings.depth != shader_info.settings.depth) {
-            LOG_WARNING(
-                HW_GPU,
-                "Decompiling to this setting \"{}\" failed, downgrading to this setting \"{}\"",
-                CompileDepthAsString(settings.depth),
-                CompileDepthAsString(shader_info.settings.depth));
-        }
-    });
-    const auto gen_function =
-        ([this](ShaderFunction& shader_info, u32 id) -> std::shared_ptr<ShaderFunctionIR> {
-            std::shared_ptr<ShaderFunctionIR> result;
-            if (decompiled) {
-                result = std::make_shared<ShaderFunctionIR>(std::move(program_manager), id,
-                                                            shader_info.start, shader_info.end);
-            } else {
-                result =
-                    std::make_shared<ShaderFunctionIR>(std::move(basic_blocks), disable_flow_stack,
-                                                       id, shader_info.start, shader_info.end);
-            }
-            decompiled = false;
-            disable_flow_stack = false;
-            basic_blocks.clear();
-            program_manager.Clear();
-            return result;
-        });
     std::memcpy(&header, program_code.data(), sizeof(Tegra::Shader::Header));
 
     decompiled = false;
     auto info = ScanFlow(program_code, main_offset, settings, registry);
-    u32 id_start = 1;
+    auto& shader_info = *info;
-    for (auto& pair : info->subfunctions) {
+    coverage_begin = shader_info.start;
-        func_map.emplace(pair.first, id_start);
+    coverage_end = shader_info.end;
-        id_start++;
+    switch (shader_info.settings.depth) {
+    case CompileDepth::FlowStack: {
+        for (const auto& block : shader_info.blocks) {
+            basic_blocks.insert({block.start, DecodeRange(block.start, block.end + 1)});
+        }
+        break;
     }
-    coverage_begin = info->main.start;
+    case CompileDepth::NoFlowStack: {
-    coverage_end = 0;
+        disable_flow_stack = true;
-    decode_function(info->main);
+        const auto insert_block = [this](NodeBlock& nodes, u32 label) {
-    main_function = gen_function(info->main, 0);
+            if (label == static_cast<u32>(exit_branch)) {
-    subfunctions.resize(info->subfunctions.size());
+                return;
-    for (auto& pair : info->subfunctions) {
+            }
-        auto& func_info = pair.second;
+            basic_blocks.insert({label, nodes});
-        decode_function(func_info);
+        };
-        u32 id = func_map[pair.first];
+        const auto& blocks = shader_info.blocks;
-        subfunctions[id - 1] = gen_function(func_info, id);
+        NodeBlock current_block;
+        u32 current_label = static_cast<u32>(exit_branch);
+        for (const auto& block : blocks) {
+            if (shader_info.labels.contains(block.start)) {
+                insert_block(current_block, current_label);
+                current_block.clear();
+                current_label = block.start;
+            }
+            if (!block.ignore_branch) {
+                DecodeRangeInner(current_block, block.start, block.end);
+                InsertControlFlow(current_block, block);
+            } else {
+                DecodeRangeInner(current_block, block.start, block.end + 1);
+            }
+        }
+        insert_block(current_block, current_label);
+        break;
+    }
+    case CompileDepth::DecompileBackwards:
+    case CompileDepth::FullDecompile: {
+        program_manager = std::move(shader_info.manager);
+        disable_flow_stack = true;
+        decompiled = true;
+        ASTDecoder decoder{*this};
+        ASTNode program = GetASTProgram();
+        decoder.Visit(program);
+        break;
+    }
+    default:
+        LOG_CRITICAL(HW_GPU, "Unknown decompilation mode!");
+        [[fallthrough]];
+    case CompileDepth::BruteForce: {
+        const auto shader_end = static_cast<u32>(program_code.size());
+        coverage_begin = main_offset;
+        coverage_end = shader_end;
+        for (u32 label = main_offset; label < shader_end; ++label) {
+            basic_blocks.insert({label, DecodeRange(label, label + 1)});
+        }
+        break;
+    }
+    }
+    if (settings.depth != shader_info.settings.depth) {
+        LOG_WARNING(
+            HW_GPU, "Decompiling to this setting \"{}\" failed, downgrading to this setting \"{}\"",
+            CompileDepthAsString(settings.depth), CompileDepthAsString(shader_info.settings.depth));
     }
 }
 

src/video_core/shader/decode/other.cpp

@@ -33,7 +33,6 @@ u32 ShaderIR::DecodeOther(NodeBlock& bb, u32 pc) {
         // With the previous preconditions, this instruction is a no-operation.
         break;
     }
-    case OpCode::Id::RET:
     case OpCode::Id::EXIT: {
         const ConditionCode cc = instr.flow_condition_code;
         UNIMPLEMENTED_IF_MSG(cc != ConditionCode::T, "EXIT condition code used: {}", cc);
@@ -313,16 +312,6 @@ u32 ShaderIR::DecodeOther(NodeBlock& bb, u32 pc) {
         LOG_DEBUG(HW_GPU, "DEPBAR instruction is stubbed");
         break;
     }
-    case OpCode::Id::CAL: {
-        const u32 target = pc + instr.bra.GetBranchTarget();
-        const auto it = func_map.find(target);
-        if (it == func_map.end()) {
-            UNREACHABLE();
-            break;
-        }
-        bb.push_back(FunctionCall(it->second));
-        break;
-    }
     default:
         UNIMPLEMENTED_MSG("Unhandled instruction: {}", opcode->get().GetName());
     }

src/video_core/shader/decode/texture.cpp

@@ -339,6 +339,8 @@ u32 ShaderIR::DecodeTexture(NodeBlock& bb, u32 pc) {
         const TextureType texture_type{instr.tlds.GetTextureType()};
         const bool is_array{instr.tlds.IsArrayTexture()};
 
+        UNIMPLEMENTED_IF_MSG(instr.tlds.UsesMiscMode(TextureMiscMode::AOFFI),
+                             "AOFFI is not implemented");
         UNIMPLEMENTED_IF_MSG(instr.tlds.UsesMiscMode(TextureMiscMode::MZ), "MZ is not implemented");
 
         const Node4 components = GetTldsCode(instr, texture_type, is_array);
@@ -820,7 +822,7 @@ Node4 ShaderIR::GetTldsCode(Instruction instr, TextureType texture_type, bool is
     for (std::size_t i = 0; i < type_coord_count; ++i) {
         const bool last = (i == (type_coord_count - 1)) && (type_coord_count > 1);
         coords.push_back(
-            GetRegister(last && !aoffi_enabled ? last_coord_register : (coord_register + i)));
+            GetRegister(last && !aoffi_enabled ? last_coord_register : coord_register + i));
     }
 
     const Node array = is_array ? GetRegister(array_register) : nullptr;

src/video_core/shader/node.h

@@ -267,11 +267,10 @@ class PatchNode;
 class SmemNode;
 class GmemNode;
 class CommentNode;
-class FunctionCallNode;
 
 using NodeData = std::variant<OperationNode, ConditionalNode, GprNode, CustomVarNode, ImmediateNode,
                               InternalFlagNode, PredicateNode, AbufNode, PatchNode, CbufNode,
-                              LmemNode, SmemNode, GmemNode, FunctionCallNode, CommentNode>;
+                              LmemNode, SmemNode, GmemNode, CommentNode>;
 using Node = std::shared_ptr<NodeData>;
 using Node4 = std::array<Node, 4>;
 using NodeBlock = std::vector<Node>;
@@ -495,18 +494,6 @@ private:
     std::vector<Node> code; ///< Code to execute
 };
 
-class FunctionCallNode final : public AmendNode {
-public:
-    explicit FunctionCallNode(u32 func_id_) : func_id{func_id_} {}
-
-    [[nodiscard]] u32 GetFuncId() const {
-        return func_id;
-    }
-
-private:
-    u32 func_id; ///< Id of the function to call
-};
-
 /// A general purpose register
 class GprNode final {
 public:

src/video_core/shader/node_helper.cpp

@@ -19,11 +19,6 @@ Node Comment(std::string text) {
     return MakeNode<CommentNode>(std::move(text));
 }
 
-/// Creates a function call
-Node FunctionCall(u32 func_id) {
-    return MakeNode<FunctionCallNode>(func_id);
-}
-
 Node Immediate(u32 value) {
     return MakeNode<ImmediateNode>(value);
 }

src/video_core/shader/node_helper.h

@@ -27,9 +27,6 @@ Node Conditional(Node condition, std::vector<Node> code);
 /// Creates a commentary node
 Node Comment(std::string text);
 
-/// Creates a function call
-Node FunctionCall(u32 func_id);
-
 /// Creates an u32 immediate
 Node Immediate(u32 value);
 

src/video_core/shader/shader_ir.h

@@ -26,7 +26,7 @@ namespace VideoCommon::Shader {
 
 struct ShaderBlock;
 
-constexpr u32 MAX_PROGRAM_LENGTH = 0x2000;
+constexpr u32 MAX_PROGRAM_LENGTH = 0x1000;
 
 struct ConstBuffer {
     constexpr explicit ConstBuffer(u32 max_offset_, bool is_indirect_)
@@ -64,68 +64,16 @@ struct GlobalMemoryUsage {
     bool is_written{};
 };
 
-class ShaderFunctionIR final {
-public:
-    explicit ShaderFunctionIR(std::map<u32, NodeBlock>&& basic_blocks_, bool disable_flow_stack_,
-                              u32 id_, u32 coverage_begin_, u32 coverage_end_)
-        : basic_blocks{std::move(basic_blocks_)}, decompiled{false},
-          disable_flow_stack{disable_flow_stack_}, id{id_}, coverage_begin{coverage_begin_},
-          coverage_end{coverage_end_} {}
-    explicit ShaderFunctionIR(ASTManager&& program_manager_, u32 id_, u32 coverage_begin_,
-                              u32 coverage_end_)
-        : program_manager{std::move(program_manager_)}, decompiled{true}, disable_flow_stack{true},
-          id{id_}, coverage_begin{coverage_begin_}, coverage_end{coverage_end_} {}
-
-    const std::map<u32, NodeBlock>& GetBasicBlocks() const {
-        return basic_blocks;
-    }
-
-    [[nodiscard]] bool IsFlowStackDisabled() const {
-        return disable_flow_stack;
-    }
-
-    [[nodiscard]] bool IsDecompiled() const {
-        return decompiled;
-    }
-
-    const ASTManager& GetASTManager() const {
-        return program_manager;
-    }
-
-    [[nodiscard]] ASTNode GetASTProgram() const {
-        return program_manager.GetProgram();
-    }
-
-    [[nodiscard]] u32 GetASTNumVariables() const {
-        return program_manager.GetVariables();
-    }
-
-    [[nodiscard]] bool IsMain() const {
-        return id == 0;
-    }
-
-    [[nodiscard]] u32 GetId() const {
-        return id;
-    }
-
-private:
-    std::map<u32, NodeBlock> basic_blocks;
-    ASTManager program_manager{true, true};
-
-    bool decompiled{};
-    bool disable_flow_stack{};
-    u32 id{};
-
-    u32 coverage_begin{};
-    u32 coverage_end{};
-};
-
 class ShaderIR final {
 public:
     explicit ShaderIR(const ProgramCode& program_code_, u32 main_offset_,
                       CompilerSettings settings_, Registry& registry_);
     ~ShaderIR();
 
+    const std::map<u32, NodeBlock>& GetBasicBlocks() const {
+        return basic_blocks;
+    }
+
     const std::set<u32>& GetRegisters() const {
         return used_registers;
     }
@@ -207,6 +155,26 @@ public:
         return header;
     }
 
+    bool IsFlowStackDisabled() const {
+        return disable_flow_stack;
+    }
+
+    bool IsDecompiled() const {
+        return decompiled;
+    }
+
+    const ASTManager& GetASTManager() const {
+        return program_manager;
+    }
+
+    ASTNode GetASTProgram() const {
+        return program_manager.GetProgram();
+    }
+
+    u32 GetASTNumVariables() const {
+        return program_manager.GetVariables();
+    }
+
     u32 ConvertAddressToNvidiaSpace(u32 address) const {
         return (address - main_offset) * static_cast<u32>(sizeof(Tegra::Shader::Instruction));
     }
@@ -222,16 +190,7 @@ public:
         return num_custom_variables;
     }
 
-    std::shared_ptr<ShaderFunctionIR> GetMainFunction() const {
-        return main_function;
-    }
-
-    const std::vector<std::shared_ptr<ShaderFunctionIR>>& GetSubFunctions() const {
-        return subfunctions;
-    }
-
 private:
-    friend class ExprDecoder;
     friend class ASTDecoder;
 
     struct SamplerInfo {
@@ -494,10 +453,6 @@ private:
     std::vector<Node> amend_code;
     u32 num_custom_variables{};
 
-    std::shared_ptr<ShaderFunctionIR> main_function;
-    std::vector<std::shared_ptr<ShaderFunctionIR>> subfunctions;
-    std::unordered_map<u32, u32> func_map;
-
     std::set<u32> used_registers;
     std::set<Tegra::Shader::Pred> used_predicates;
     std::set<Tegra::Shader::Attribute::Index> used_input_attributes;

src/yuzu/CMakeLists.txt

@@ -18,7 +18,6 @@ add_executable(yuzu
     applets/profile_select.h
     applets/software_keyboard.cpp
     applets/software_keyboard.h
-    applets/software_keyboard.ui
     applets/web_browser.cpp
     applets/web_browser.h
     bootmanager.cpp
@@ -144,9 +143,6 @@ add_executable(yuzu
     uisettings.h
     util/limitable_input_dialog.cpp
     util/limitable_input_dialog.h
-    util/overlay_dialog.cpp
-    util/overlay_dialog.h
-    util/overlay_dialog.ui
     util/sequence_dialog/sequence_dialog.cpp
     util/sequence_dialog/sequence_dialog.h
     util/url_request_interceptor.cpp

src/yuzu/applets/error.cpp

@@ -19,11 +19,11 @@ QtErrorDisplay::~QtErrorDisplay() = default;
 void QtErrorDisplay::ShowError(ResultCode error, std::function<void()> finished) const {
     callback = std::move(finished);
     emit MainWindowDisplayError(
-        tr("Error Code: %1-%2 (0x%3)")
+        tr("An error has occurred.\nPlease try again or contact the developer of the "
+           "software.\n\nError Code: %1-%2 (0x%3)")
             .arg(static_cast<u32>(error.module.Value()) + 2000, 4, 10, QChar::fromLatin1('0'))
             .arg(error.description, 4, 10, QChar::fromLatin1('0'))
-            .arg(error.raw, 8, 16, QChar::fromLatin1('0')),
+            .arg(error.raw, 8, 16, QChar::fromLatin1('0')));
-        tr("An error has occurred.\nPlease try again or contact the developer of the software."));
 }
 
 void QtErrorDisplay::ShowErrorWithTimestamp(ResultCode error, std::chrono::seconds time,
@@ -32,14 +32,13 @@ void QtErrorDisplay::ShowErrorWithTimestamp(ResultCode error, std::chrono::secon
 
     const QDateTime date_time = QDateTime::fromSecsSinceEpoch(time.count());
     emit MainWindowDisplayError(
-        tr("Error Code: %1-%2 (0x%3)")
+        tr("An error occurred on %1 at %2.\nPlease try again or contact the "
+           "developer of the software.\n\nError Code: %3-%4 (0x%5)")
+            .arg(date_time.toString(QStringLiteral("dddd, MMMM d, yyyy")))
+            .arg(date_time.toString(QStringLiteral("h:mm:ss A")))
             .arg(static_cast<u32>(error.module.Value()) + 2000, 4, 10, QChar::fromLatin1('0'))
             .arg(error.description, 4, 10, QChar::fromLatin1('0'))
-            .arg(error.raw, 8, 16, QChar::fromLatin1('0')),
+            .arg(error.raw, 8, 16, QChar::fromLatin1('0')));
-        tr("An error occurred on %1 at %2.\nPlease try again or contact the developer of the "
-           "software.")
-            .arg(date_time.toString(QStringLiteral("dddd, MMMM d, yyyy")))
-            .arg(date_time.toString(QStringLiteral("h:mm:ss A"))));
 }
 
 void QtErrorDisplay::ShowCustomErrorText(ResultCode error, std::string dialog_text,
@@ -47,11 +46,10 @@ void QtErrorDisplay::ShowCustomErrorText(ResultCode error, std::string dialog_te
                                          std::function<void()> finished) const {
     callback = std::move(finished);
     emit MainWindowDisplayError(
-        tr("Error Code: %1-%2 (0x%3)")
+        tr("An error has occurred.\nError Code: %1-%2 (0x%3)\n\n%4\n\n%5")
             .arg(static_cast<u32>(error.module.Value()) + 2000, 4, 10, QChar::fromLatin1('0'))
             .arg(error.description, 4, 10, QChar::fromLatin1('0'))
-            .arg(error.raw, 8, 16, QChar::fromLatin1('0')),
+            .arg(error.raw, 8, 16, QChar::fromLatin1('0'))
-        tr("An error has occurred.\n\n%1\n\n%2")
             .arg(QString::fromStdString(dialog_text))
             .arg(QString::fromStdString(fullscreen_text)));
 }

src/yuzu/applets/error.h

@@ -24,7 +24,7 @@ public:
                              std::function<void()> finished) const override;
 
 signals:
-    void MainWindowDisplayError(QString error_code, QString error_text) const;
+    void MainWindowDisplayError(QString error) const;
 
 private:
     void MainWindowFinishedError();

src/yuzu/applets/software_keyboard.h

@@ -1,228 +1,54 @@
-// Copyright 2021 yuzu Emulator Project
+// Copyright 2018 yuzu Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
 #pragma once
 
-#include <array>
-#include <atomic>
-#include <memory>
-#include <thread>
-
 #include <QDialog>
 #include <QValidator>
-
 #include "core/frontend/applets/software_keyboard.h"
 
-enum class HIDButton : u8;
-
-class InputInterpreter;
-
-namespace Core {
-class System;
-}
-
-namespace Ui {
-class QtSoftwareKeyboardDialog;
-}
-
 class GMainWindow;
+class QDialogButtonBox;
+class QLabel;
+class QLineEdit;
+class QVBoxLayout;
+class QtSoftwareKeyboard;
+
+class QtSoftwareKeyboardValidator final : public QValidator {
+public:
+    explicit QtSoftwareKeyboardValidator(Core::Frontend::SoftwareKeyboardParameters parameters);
+    State validate(QString& input, int& pos) const override;
+
+private:
+    Core::Frontend::SoftwareKeyboardParameters parameters;
+};
 
 class QtSoftwareKeyboardDialog final : public QDialog {
     Q_OBJECT
 
 public:
-    QtSoftwareKeyboardDialog(QWidget* parent, Core::System& system_, bool is_inline_,
+    QtSoftwareKeyboardDialog(QWidget* parent,
-                             Core::Frontend::KeyboardInitializeParameters initialize_parameters_);
+                             Core::Frontend::SoftwareKeyboardParameters parameters);
     ~QtSoftwareKeyboardDialog() override;
 
-    void ShowNormalKeyboard(QPoint pos, QSize size);
+    void accept() override;
-
-    void ShowTextCheckDialog(Service::AM::Applets::SwkbdTextCheckResult text_check_result,
-                             std::u16string text_check_message);
-
-    void ShowInlineKeyboard(Core::Frontend::InlineAppearParameters appear_parameters, QPoint pos,
-                            QSize size);
-
-    void HideInlineKeyboard();
-
-    void InlineTextChanged(Core::Frontend::InlineTextParameters text_parameters);
-
-    void ExitKeyboard();
-
-signals:
-    void SubmitNormalText(Service::AM::Applets::SwkbdResult result,
-                          std::u16string submitted_text) const;
-
-    void SubmitInlineText(Service::AM::Applets::SwkbdReplyType reply_type,
-                          std::u16string submitted_text, s32 cursor_position) const;
-
-public slots:
-    void open() override;
     void reject() override;
 
-protected:
+    std::u16string GetText() const;
-    /// We override the keyPressEvent for inputting text into the inline software keyboard.
-    void keyPressEvent(QKeyEvent* event) override;
 
 private:
-    enum class Direction {
+    std::u16string text;
-        Left,
-        Up,
-        Right,
-        Down,
-    };
 
-    enum class BottomOSKIndex {
+    QDialogButtonBox* buttons;
-        LowerCase,
+    QLabel* header_label;
-        UpperCase,
+    QLabel* sub_label;
-        NumberPad,
+    QLabel* guide_label;
-    };
+    QLabel* length_label;
+    QLineEdit* line_edit;
+    QVBoxLayout* layout;
 
-    /**
+    Core::Frontend::SoftwareKeyboardParameters parameters;
-     * Moves and resizes the window to a specified position and size.
-     *
-     * @param pos Top-left window position
-     * @param size Window size
-     */
-    void MoveAndResizeWindow(QPoint pos, QSize size);
-
-    /**
-     * Rescales all keyboard elements to account for High DPI displays.
-     *
-     * @param width Window width
-     * @param height Window height
-     * @param dpi_scale Display scaling factor
-     */
-    void RescaleKeyboardElements(float width, float height, float dpi_scale);
-
-    /// Sets the keyboard type based on initialize_parameters.
-    void SetKeyboardType();
-
-    /// Sets the password mode based on initialize_parameters.
-    void SetPasswordMode();
-
-    /// Sets the text draw type based on initialize_parameters.
-    void SetTextDrawType();
-
-    /// Sets the controller image at the bottom left of the software keyboard.
-    void SetControllerImage();
-
-    /// Disables buttons based on initialize_parameters.
-    void DisableKeyboardButtons();
-
-    /// Changes whether the backspace or/and ok buttons should be enabled or disabled.
-    void SetBackspaceOkEnabled();
-
-    /**
-     * Validates the input text sent in based on the parameters in initialize_parameters.
-     *
-     * @param input_text Input text
-     *
-     * @returns True if the input text is valid, false otherwise.
-     */
-    bool ValidateInputText(const QString& input_text);
-
-    /// Switches between LowerCase and UpperCase (Shift and Caps Lock)
-    void ChangeBottomOSKIndex();
-
-    /// Processes a keyboard button click from the UI as normal keyboard input.
-    void NormalKeyboardButtonClicked(QPushButton* button);
-
-    /// Processes a keyboard button click from the UI as inline keyboard input.
-    void InlineKeyboardButtonClicked(QPushButton* button);
-
-    /**
-     * Inserts a string of arbitrary length into the current_text at the current cursor position.
-     * This is only used for the inline software keyboard.
-     */
-    void InlineTextInsertString(std::u16string_view string);
-
-    /// Setup the mouse hover workaround for "focusing" buttons. This should only be called once.
-    void SetupMouseHover();
-
-    /**
-     * Handles button presses and converts them into keyboard input.
-     *
-     * @tparam HIDButton The list of buttons that can be converted into keyboard input.
-     */
-    template <HIDButton... T>
-    void HandleButtonPressedOnce();
-
-    /**
-     * Handles button holds and converts them into keyboard input.
-     *
-     * @tparam HIDButton The list of buttons that can be converted into keyboard input.
-     */
-    template <HIDButton... T>
-    void HandleButtonHold();
-
-    /**
-     * Translates a button press to focus or click a keyboard button.
-     *
-     * @param button The button press to process.
-     */
-    void TranslateButtonPress(HIDButton button);
-
-    /**
-     * Moves the focus of a button in a certain direction.
-     *
-     * @param direction The direction to move.
-     */
-    void MoveButtonDirection(Direction direction);
-
-    /**
-     * Moves the text cursor in a certain direction.
-     *
-     * @param direction The direction to move.
-     */
-    void MoveTextCursorDirection(Direction direction);
-
-    void StartInputThread();
-    void StopInputThread();
-
-    /// The thread where input is being polled and processed.
-    void InputThread();
-
-    std::unique_ptr<Ui::QtSoftwareKeyboardDialog> ui;
-
-    Core::System& system;
-
-    // True if it is the inline software keyboard.
-    bool is_inline;
-
-    // Common software keyboard initialize parameters.
-    Core::Frontend::KeyboardInitializeParameters initialize_parameters;
-
-    // Used only by the inline software keyboard since the QLineEdit or QTextEdit is hidden.
-    std::u16string current_text;
-    s32 cursor_position{0};
-
-    static constexpr std::size_t NUM_ROWS_NORMAL = 5;
-    static constexpr std::size_t NUM_COLUMNS_NORMAL = 12;
-    static constexpr std::size_t NUM_ROWS_NUMPAD = 4;
-    static constexpr std::size_t NUM_COLUMNS_NUMPAD = 4;
-
-    // Stores the normal keyboard layout.
-    std::array<std::array<std::array<QPushButton*, NUM_COLUMNS_NORMAL>, NUM_ROWS_NORMAL>, 2>
-        keyboard_buttons;
-    // Stores the numberpad keyboard layout.
-    std::array<std::array<QPushButton*, NUM_COLUMNS_NUMPAD>, NUM_ROWS_NUMPAD> numberpad_buttons;
-
-    // Contains a set of all buttons used in keyboard_buttons and numberpad_buttons.
-    std::array<QPushButton*, 110> all_buttons;
-
-    std::size_t row{0};
-    std::size_t column{0};
-
-    BottomOSKIndex bottom_osk_index{BottomOSKIndex::LowerCase};
-    std::atomic<bool> caps_lock_enabled{false};
-
-    std::unique_ptr<InputInterpreter> input_interpreter;
-
-    std::thread input_thread;
-
-    std::atomic<bool> input_thread_running{};
 };
 
 class QtSoftwareKeyboard final : public QObject, public Core::Frontend::SoftwareKeyboardApplet {
@@ -232,54 +58,19 @@ public:
     explicit QtSoftwareKeyboard(GMainWindow& parent);
     ~QtSoftwareKeyboard() override;
 
-    void InitializeKeyboard(
+    void RequestText(std::function<void(std::optional<std::u16string>)> out,
-        bool is_inline, Core::Frontend::KeyboardInitializeParameters initialize_parameters,
+                     Core::Frontend::SoftwareKeyboardParameters parameters) const override;
-        std::function<void(Service::AM::Applets::SwkbdResult, std::u16string)>
+    void SendTextCheckDialog(std::u16string error_message,
-            submit_normal_callback_,
+                             std::function<void()> finished_check_) const override;
-        std::function<void(Service::AM::Applets::SwkbdReplyType, std::u16string, s32)>
-            submit_inline_callback_) override;
-
-    void ShowNormalKeyboard() const override;
-
-    void ShowTextCheckDialog(Service::AM::Applets::SwkbdTextCheckResult text_check_result,
-                             std::u16string text_check_message) const override;
-
-    void ShowInlineKeyboard(
-        Core::Frontend::InlineAppearParameters appear_parameters) const override;
-
-    void HideInlineKeyboard() const override;
-
-    void InlineTextChanged(Core::Frontend::InlineTextParameters text_parameters) const override;
-
-    void ExitKeyboard() const override;
 
 signals:
-    void MainWindowInitializeKeyboard(
+    void MainWindowGetText(Core::Frontend::SoftwareKeyboardParameters parameters) const;
-        bool is_inline, Core::Frontend::KeyboardInitializeParameters initialize_parameters) const;
+    void MainWindowTextCheckDialog(std::u16string error_message) const;
-
-    void MainWindowShowNormalKeyboard() const;
-
-    void MainWindowShowTextCheckDialog(Service::AM::Applets::SwkbdTextCheckResult text_check_result,
-                                       std::u16string text_check_message) const;
-
-    void MainWindowShowInlineKeyboard(
-        Core::Frontend::InlineAppearParameters appear_parameters) const;
-
-    void MainWindowHideInlineKeyboard() const;
-
-    void MainWindowInlineTextChanged(Core::Frontend::InlineTextParameters text_parameters) const;
-
-    void MainWindowExitKeyboard() const;
 
 private:
-    void SubmitNormalText(Service::AM::Applets::SwkbdResult result,
+    void MainWindowFinishedText(std::optional<std::u16string> text);
-                          std::u16string submitted_text) const;
+    void MainWindowFinishedCheckDialog();
 
-    void SubmitInlineText(Service::AM::Applets::SwkbdReplyType reply_type,
+    mutable std::function<void(std::optional<std::u16string>)> text_output;
-                          std::u16string submitted_text, s32 cursor_position) const;
+    mutable std::function<void()> finished_check;
-
-    mutable std::function<void(Service::AM::Applets::SwkbdResult, std::u16string)>
-        submit_normal_callback;
-    mutable std::function<void(Service::AM::Applets::SwkbdReplyType, std::u16string, s32)>
-        submit_inline_callback;
 };

src/yuzu/discord_impl.cpp

@@ -38,7 +38,7 @@ void DiscordImpl::Update() {
     if (Core::System::GetInstance().IsPoweredOn())
         Core::System::GetInstance().GetAppLoader().ReadTitle(title);
     DiscordRichPresence presence{};
-    presence.largeImageKey = "yuzu_logo_ea";
+    presence.largeImageKey = "yuzu_logo";
     presence.largeImageText = "yuzu is an emulator for the Nintendo Switch";
     if (Core::System::GetInstance().IsPoweredOn()) {
         presence.state = title.c_str();

src/yuzu/main.cpp

@@ -101,7 +101,6 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual
 #include "core/settings.h"
 #include "core/telemetry_session.h"
 #include "input_common/main.h"
-#include "util/overlay_dialog.h"
 #include "video_core/gpu.h"
 #include "video_core/shader_notify.h"
 #include "yuzu/about_dialog.h"
@@ -226,8 +225,6 @@ GMainWindow::GMainWindow()
     SetDiscordEnabled(UISettings::values.enable_discord_presence);
     discord_rpc->Update();
 
-    RegisterMetaTypes();
-
     InitializeWidgets();
     InitializeDebugWidgets();
     InitializeRecentFileMenuActions();
@@ -376,55 +373,6 @@ GMainWindow::~GMainWindow() {
         delete render_window;
 }
 
-void GMainWindow::RegisterMetaTypes() {
-    // Register integral and floating point types
-    qRegisterMetaType<u8>("u8");
-    qRegisterMetaType<u16>("u16");
-    qRegisterMetaType<u32>("u32");
-    qRegisterMetaType<u64>("u64");
-    qRegisterMetaType<u128>("u128");
-    qRegisterMetaType<s8>("s8");
-    qRegisterMetaType<s16>("s16");
-    qRegisterMetaType<s32>("s32");
-    qRegisterMetaType<s64>("s64");
-    qRegisterMetaType<f32>("f32");
-    qRegisterMetaType<f64>("f64");
-
-    // Register string types
-    qRegisterMetaType<std::string>("std::string");
-    qRegisterMetaType<std::wstring>("std::wstring");
-    qRegisterMetaType<std::u8string>("std::u8string");
-    qRegisterMetaType<std::u16string>("std::u16string");
-    qRegisterMetaType<std::u32string>("std::u32string");
-    qRegisterMetaType<std::string_view>("std::string_view");
-    qRegisterMetaType<std::wstring_view>("std::wstring_view");
-    qRegisterMetaType<std::u8string_view>("std::u8string_view");
-    qRegisterMetaType<std::u16string_view>("std::u16string_view");
-    qRegisterMetaType<std::u32string_view>("std::u32string_view");
-
-    // Register applet types
-
-    // Controller Applet
-    qRegisterMetaType<Core::Frontend::ControllerParameters>("Core::Frontend::ControllerParameters");
-
-    // Software Keyboard Applet
-    qRegisterMetaType<Core::Frontend::KeyboardInitializeParameters>(
-        "Core::Frontend::KeyboardInitializeParameters");
-    qRegisterMetaType<Core::Frontend::InlineAppearParameters>(
-        "Core::Frontend::InlineAppearParameters");
-    qRegisterMetaType<Core::Frontend::InlineTextParameters>("Core::Frontend::InlineTextParameters");
-    qRegisterMetaType<Service::AM::Applets::SwkbdResult>("Service::AM::Applets::SwkbdResult");
-    qRegisterMetaType<Service::AM::Applets::SwkbdTextCheckResult>(
-        "Service::AM::Applets::SwkbdTextCheckResult");
-    qRegisterMetaType<Service::AM::Applets::SwkbdReplyType>("Service::AM::Applets::SwkbdReplyType");
-
-    // Web Browser Applet
-    qRegisterMetaType<Service::AM::Applets::WebExitReason>("Service::AM::Applets::WebExitReason");
-
-    // Register loader types
-    qRegisterMetaType<Core::System::ResultStatus>("Core::System::ResultStatus");
-}
-
 void GMainWindow::ControllerSelectorReconfigureControllers(
     const Core::Frontend::ControllerParameters& parameters) {
     QtControllerSelectorDialog dialog(this, parameters, input_subsystem.get());
@@ -464,112 +412,25 @@ void GMainWindow::ProfileSelectorSelectProfile() {
     emit ProfileSelectorFinishedSelection(uuid);
 }
 
-void GMainWindow::SoftwareKeyboardInitialize(
+void GMainWindow::SoftwareKeyboardGetText(
-    bool is_inline, Core::Frontend::KeyboardInitializeParameters initialize_parameters) {
+    const Core::Frontend::SoftwareKeyboardParameters& parameters) {
-    if (software_keyboard) {
+    QtSoftwareKeyboardDialog dialog(this, parameters);
-        LOG_ERROR(Frontend, "The software keyboard is already initialized!");
+    dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint |
+                          Qt::WindowTitleHint | Qt::WindowSystemMenuHint |
+                          Qt::WindowCloseButtonHint);
+    dialog.setWindowModality(Qt::WindowModal);
+
+    if (dialog.exec() == QDialog::Rejected) {
+        emit SoftwareKeyboardFinishedText(std::nullopt);
         return;
     }
 
-    software_keyboard = new QtSoftwareKeyboardDialog(render_window, Core::System::GetInstance(),
+    emit SoftwareKeyboardFinishedText(dialog.GetText());
-                                                     is_inline, std::move(initialize_parameters));
-
-    if (is_inline) {
-        connect(
-            software_keyboard, &QtSoftwareKeyboardDialog::SubmitInlineText, this,
-            [this](Service::AM::Applets::SwkbdReplyType reply_type, std::u16string submitted_text,
-                   s32 cursor_position) {
-                emit SoftwareKeyboardSubmitInlineText(reply_type, submitted_text, cursor_position);
-            },
-            Qt::QueuedConnection);
-    } else {
-        connect(
-            software_keyboard, &QtSoftwareKeyboardDialog::SubmitNormalText, this,
-            [this](Service::AM::Applets::SwkbdResult result, std::u16string submitted_text) {
-                emit SoftwareKeyboardSubmitNormalText(result, submitted_text);
-            },
-            Qt::QueuedConnection);
-    }
 }
 
-void GMainWindow::SoftwareKeyboardShowNormal() {
+void GMainWindow::SoftwareKeyboardInvokeCheckDialog(std::u16string error_message) {
-    if (!software_keyboard) {
+    QMessageBox::warning(this, tr("Text Check Failed"), QString::fromStdU16String(error_message));
-        LOG_ERROR(Frontend, "The software keyboard is not initialized!");
+    emit SoftwareKeyboardFinishedCheckDialog();
-        return;
-    }
-
-    const auto& layout = render_window->GetFramebufferLayout();
-
-    const auto x = layout.screen.left;
-    const auto y = layout.screen.top;
-    const auto w = layout.screen.GetWidth();
-    const auto h = layout.screen.GetHeight();
-
-    software_keyboard->ShowNormalKeyboard(render_window->mapToGlobal(QPoint(x, y)), QSize(w, h));
-}
-
-void GMainWindow::SoftwareKeyboardShowTextCheck(
-    Service::AM::Applets::SwkbdTextCheckResult text_check_result,
-    std::u16string text_check_message) {
-    if (!software_keyboard) {
-        LOG_ERROR(Frontend, "The software keyboard is not initialized!");
-        return;
-    }
-
-    software_keyboard->ShowTextCheckDialog(text_check_result, text_check_message);
-}
-
-void GMainWindow::SoftwareKeyboardShowInline(
-    Core::Frontend::InlineAppearParameters appear_parameters) {
-    if (!software_keyboard) {
-        LOG_ERROR(Frontend, "The software keyboard is not initialized!");
-        return;
-    }
-
-    const auto& layout = render_window->GetFramebufferLayout();
-
-    const auto x =
-        static_cast<int>(layout.screen.left + (0.5f * layout.screen.GetWidth() *
-                                               ((2.0f * appear_parameters.key_top_translate_x) +
-                                                (1.0f - appear_parameters.key_top_scale_x))));
-    const auto y =
-        static_cast<int>(layout.screen.top + (layout.screen.GetHeight() *
-                                              ((2.0f * appear_parameters.key_top_translate_y) +
-                                               (1.0f - appear_parameters.key_top_scale_y))));
-    const auto w = static_cast<int>(layout.screen.GetWidth() * appear_parameters.key_top_scale_x);
-    const auto h = static_cast<int>(layout.screen.GetHeight() * appear_parameters.key_top_scale_y);
-
-    software_keyboard->ShowInlineKeyboard(std::move(appear_parameters),
-                                          render_window->mapToGlobal(QPoint(x, y)), QSize(w, h));
-}
-
-void GMainWindow::SoftwareKeyboardHideInline() {
-    if (!software_keyboard) {
-        LOG_ERROR(Frontend, "The software keyboard is not initialized!");
-        return;
-    }
-
-    software_keyboard->HideInlineKeyboard();
-}
-
-void GMainWindow::SoftwareKeyboardInlineTextChanged(
-    Core::Frontend::InlineTextParameters text_parameters) {
-    if (!software_keyboard) {
-        LOG_ERROR(Frontend, "The software keyboard is not initialized!");
-        return;
-    }
-
-    software_keyboard->InlineTextChanged(std::move(text_parameters));
-}
-
-void GMainWindow::SoftwareKeyboardExit() {
-    if (!software_keyboard) {
-        return;
-    }
-
-    software_keyboard->ExitKeyboard();
-
-    software_keyboard = nullptr;
 }
 
 void GMainWindow::WebBrowserOpenWebPage(std::string_view main_url, std::string_view additional_args,
@@ -1115,10 +976,6 @@ void GMainWindow::ConnectWidgetEvents() {
     connect(this, &GMainWindow::EmulationStopping, render_window,
             &GRenderWindow::OnEmulationStopping);
 
-    // Software Keyboard Applet
-    connect(this, &GMainWindow::EmulationStarting, this, &GMainWindow::SoftwareKeyboardExit);
-    connect(this, &GMainWindow::EmulationStopping, this, &GMainWindow::SoftwareKeyboardExit);
-
     connect(&status_bar_update_timer, &QTimer::timeout, this, &GMainWindow::UpdateStatusBar);
 }
 
@@ -2328,6 +2185,15 @@ void GMainWindow::OnStartGame() {
 
     emu_thread->SetRunning(true);
 
+    qRegisterMetaType<Core::Frontend::ControllerParameters>("Core::Frontend::ControllerParameters");
+    qRegisterMetaType<Core::Frontend::SoftwareKeyboardParameters>(
+        "Core::Frontend::SoftwareKeyboardParameters");
+    qRegisterMetaType<Core::System::ResultStatus>("Core::System::ResultStatus");
+    qRegisterMetaType<std::string>("std::string");
+    qRegisterMetaType<std::optional<std::u16string>>("std::optional<std::u16string>");
+    qRegisterMetaType<std::string_view>("std::string_view");
+    qRegisterMetaType<Service::AM::Applets::WebExitReason>("Service::AM::Applets::WebExitReason");
+
     connect(emu_thread.get(), &EmuThread::ErrorThrown, this, &GMainWindow::OnCoreError);
 
     ui.action_Start->setEnabled(false);
@@ -2376,11 +2242,8 @@ void GMainWindow::OnExecuteProgram(std::size_t program_index) {
     BootGame(last_filename_booted, program_index);
 }
 
-void GMainWindow::ErrorDisplayDisplayError(QString error_code, QString error_text) {
+void GMainWindow::ErrorDisplayDisplayError(QString body) {
-    OverlayDialog dialog(render_window, Core::System::GetInstance(), error_code, error_text,
+    QMessageBox::critical(this, tr("Error Display"), body);
-                         QString{}, tr("OK"), Qt::AlignLeft | Qt::AlignVCenter);
-    dialog.exec();
-
     emit ErrorDisplayFinished();
 }
 

src/yuzu/main.h

@@ -37,13 +37,9 @@ enum class GameListRemoveTarget;
 enum class InstalledEntryType;
 class GameListPlaceholder;
 
-class QtSoftwareKeyboardDialog;
-
 namespace Core::Frontend {
 struct ControllerParameters;
-struct InlineAppearParameters;
+struct SoftwareKeyboardParameters;
-struct InlineTextParameters;
-struct KeyboardInitializeParameters;
 } // namespace Core::Frontend
 
 namespace DiscordRPC {
@@ -61,11 +57,8 @@ class InputSubsystem;
 }
 
 namespace Service::AM::Applets {
-enum class SwkbdResult : u32;
-enum class SwkbdTextCheckResult : u32;
-enum class SwkbdReplyType : u32;
 enum class WebExitReason : u32;
-} // namespace Service::AM::Applets
+}
 
 enum class EmulatedDirectoryTarget {
     NAND,
@@ -135,10 +128,8 @@ signals:
 
     void ProfileSelectorFinishedSelection(std::optional<Common::UUID> uuid);
 
-    void SoftwareKeyboardSubmitNormalText(Service::AM::Applets::SwkbdResult result,
+    void SoftwareKeyboardFinishedText(std::optional<std::u16string> text);
-                                          std::u16string submitted_text);
+    void SoftwareKeyboardFinishedCheckDialog();
-    void SoftwareKeyboardSubmitInlineText(Service::AM::Applets::SwkbdReplyType reply_type,
-                                          std::u16string submitted_text, s32 cursor_position);
 
     void WebBrowserExtractOfflineRomFS();
     void WebBrowserClosed(Service::AM::Applets::WebExitReason exit_reason, std::string last_url);
@@ -148,24 +139,15 @@ public slots:
     void OnExecuteProgram(std::size_t program_index);
     void ControllerSelectorReconfigureControllers(
         const Core::Frontend::ControllerParameters& parameters);
-    void SoftwareKeyboardInitialize(
+    void ErrorDisplayDisplayError(QString body);
-        bool is_inline, Core::Frontend::KeyboardInitializeParameters initialize_parameters);
-    void SoftwareKeyboardShowNormal();
-    void SoftwareKeyboardShowTextCheck(Service::AM::Applets::SwkbdTextCheckResult text_check_result,
-                                       std::u16string text_check_message);
-    void SoftwareKeyboardShowInline(Core::Frontend::InlineAppearParameters appear_parameters);
-    void SoftwareKeyboardHideInline();
-    void SoftwareKeyboardInlineTextChanged(Core::Frontend::InlineTextParameters text_parameters);
-    void SoftwareKeyboardExit();
-    void ErrorDisplayDisplayError(QString error_code, QString error_text);
     void ProfileSelectorSelectProfile();
+    void SoftwareKeyboardGetText(const Core::Frontend::SoftwareKeyboardParameters& parameters);
+    void SoftwareKeyboardInvokeCheckDialog(std::u16string error_message);
     void WebBrowserOpenWebPage(std::string_view main_url, std::string_view additional_args,
                                bool is_local);
     void OnAppFocusStateChanged(Qt::ApplicationState state);
 
 private:
-    void RegisterMetaTypes();
-
     void InitializeWidgets();
     void InitializeDebugWidgets();
     void InitializeRecentFileMenuActions();
@@ -352,9 +334,6 @@ private:
     // Disables the web applet for the rest of the emulated session
     bool disable_web_applet{};
 
-    // Applets
-    QtSoftwareKeyboardDialog* software_keyboard = nullptr;
-
 protected:
     void dropEvent(QDropEvent* event) override;
     void dragEnterEvent(QDragEnterEvent* event) override;