From 5bb89328d0c8cac8f98a0c149fda72e3d721079f Mon Sep 17 00:00:00 2001 From: Margen67 Date: Mon, 13 Feb 2023 02:33:06 -0800 Subject: [PATCH] Remove whitespace --- .../ISSUE_TEMPLATE/1-regression-report.yml | 12 +++++------ .github/ISSUE_TEMPLATE/2-bug-report.yml | 12 +++++------ .github/ISSUE_TEMPLATE/3-feature-request.yml | 2 +- Utilities/bin_patch.cpp | 2 +- bin/GuiConfigs/Darker Style by TheMitoSan.qss | 12 +++++------ bin/GuiConfigs/Envy.qss | 20 +++++++++---------- .../ModernBlue Theme by TheMitoSan.qss | 14 ++++++------- bin/GuiConfigs/Skyline (Nightfall).qss | 16 +++++++-------- bin/GuiConfigs/Skyline.qss | 16 +++++++-------- bin/GuiConfigs/YoRHa by Ani.qss | 4 ++-- buildfiles/msvc/common_default_macros.props | 4 ++-- rpcs3/CMakeLists.txt | 4 ++-- rpcs3/Crypto/aes.h | 2 +- rpcs3/Crypto/key_vault.h | 2 +- rpcs3/Crypto/unpkg.cpp | 2 +- rpcs3/Emu/Cell/ErrorCodes.h | 2 +- rpcs3/Emu/Cell/Modules/HLE_PATCHES.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellRec.cpp | 4 ++-- rpcs3/Emu/Cell/Modules/cellSpurs.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellUserInfo.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellVideoExport.cpp | 4 ++-- rpcs3/Emu/Cell/Modules/sceNp.cpp | 8 ++++---- rpcs3/Emu/Cell/Modules/sceNp2.cpp | 2 +- rpcs3/Emu/Cell/PPUDisAsm.cpp | 4 ++-- rpcs3/Emu/Cell/SPUDisAsm.h | 2 +- rpcs3/Emu/Cell/SPUThread.cpp | 8 ++++---- rpcs3/Emu/Cell/SPUThread.h | 2 +- rpcs3/Emu/Cell/lv2/lv2.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_console.h | 2 +- rpcs3/Emu/Cell/lv2/sys_event.cpp | 6 +++--- rpcs3/Emu/Cell/lv2/sys_event_flag.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_fs.h | 4 ++-- rpcs3/Emu/Cell/lv2/sys_lwcond.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_lwmutex.h | 2 +- rpcs3/Emu/Cell/lv2/sys_memory.cpp | 4 ++-- rpcs3/Emu/Cell/lv2/sys_mmapper.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_mutex.h | 2 +- rpcs3/Emu/Cell/lv2/sys_net.cpp | 4 ++-- rpcs3/Emu/Cell/lv2/sys_spu.cpp | 4 ++-- rpcs3/Emu/Cell/lv2/sys_usbd.cpp | 2 +- rpcs3/Emu/IdManager.cpp | 2 +- rpcs3/Emu/Io/Null/NullPadHandler.h | 2 +- .../HomeMenu/overlay_home_menu_page.cpp | 2 +- rpcs3/Emu/RSX/Overlays/overlay_message.cpp | 2 +- .../Program/GLSLSnippets/GPUDeswizzle.glsl | 10 +++++----- .../Program/GLSLSnippets/OverlayRenderFS.glsl | 2 +- rpcs3/Emu/RSX/RSXDisAsm.cpp | 2 +- rpcs3/Emu/RSX/RSXFIFO.cpp | 8 ++++---- rpcs3/Emu/RSX/RSXTexture.cpp | 2 +- rpcs3/Emu/RSX/RSXThread.cpp | 8 ++++---- rpcs3/Emu/RSX/VK/VKTextOut.h | 2 +- .../VK/upscalers/fsr1/fsr_ffx_a_flattened.inc | 18 ++++++++--------- .../upscalers/fsr1/fsr_ffx_fsr1_flattened.inc | 2 +- .../RSX/VK/upscalers/fsr1/fsr_ubershader.glsl | 2 +- rpcs3/Emu/RSX/rsx_decode.h | 2 +- rpcs3/Emu/System.cpp | 6 +++--- rpcs3/Emu/system_config.h | 4 ++-- rpcs3/Emu/title.h | 2 +- rpcs3/Input/hid_pad_handler.cpp | 2 +- rpcs3/Input/sdl_pad_handler.cpp | 4 ++-- rpcs3/Loader/disc.cpp | 16 +++++++-------- rpcs3/Loader/mself.cpp | 2 +- rpcs3/resource.h | 2 +- rpcs3/rpcs3qt/game_list_grid.h | 2 +- rpcs3/rpcs3qt/gui_settings.h | 2 +- rpcs3/rpcs3qt/kernel_explorer.cpp | 2 +- rpcs3/rpcs3qt/main_window.cpp | 8 ++++---- rpcs3/rpcs3qt/rsx_debugger.cpp | 6 +++--- rpcs3/rpcs3qt/sendmessage_dialog_frame.h | 2 +- rpcs3/rpcs3qt/settings.h | 2 +- rpcs3/rpcs3qt/user_account.h | 2 +- rpcs3/rpcs3qt/vfs_dialog_usb_input.cpp | 2 +- rpcs3/util/atomic.cpp | 2 +- 74 files changed, 170 insertions(+), 170 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/1-regression-report.yml b/.github/ISSUE_TEMPLATE/1-regression-report.yml index 9636b282aa..865f96e92b 100644 --- a/.github/ISSUE_TEMPLATE/1-regression-report.yml +++ b/.github/ISSUE_TEMPLATE/1-regression-report.yml @@ -29,8 +29,8 @@ body: Please provide the _exact_ build (or commit) information that introduced the regression you're reporting. * Please see [How to find the build that caused a regression](https://wiki.rpcs3.net/index.php?title=Help:Using_different_versions_of_RPCS3#How_to_find_the_build_that_caused_a_regression.3F) in our wiki. * You can find [History of RPCS3 builds](https://rpcs3.net/compatibility?b) here. - - Make sure you're running with settings as close to default as possible + + Make sure you're running with settings as close to default as possible * **Do NOT enable any emulator game patches when reporting issues** * Only change settings that are required for the game to work - type: input @@ -48,7 +48,7 @@ body: Obtaining the log file: * Run the game until you find the regression. * Completely close RPCS3 and locate the log file. - + RPCS3's Log file will be ```RPCS3.log.gz``` (sometimes shows as RPCS3.log with zip icon) or ```RPCS3.log``` (sometimes shows as RPCS3 wtih notepad icon). * On Windows it will be in the RPCS3 directory near the executable * On Linux it will be in ```~/.cache/rpcs3/``` @@ -70,21 +70,21 @@ body: * To create an RSX capture, use _Create_ _RSX_ _Capture_ under _Utilities_. * Captures will be stored in RPCS3 folder ā†’ captures. * To create a RenderDoc capture, please refer to [RenderDoc's documentation](https://renderdoc.org/docs/how/how_capture_frame.html). - - type: textarea + - type: textarea id: captures attributes: label: Attach capture files for visual issues description: Compress your capture with 7z, Rar etc. and attach it here, or upload it to the cloud (Dropbox, Mega etc) and add a link to it. validations: required: false - - type: textarea + - type: textarea id: system-info attributes: label: System configuration description: Provide information about your system, such as operating system, CPU and GPU model, GPU driver version and other information that describes your system configuration. validations: required: false - - type: textarea + - type: textarea id: other-details attributes: label: Other details diff --git a/.github/ISSUE_TEMPLATE/2-bug-report.yml b/.github/ISSUE_TEMPLATE/2-bug-report.yml index 332669704e..00df05c66b 100644 --- a/.github/ISSUE_TEMPLATE/2-bug-report.yml +++ b/.github/ISSUE_TEMPLATE/2-bug-report.yml @@ -28,13 +28,13 @@ body: attributes: value: | # Log files - + Provide a log file that includes the bug you're reporting. - + Obtaining the log file: * Run the game until you find the regression. * Completely close RPCS3 and locate the log file. - + RPCS3's Log file will be ```RPCS3.log.gz``` (sometimes shows as RPCS3.log with zip icon) or ```RPCS3.log``` (sometimes shows as RPCS3 wtih notepad icon). * On Windows it will be in the RPCS3 directory near the executable * On Linux it will be in ```~/.cache/rpcs3/``` @@ -55,21 +55,21 @@ body: * To create an RSX capture, use _Create_ _RSX_ _Capture_ under _Utilities_. * Captures will be stored in RPCS3 folder ā†’ captures. * To create a RenderDoc capture, please refer to [RenderDoc's documentation](https://renderdoc.org/docs/how/how_capture_frame.html). - - type: textarea + - type: textarea id: captures attributes: label: Attach capture files for visual issues description: Compress your capture with 7z, Rar etc. and attach it here, or upload it to the cloud (Dropbox, Mega etc) and add a link to it. validations: required: false - - type: textarea + - type: textarea id: system-info attributes: label: System configuration description: Provide information about your system, such as operating system, CPU and GPU model, GPU driver version and other information that describes your system configuration. validations: required: false - - type: textarea + - type: textarea id: other-details attributes: label: Other details diff --git a/.github/ISSUE_TEMPLATE/3-feature-request.yml b/.github/ISSUE_TEMPLATE/3-feature-request.yml index 5369b37a38..49a44b923c 100644 --- a/.github/ISSUE_TEMPLATE/3-feature-request.yml +++ b/.github/ISSUE_TEMPLATE/3-feature-request.yml @@ -29,7 +29,7 @@ body: * Why your feature is important to RPCS3. * If the feature is implemented in other projects, attach screenshots. * If this feature is something that a game is trying to use, upload a log file for it. - + RPCS3's Log file will be ```RPCS3.log.gz``` (sometimes shows as RPCS3.log with zip icon) or ```RPCS3.log``` (sometimes shows as RPCS3 wtih notepad icon). * On Windows it will be in the RPCS3 directory near the executable * On Linux it will be in ```~/.cache/rpcs3/``` diff --git a/Utilities/bin_patch.cpp b/Utilities/bin_patch.cpp index f44db2e578..7404618f1c 100644 --- a/Utilities/bin_patch.cpp +++ b/Utilities/bin_patch.cpp @@ -756,7 +756,7 @@ static usz apply_modification(std::basic_string& applied, const patch_engin // NOP filled std::fill_n(vm::get_super_ptr(addr), p.value.long_value, 0x60000000); - // Check if already registered by previous code allocation + // Check if already registered by previous code allocation if (relocate_instructions_at != addr) { // Register code diff --git a/bin/GuiConfigs/Darker Style by TheMitoSan.qss b/bin/GuiConfigs/Darker Style by TheMitoSan.qss index 08465d05f9..f46cc2e0b1 100644 --- a/bin/GuiConfigs/Darker Style by TheMitoSan.qss +++ b/bin/GuiConfigs/Darker Style by TheMitoSan.qss @@ -1,5 +1,5 @@ -/* -TheMitoSan Dark-Theme for RPCS3 +/* +TheMitoSan Dark-Theme for RPCS3 Based on Kuroi (Dark) by Ani by themitosan @ twitter.com/themitosan Ani @ https://github.com/AniLeo @@ -135,7 +135,7 @@ QPushButton::disabled { } QPushButton::pressed { - background-color: #333; + background-color: #333; } /* Log and Debugger borders */ @@ -193,7 +193,7 @@ QListWidget::item:hover { } /* Pad Settings: Controller Image */ -QLabel#l_controller { +QLabel#l_controller { color: #FFF; } @@ -230,8 +230,8 @@ QLabel#color_button { } /* Search bar on main toolbar */ -QLineEdit#mw_searchbar { - margin-left: 0.7em; +QLineEdit#mw_searchbar { + margin-left: 0.7em; color: #ecf0f1; } diff --git a/bin/GuiConfigs/Envy.qss b/bin/GuiConfigs/Envy.qss index 320949a33b..956ec34b1f 100644 --- a/bin/GuiConfigs/Envy.qss +++ b/bin/GuiConfigs/Envy.qss @@ -1,4 +1,4 @@ -/* +/* Envy theme for RPCS3 by drysalter (https://github.com/drysalter) 03/04/2019 */ @@ -19,7 +19,7 @@ Candy Red: #ff007a Yellow: #f2d571 Fuchsia: #ff00ff Orange: #ff6000 -Cyan: #3498d8 +Cyan: #3498d8 */ @@ -209,7 +209,7 @@ QRadioButton::indicator:unchecked { } QRadioButton::indicator:disabled { - background-color: #4d5058; + background-color: #4d5058; } /* Combo Boxes */ @@ -272,7 +272,7 @@ QSlider::handle:horizontal { border: 1px solid #5c5c5c; border-radius: 0.1em; width: 18px; - margin: -2px 2; + margin: -2px 2; } QSlider::handle:horizontal:hover { @@ -335,7 +335,7 @@ QPushButton:disabled { } QPushButton::pressed { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2d3038, stop: 1 #2d3038); + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2d3038, stop: 1 #2d3038); } /* Spinboxes */ @@ -479,7 +479,7 @@ QListWidget::indicator:disabled { } /* Pad Settings: Controller Image */ -QLabel#l_controller { +QLabel#l_controller { color: #8cf944; } @@ -505,7 +505,7 @@ QLabel#color_button { } /* Search bar on main toolbar */ -QLineEdit#mw_searchbar { +QLineEdit#mw_searchbar { color: #ecf0f1; background-color: #2d3038; border: 1px solid #f8f8f8; @@ -513,14 +513,14 @@ QLineEdit#mw_searchbar { padding-left: 5px; } -QLineEdit#mw_searchbar:hover { +QLineEdit#mw_searchbar:hover { color: #ecf0f1; background-color: #2d3038; border: 1px solid #8cf944; margin: 15px; } -QLineEdit#mw_searchbar:focus { +QLineEdit#mw_searchbar:focus { border: 1px solid #8cf944; } @@ -566,7 +566,7 @@ QTableView { QTableView::item:hover { color: #8cf944; -} +} /* Game Icon Background */ QLabel#gamelist_icon_background_color { diff --git a/bin/GuiConfigs/ModernBlue Theme by TheMitoSan.qss b/bin/GuiConfigs/ModernBlue Theme by TheMitoSan.qss index efc1fc40f0..2c48ba05c9 100644 --- a/bin/GuiConfigs/ModernBlue Theme by TheMitoSan.qss +++ b/bin/GuiConfigs/ModernBlue Theme by TheMitoSan.qss @@ -1,5 +1,5 @@ -/* -ModernBlue Theme for RPCS3 +/* +ModernBlue Theme for RPCS3 by themitosan @ twitter.com/themitosan (2017.12.12) */ @@ -124,7 +124,7 @@ QGroupBox::title { /* Buttons */ QPushButton { background-color: #46598b; - color: #fff; + color: #fff; } QPushButton::disabled { @@ -133,7 +133,7 @@ QPushButton::disabled { } QPushButton::pressed { - background-color: #172038; + background-color: #172038; } /* Log and Debugger borders */ @@ -190,7 +190,7 @@ QListWidget::item:hover { } /* Pad Settings: Controller Image */ -QLabel#l_controller { +QLabel#l_controller { color: #fff; } @@ -227,8 +227,8 @@ QLabel#color_button { } /* Search bar on main toolbar */ -QLineEdit#mw_searchbar { - margin-left: 0.7em; +QLineEdit#mw_searchbar { + margin-left: 0.7em; color: #ecf0f1; } diff --git a/bin/GuiConfigs/Skyline (Nightfall).qss b/bin/GuiConfigs/Skyline (Nightfall).qss index 442596c8c4..5af056fdd3 100644 --- a/bin/GuiConfigs/Skyline (Nightfall).qss +++ b/bin/GuiConfigs/Skyline (Nightfall).qss @@ -105,7 +105,7 @@ QToolButton:hover { } /* Search bar in Main Toolbar */ -QLineEdit#mw_searchbar { +QLineEdit#mw_searchbar { color: #455971; background-color: #FFFFFF; border: 1px solid #999999; @@ -113,15 +113,15 @@ QLineEdit#mw_searchbar { padding-left: 5px; } -QLineEdit#mw_searchbar:hover { - margin-left: 0.7em; +QLineEdit#mw_searchbar:hover { + margin-left: 0.7em; color: #0074e7; background-color: #FFFFFF; border: 1px solid #0071ec; margin: 15px; } -QLineEdit#mw_searchbar:focus { +QLineEdit#mw_searchbar:focus { border: 1px solid #0074e7; } @@ -148,7 +148,7 @@ QSlider::handle:horizontal { border: 1px solid #5c5c5c; border-radius: 0.1em; width: 18px; - margin: -2px 2; + margin: -2px 2; } QSlider::handle:horizontal:hover { @@ -242,7 +242,7 @@ QRadioButton::indicator:unchecked { } QRadioButton::indicator:disabled { - background-color: #455971; + background-color: #455971; } /* Checkboxes */ @@ -533,7 +533,7 @@ QProgressBar::chunk { } /* Pad Settings: Controller Image */ -QLabel#l_controller { +QLabel#l_controller { color: #0074e7; } @@ -554,7 +554,7 @@ QHeaderView::section { background-color: #111525; color: #FFFFFF; padding-top: 3px; - padding-left: 3px; + padding-left: 3px; height: 20px; border: none; } diff --git a/bin/GuiConfigs/Skyline.qss b/bin/GuiConfigs/Skyline.qss index c41bfcf801..e2de14a9f7 100644 --- a/bin/GuiConfigs/Skyline.qss +++ b/bin/GuiConfigs/Skyline.qss @@ -105,7 +105,7 @@ QToolButton:hover { } /* Search bar in Main Toolbar */ -QLineEdit#mw_searchbar { +QLineEdit#mw_searchbar { color: #455971; background-color: #FFFFFF; border: 1px solid #999999; @@ -113,15 +113,15 @@ QLineEdit#mw_searchbar { padding-left: 5px; } -QLineEdit#mw_searchbar:hover { - margin-left: 0.7em; +QLineEdit#mw_searchbar:hover { + margin-left: 0.7em; color: #455971; background-color: #FFFFFF; border: 1px solid #0071ec; margin: 15px; } -QLineEdit#mw_searchbar:focus { +QLineEdit#mw_searchbar:focus { border: 1px solid #0071ec; } @@ -148,7 +148,7 @@ QSlider::handle:horizontal { border: 1px solid #5c5c5c; border-radius: 0.1em; width: 18px; - margin: -2px 2; + margin: -2px 2; } QSlider::handle:horizontal:disabled { @@ -254,7 +254,7 @@ QRadioButton::indicator:unchecked { } QRadioButton::indicator:disabled { - background-color: #455971; + background-color: #455971; } /* Checkboxes */ @@ -552,7 +552,7 @@ QProgressBar::chunk { } /* Pad Settings: Controller Image */ -QLabel#l_controller { +QLabel#l_controller { color: #4343c1; } @@ -573,7 +573,7 @@ QHeaderView::section { background-color: #FFFFFF; color: #455971; padding-top: 3px; - padding-left: 3px; + padding-left: 3px; height: 20px; border: none; } diff --git a/bin/GuiConfigs/YoRHa by Ani.qss b/bin/GuiConfigs/YoRHa by Ani.qss index 3e55dd0f09..527f9f25d0 100644 --- a/bin/GuiConfigs/YoRHa by Ani.qss +++ b/bin/GuiConfigs/YoRHa by Ani.qss @@ -456,10 +456,10 @@ QSlider#sizeSlider::groove:horizontal { height: 1.5em; } -/* +/* On Patch Creator, it's the patch validation label since we can't avoid repainting color, let's bold it instead */ QLabel#validLabel { font-weight: 600; -} \ No newline at end of file +} diff --git a/buildfiles/msvc/common_default_macros.props b/buildfiles/msvc/common_default_macros.props index 5939a53568..9a5a0f6ba7 100644 --- a/buildfiles/msvc/common_default_macros.props +++ b/buildfiles/msvc/common_default_macros.props @@ -1,4 +1,4 @@ - + @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index 72b3e06e0b..e372c66506 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -187,13 +187,13 @@ elseif(WIN32) # If Qt5 is installed from vcpkg list(APPEND _QT5_TOOLS_PATHS "${Qt5_DIR}/../../../tools/qt5$<$:/debug>/bin/") - + add_custom_command(TARGET rpcs3 POST_BUILD COMMAND set PATH=${_QT5_TOOLS_PATHS}$%PATH% COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_SOURCE_DIR}/bin" "$" # If Qt5 is installed from vcpkg, add binary path to PATH # otherwise windeployqt tool won't be able to locate necessary dlls - COMMAND set PATH=${Qt5_DIR}/../../../$<$:debug/>bin/$%PATH% + COMMAND set PATH=${Qt5_DIR}/../../../$<$:debug/>bin/$%PATH% COMMAND "${_WINDEPLOYQT}" --no-angle --no-compiler-runtime --no-opengl-sw --no-patchqt --no-translations --no-quick --plugindir "$/qt/plugins" $<$:--debug> $<$:--release> "$") endif() diff --git a/rpcs3/Crypto/aes.h b/rpcs3/Crypto/aes.h index 2b5d0f0f71..807a50cbc4 100644 --- a/rpcs3/Crypto/aes.h +++ b/rpcs3/Crypto/aes.h @@ -124,7 +124,7 @@ int aes_crypt_cbc( aes_context *ctx, * both encryption and decryption. So a context initialized with * aes_setkey_enc() for both AES_ENCRYPT and AES_DECRYPT. * - * both + * both * \param ctx AES context * \param mode AES_ENCRYPT or AES_DECRYPT * \param length length of the input data diff --git a/rpcs3/Crypto/key_vault.h b/rpcs3/Crypto/key_vault.h index 4157138587..5fc19d1659 100644 --- a/rpcs3/Crypto/key_vault.h +++ b/rpcs3/Crypto/key_vault.h @@ -245,7 +245,7 @@ constexpr s64 PAID_30 = 0x1070000023000001L; // spu_token_processor.self; CoreOS constexpr s64 PAID_31 = 0x1070000024000001L; // sv_iso_spu_module.self; CoreOS; same for CEX DEX DECR constexpr s64 PAID_32 = 0x1070000025000001L; // aim_spu_module.self; CoreOS; same for CEX DEX DECR constexpr s64 PAID_33 = 0x1070000026000001L; // ss_sc_init.self; [2.43 JIG PUP] -constexpr s64 PAID_34 = 0x1070000027000001L; // dispatcher.fself; lv1; +constexpr s64 PAID_34 = 0x1070000027000001L; // dispatcher.fself; lv1; constexpr s64 PAID_35 = 0x1070000028000001L; // factory_data_mngr_server.fself; JIG lv1 proc constexpr s64 PAID_36 = 0x1070000029000001L; // fdm_spu_module.self; [2.43 JIG PUP] constexpr s64 PAID_37 = 0x107000002A000001L; diff --git a/rpcs3/Crypto/unpkg.cpp b/rpcs3/Crypto/unpkg.cpp index 10d06296bc..4d7105266f 100644 --- a/rpcs3/Crypto/unpkg.cpp +++ b/rpcs3/Crypto/unpkg.cpp @@ -1041,7 +1041,7 @@ package_error package_reader::extract_data(std::deque& readers, { // Use a seperate map for each reader. We need to check if the target app version exists for each package in sequence. std::map all_install_entries; - + if (error == package_error::no_error) { // Check if this package is allowed to be installed on top of the existing data diff --git a/rpcs3/Emu/Cell/ErrorCodes.h b/rpcs3/Emu/Cell/ErrorCodes.h index 51b9f6a970..7b3b0dc1bb 100644 --- a/rpcs3/Emu/Cell/ErrorCodes.h +++ b/rpcs3/Emu/Cell/ErrorCodes.h @@ -34,7 +34,7 @@ class error_code { } -public: +public: // Implementation must be provided independently static s32 error_report(s32 result, const logs::message* channel, const char* fmt, const fmt_type_info* sup, const u64* args); diff --git a/rpcs3/Emu/Cell/Modules/HLE_PATCHES.cpp b/rpcs3/Emu/Cell/Modules/HLE_PATCHES.cpp index c34c9b1c3c..0d5fa62f63 100644 --- a/rpcs3/Emu/Cell/Modules/HLE_PATCHES.cpp +++ b/rpcs3/Emu/Cell/Modules/HLE_PATCHES.cpp @@ -8,7 +8,7 @@ #include -// SONIC THE HEDGEDOG: a fix for a race condition between SPUs and PPUs causing missing graphics (SNR is overriden when non-empty) +// SONIC THE HEDGEDOG: a fix for a race condition between SPUs and PPUs causing missing graphics (SNR is overriden when non-empty) void WaitForSPUsToEmptySNRs(ppu_thread& ppu, u32 spu_id, u32 snr_mask) { ppu.state += cpu_flag::wait; diff --git a/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp b/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp index cd69853c08..00ea156cf9 100644 --- a/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp @@ -222,7 +222,7 @@ error_code open_msg_dialog(bool is_blocking, u32 type, vm::cptr msgString, auto& ppu = *get_current_cpu_thread(); lv2_obj::sleep(ppu); - // PS3 memory must not be accessed by Main thread + // PS3 memory must not be accessed by Main thread std::string msg_string = msgString.get_ptr(); // Run asynchronously in GUI thread diff --git a/rpcs3/Emu/Cell/Modules/cellRec.cpp b/rpcs3/Emu/Cell/Modules/cellRec.cpp index 74f54abcf3..77064e248f 100644 --- a/rpcs3/Emu/Cell/Modules/cellRec.cpp +++ b/rpcs3/Emu/Cell/Modules/cellRec.cpp @@ -1311,7 +1311,7 @@ u32 cellRecQueryMemSize(vm::cptr pParam) { return 0x900000; } - + u32 video_size = 0x600000; // 6 MB u32 audio_size = 0x100000; // 1 MB u32 external_input_size = 0; @@ -1616,7 +1616,7 @@ error_code cellRecSetInfo(s32 setInfo, u64 value) { return CELL_REC_ERROR_INVALID_VALUE; } - + for (u32 i = 0; i < scene_metadata->tagNum; i++) { if (!scene_metadata->tag[i] || diff --git a/rpcs3/Emu/Cell/Modules/cellSpurs.cpp b/rpcs3/Emu/Cell/Modules/cellSpurs.cpp index 75bd11dd27..bb8a94dbe5 100644 --- a/rpcs3/Emu/Cell/Modules/cellSpurs.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSpurs.cpp @@ -5461,7 +5461,7 @@ DECLARE(ppu_module_manager::cellSpurs)("cellSpurs", [](ppu_static_module* _this) _this->add_init_func([](ppu_static_module*) { const auto val = g_cfg.core.spu_accurate_reservations ? MFF_PERFECT : MFF_FORCED_HLE; - + REINIT_FUNC(cellSpursSetPriorities).flag(val); REINIT_FUNC(cellSpursAddWorkload).flag(val); REINIT_FUNC(cellSpursAddWorkloadWithAttribute).flag(val); diff --git a/rpcs3/Emu/Cell/Modules/cellUserInfo.cpp b/rpcs3/Emu/Cell/Modules/cellUserInfo.cpp index 4e8962ec29..a2ff2edcce 100644 --- a/rpcs3/Emu/Cell/Modules/cellUserInfo.cpp +++ b/rpcs3/Emu/Cell/Modules/cellUserInfo.cpp @@ -253,7 +253,7 @@ error_code cellUserInfoSelectUser_SetList(vm::ptr setList, funcSelect(ppu, CELL_USERINFO_ERROR_NOUSER, selectUser, userdata); return CELL_OK; }); - + return CELL_OK; } diff --git a/rpcs3/Emu/Cell/Modules/cellVideoExport.cpp b/rpcs3/Emu/Cell/Modules/cellVideoExport.cpp index 3d01d8c1d2..a19d1f2de9 100644 --- a/rpcs3/Emu/Cell/Modules/cellVideoExport.cpp +++ b/rpcs3/Emu/Cell/Modules/cellVideoExport.cpp @@ -164,7 +164,7 @@ error_code cellVideoExportInitialize2(u32 version, vm::ptr funcFinish, vm::ptr userdata) { cellVideoExport.notice("cellVideoExportInitialize(version=0x%x, container=0x%x, funcFinish=*0x%x, userdata=*0x%x)", version, container, funcFinish, userdata); - + if (version != CELL_VIDEO_EXPORT_UTIL_VERSION_CURRENT) { return CELL_VIDEO_EXPORT_UTIL_ERROR_PARAM; @@ -282,7 +282,7 @@ error_code cellVideoExportFromFileWithCopy(vm::cptr srcHddDir, vm::cptr srcHddDir, vm::cptr srcHddFile, vm::ptr param, vm::ptr funcFinish, vm::ptr userdata) { cellVideoExport.todo("cellVideoExportFromFile(srcHddDir=%s, srcHddFile=%s, param=*0x%x, funcFinish=*0x%x, userdata=*0x%x)", srcHddDir, srcHddFile, param, funcFinish, userdata); - + if (!param || !funcFinish || !srcHddDir || !srcHddDir[0] || !srcHddFile || !srcHddFile[0]) { return CELL_VIDEO_EXPORT_UTIL_ERROR_PARAM; diff --git a/rpcs3/Emu/Cell/Modules/sceNp.cpp b/rpcs3/Emu/Cell/Modules/sceNp.cpp index c9051f07a2..4e9b509489 100644 --- a/rpcs3/Emu/Cell/Modules/sceNp.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNp.cpp @@ -3854,7 +3854,7 @@ error_code sceNpScoreCreateTransactionCtx(s32 titleCtxId) } auto score = idm::get(titleCtxId); - + if (!score) { return SCE_NP_COMMUNITY_ERROR_INVALID_ID; @@ -4409,7 +4409,7 @@ error_code scenp_score_get_ranking_by_range(s32 transId, SceNpScoreBoardId board if (opt_ptr[1]) { vm::ptr ssr_ptr = vm::cast(opt_ptr[1]); - startSerialRank = *ssr_ptr; + startSerialRank = *ssr_ptr; } // It also uses opt_ptr[2] for unknown purposes @@ -5272,7 +5272,7 @@ error_code sceNpSignalingTerminateConnection(u32 ctx_id, u32 conn_id) } auto& sigh = g_fxo->get>(); - + sigh.stop_sig(conn_id); return CELL_OK; @@ -5306,7 +5306,7 @@ error_code sceNpSignalingGetConnectionStatus(u32 ctx_id, u32 conn_id, vm::ptrget>(); diff --git a/rpcs3/Emu/Cell/PPUDisAsm.cpp b/rpcs3/Emu/Cell/PPUDisAsm.cpp index 8fa48eee8e..3f3564bbe5 100644 --- a/rpcs3/Emu/Cell/PPUDisAsm.cpp +++ b/rpcs3/Emu/Cell/PPUDisAsm.cpp @@ -80,7 +80,7 @@ std::pair PPUDisAsm::try_get_const_op_gpr_value(u32 re if (pc == umax) { - // Default arg: choose pc of previous instruction + // Default arg: choose pc of previous instruction if (dump_pc == 0) { @@ -108,7 +108,7 @@ std::pair PPUDisAsm::try_get_const_op_gpr_value(u32 re auto is_branch = [](enum ppu_itype::type itype) { - return itype == ppu_itype::BC || itype == ppu_itype::B || itype == ppu_itype::BCLR || itype == ppu_itype::BCCTR; + return itype == ppu_itype::BC || itype == ppu_itype::B || itype == ppu_itype::BCLR || itype == ppu_itype::BCCTR; }; if (is_branch(type) || type == ppu_itype::UNK) diff --git a/rpcs3/Emu/Cell/SPUDisAsm.h b/rpcs3/Emu/Cell/SPUDisAsm.h index 6945347690..e891ed6fcc 100644 --- a/rpcs3/Emu/Cell/SPUDisAsm.h +++ b/rpcs3/Emu/Cell/SPUDisAsm.h @@ -188,7 +188,7 @@ public: std::unique_ptr copy_type_erased() const override; std::pair try_get_const_value(u32 reg, u32 pc = -1, u32 TTL = 10) const; - // Get constant value if the original array is made of only repetitions of the same value + // Get constant value if the original array is made of only repetitions of the same value template requires (sizeof(T) < sizeof(v128) && !(sizeof(v128) % sizeof(T))) std::pair try_get_const_equal_value_array(u32 reg, u32 pc = -1, u32 TTL = 10) const { diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index a6228e518f..5fc5f349f3 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -4103,7 +4103,7 @@ bool spu_thread::process_mfc_cmd() raddr = addr; rtime = ntime; mov_rdata(_ref(ch_mfc_cmd.lsa & 0x3ff80), rdata); - + ch_atomic_stat.set_value(MFC_GETLLAR_SUCCESS); if (g_cfg.core.mfc_debug) @@ -4769,7 +4769,7 @@ s64 spu_thread::get_ch_value(u32 ch) } const bool reservation_busy_waiting = ((utils::get_tsc() >> 8) % 100 + ((raddr == spurs_addr) ? 50 : 0)) < g_cfg.core.spu_reservation_busy_waiting_percentage; - + for (; !events.count; events = get_events(mask1 & ~SPU_EVENT_LR, true, true)) { const auto old = +state; @@ -4805,7 +4805,7 @@ s64 spu_thread::get_ch_value(u32 ch) // Wait without timeout, in this situation we have notifications for all writes making it possible // Abort notifications are handled specially for performance reasons vm::reservation_notifier(raddr).wait(rtime, -128); - continue; + continue; } atomic_wait_engine::set_one_time_use_wait_callback(mask1 != SPU_EVENT_LR ? nullptr : +[](u64 attempts) -> bool @@ -5481,7 +5481,7 @@ bool spu_thread::stop_and_signal(u32 code) if (Emu.IsStarting()) { - // Deregister lv2_obj::g_to_sleep entry (savestates related) + // Deregister lv2_obj::g_to_sleep entry (savestates related) lv2_obj::sleep(*this); } diff --git a/rpcs3/Emu/Cell/SPUThread.h b/rpcs3/Emu/Cell/SPUThread.h index 2b88b3120c..f59f9186c5 100644 --- a/rpcs3/Emu/Cell/SPUThread.h +++ b/rpcs3/Emu/Cell/SPUThread.h @@ -234,7 +234,7 @@ public: data.notify_one(); } - // Return true if count has changed from 0 to 1, this condition is considered satisfied even if we pushed a value directly to the special storage for waiting SPUs + // Return true if count has changed from 0 to 1, this condition is considered satisfied even if we pushed a value directly to the special storage for waiting SPUs return !pushed_to_data || (old & bit_count) == 0; } } diff --git a/rpcs3/Emu/Cell/lv2/lv2.cpp b/rpcs3/Emu/Cell/lv2/lv2.cpp index 987b97e5e3..24ccf2da91 100644 --- a/rpcs3/Emu/Cell/lv2/lv2.cpp +++ b/rpcs3/Emu/Cell/lv2/lv2.cpp @@ -1697,7 +1697,7 @@ void lv2_obj::schedule_all(u64 current_time) { if (g_ppu && cpu_flag::preempt - g_ppu->state) { - // Don't be picky, pick up any running PPU thread even it has a wait flag + // Don't be picky, pick up any running PPU thread even it has a wait flag cpu = g_ppu; } // TODO: If this case is common enough it may be valuable to iterate over all CPU threads to find a perfect candidate (one without a wait or suspend flag) diff --git a/rpcs3/Emu/Cell/lv2/sys_console.h b/rpcs3/Emu/Cell/lv2/sys_console.h index 202f238232..2ba3189e88 100644 --- a/rpcs3/Emu/Cell/lv2/sys_console.h +++ b/rpcs3/Emu/Cell/lv2/sys_console.h @@ -5,4 +5,4 @@ // SysCalls error_code sys_console_write(vm::cptr buf, u32 len); -constexpr auto sys_console_write2 = sys_console_write; +constexpr auto sys_console_write2 = sys_console_write; diff --git a/rpcs3/Emu/Cell/lv2/sys_event.cpp b/rpcs3/Emu/Cell/lv2/sys_event.cpp index d47fac1b0f..d2553892df 100644 --- a/rpcs3/Emu/Cell/lv2/sys_event.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_event.cpp @@ -157,7 +157,7 @@ CellError lv2_event_queue::send(lv2_event event) { // Store event in In_MBox auto& spu = static_cast(*schedule(sq, protocol)); - + if (spu.state & cpu_flag::again) { if (auto cpu = get_current_cpu_thread()) @@ -325,7 +325,7 @@ error_code sys_event_queue_destroy(ppu_thread& ppu, u32 equeue_id, s32 mode) queue->append(cpu); } - atomic_storage::release(queue->pq, nullptr); + atomic_storage::release(queue->pq, nullptr); lv2_obj::awake_all(); } else @@ -336,7 +336,7 @@ error_code sys_event_queue_destroy(ppu_thread& ppu, u32 equeue_id, s32 mode) resume_spu_thread_group_from_waiting(*cpu); } - atomic_storage::release(queue->sq, nullptr); + atomic_storage::release(queue->sq, nullptr); } qlock.unlock(); diff --git a/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp b/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp index abb66b4121..393222b62f 100644 --- a/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp @@ -370,7 +370,7 @@ error_code sys_event_flag_set(cpu_thread& cpu, u32 id, u64 bitptn) { s32 prio = smax; ppu_thread* it{}; - + for (auto ppu = first; ppu; ppu = ppu->next_cpu) { if (!ppu->gpr[7] && (flag->protocol != SYS_SYNC_PRIORITY || ppu->prio <= prio)) diff --git a/rpcs3/Emu/Cell/lv2/sys_fs.h b/rpcs3/Emu/Cell/lv2/sys_fs.h index ffc692f26e..fe0b666433 100644 --- a/rpcs3/Emu/Cell/lv2/sys_fs.h +++ b/rpcs3/Emu/Cell/lv2/sys_fs.h @@ -214,7 +214,7 @@ public: struct lv2_file final : lv2_fs_object { static constexpr u32 id_type = 1; - + fs::file file; const s32 mode; const s32 flags; @@ -303,7 +303,7 @@ struct lv2_file final : lv2_fs_object struct lv2_dir final : lv2_fs_object { static constexpr u32 id_type = 2; - + const std::vector entries; // Current reading position diff --git a/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp b/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp index 89190d5291..a50683413b 100644 --- a/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp @@ -268,7 +268,7 @@ error_code _sys_lwcond_signal_all(ppu_thread& ppu, u32 lwcond_id, u32 lwmutex_id auto sq = cond.sq; atomic_storage::release(cond.sq, nullptr); - + while (const auto cpu = cond.schedule(sq, cond.protocol)) { if (mode == 2) diff --git a/rpcs3/Emu/Cell/lv2/sys_lwmutex.h b/rpcs3/Emu/Cell/lv2/sys_lwmutex.h index 34a19d0285..c49d006800 100644 --- a/rpcs3/Emu/Cell/lv2/sys_lwmutex.h +++ b/rpcs3/Emu/Cell/lv2/sys_lwmutex.h @@ -122,7 +122,7 @@ struct lv2_lwmutex final : lv2_obj // Notify lwmutex destroyer (may cause EBUSY to be returned for it) lwcond_waiters.notify_all(); } - + if (signal) { cpu->next_cpu = nullptr; diff --git a/rpcs3/Emu/Cell/lv2/sys_memory.cpp b/rpcs3/Emu/Cell/lv2/sys_memory.cpp index 036cae4797..91f06a0340 100644 --- a/rpcs3/Emu/Cell/lv2/sys_memory.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_memory.cpp @@ -30,7 +30,7 @@ lv2_memory_container::lv2_memory_container(utils::serial& ar, bool from_idm) noe std::shared_ptr lv2_memory_container::load(utils::serial& ar) { - // Use idm::last_id() only for the instances at IDM + // Use idm::last_id() only for the instances at IDM return std::make_shared(stx::exact_t(ar), true); } @@ -77,7 +77,7 @@ struct sys_memory_address_table { if (const auto ptr = +ctr) { - mm[static_cast(&ctr - addrs)] = ptr->id; + mm[static_cast(&ctr - addrs)] = ptr->id; } } diff --git a/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp b/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp index 2cf5e3bf8b..f16f102674 100644 --- a/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp @@ -84,7 +84,7 @@ CellError lv2_memory::on_id_create() std::shared_ptr lv2_memory::load(utils::serial& ar) { auto mem = std::make_shared(ar); - mem->exists++; // Disable on_id_create() + mem->exists++; // Disable on_id_create() std::shared_ptr ptr = lv2_obj::load(mem->key, mem, +mem->pshared); mem->exists--; return ptr; diff --git a/rpcs3/Emu/Cell/lv2/sys_mutex.h b/rpcs3/Emu/Cell/lv2/sys_mutex.h index 2565dfe7ea..175279441a 100644 --- a/rpcs3/Emu/Cell/lv2/sys_mutex.h +++ b/rpcs3/Emu/Cell/lv2/sys_mutex.h @@ -58,7 +58,7 @@ struct lv2_mutex final : lv2_obj } lv2_mutex(utils::serial& ar); - static std::shared_ptr load(utils::serial& ar); + static std::shared_ptr load(utils::serial& ar); void save(utils::serial& ar); template diff --git a/rpcs3/Emu/Cell/lv2/sys_net.cpp b/rpcs3/Emu/Cell/lv2/sys_net.cpp index f6924c7c2a..653f2bee81 100644 --- a/rpcs3/Emu/Cell/lv2/sys_net.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_net.cpp @@ -1755,7 +1755,7 @@ error_code lv2_socket::abort_socket(s32 flags) { if (!ppu) continue; - + sys_net.warning("lv2_socket::abort_socket(): waking up \"%s\": (func: %s, r3=0x%x, r4=0x%x, r5=0x%x, r6=0x%x)", ppu->get_name(), ppu->current_function, ppu->gpr[3], ppu->gpr[4], ppu->gpr[5], ppu->gpr[6]); ppu->gpr[3] = static_cast(-SYS_NET_EINTR); lv2_obj::append(ppu.get()); @@ -1821,7 +1821,7 @@ error_code sys_net_abort(ppu_thread& ppu, s32 type, u64 arg, s32 flags) sock->close(); - sys_net.success("lv2_socket::handle_abort(): Closed socket %d", id); + sys_net.success("lv2_socket::handle_abort(): Closed socket %d", id); } // Ensures the socket has no lingering copy from the network thread diff --git a/rpcs3/Emu/Cell/lv2/sys_spu.cpp b/rpcs3/Emu/Cell/lv2/sys_spu.cpp index 1be58dd15d..5406818d8f 100644 --- a/rpcs3/Emu/Cell/lv2/sys_spu.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_spu.cpp @@ -63,7 +63,7 @@ void fmt_class_string::format(std::string& out, u64 arg) case SYS_SPU_THREAD_STOP_TRY_RECEIVE_EVENT: return "sys_spu_thread_tryreceive_event"; case SYS_SPU_THREAD_STOP_SWITCH_SYSTEM_MODULE: return "sys_spu_thread_switch_system_module"; } - + return unknown; }); } @@ -254,7 +254,7 @@ lv2_spu_group::lv2_spu_group(utils::serial& ar) noexcept } case SPU_THREAD_GROUP_STATUS_SUSPENDED: { - // Suspend all SPU threads except a thread that waits on sys_spu_thread_receive_event + // Suspend all SPU threads except a thread that waits on sys_spu_thread_receive_event for (const auto& thread : threads) { if (thread) diff --git a/rpcs3/Emu/Cell/lv2/sys_usbd.cpp b/rpcs3/Emu/Cell/lv2/sys_usbd.cpp index bbd4dd9e54..3b675adbc9 100644 --- a/rpcs3/Emu/Cell/lv2/sys_usbd.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_usbd.cpp @@ -288,7 +288,7 @@ usb_handler_thread::usb_handler_thread() { found_h050 = true; } - + // EA Active 2 dongle for connecting wristbands & legband check_device(0x21A4, 0xAC27, 0xAC27, "EA Active 2 Dongle"); } diff --git a/rpcs3/Emu/IdManager.cpp b/rpcs3/Emu/IdManager.cpp index 1139866f34..4b8549109e 100644 --- a/rpcs3/Emu/IdManager.cpp +++ b/rpcs3/Emu/IdManager.cpp @@ -26,7 +26,7 @@ std::vector>& id_manager::get_typeinfo_map { // Magic static static std::vector> s_map; - return s_map; + return s_map; } idm::map_data* idm::allocate_id(std::vector& vec, u32 type_id, u32 dst_id, u32 base, u32 step, u32 count, bool uses_lowest_id, std::pair invl_range) diff --git a/rpcs3/Emu/Io/Null/NullPadHandler.h b/rpcs3/Emu/Io/Null/NullPadHandler.h index 96616b450a..5c9f79ceac 100644 --- a/rpcs3/Emu/Io/Null/NullPadHandler.h +++ b/rpcs3/Emu/Io/Null/NullPadHandler.h @@ -9,7 +9,7 @@ public: { b_has_pressure_intensity_button = false; } - + bool Init() override { return true; diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.cpp index 971229bd6f..6c73a23c4f 100644 --- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.cpp +++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.cpp @@ -70,7 +70,7 @@ namespace rsx return nullptr; } - + void home_menu_page::add_page(std::shared_ptr page) { ensure(page); diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message.cpp b/rpcs3/Emu/RSX/Overlays/overlay_message.cpp index 52bba045fa..9f67044e51 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_message.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_message.cpp @@ -57,7 +57,7 @@ namespace rsx u64 message_item::get_expiration() const { - // If reference counting is enabled and reached 0 consider it expired + // If reference counting is enabled and reached 0 consider it expired return m_refs && *m_refs == 0 ? 0 : m_expiration_time; } diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/GPUDeswizzle.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/GPUDeswizzle.glsl index 9a487a8257..c2d679db6e 100644 --- a/rpcs3/Emu/RSX/Program/GLSLSnippets/GPUDeswizzle.glsl +++ b/rpcs3/Emu/RSX/Program/GLSLSnippets/GPUDeswizzle.glsl @@ -66,7 +66,7 @@ uint get_z_index(const in uint x_, const in uint y_, const in uint z_) uint log2w = invocation.size_log2.x; uint log2h = invocation.size_log2.y; uint log2d = invocation.size_log2.z; - + do { if (log2w > 0) @@ -76,7 +76,7 @@ uint get_z_index(const in uint x_, const in uint y_, const in uint z_) x >>= 1; log2w--; } - + if (log2h > 0) { offset |= (y & 1) << shift; @@ -84,7 +84,7 @@ uint get_z_index(const in uint x_, const in uint y_, const in uint z_) y >>= 1; log2h--; } - + if (log2d > 0) { offset |= (z & 1) << shift; @@ -94,7 +94,7 @@ uint get_z_index(const in uint x_, const in uint y_, const in uint z_) } } while(x > 0 || y > 0 || z > 0); - + return offset; } @@ -126,4 +126,4 @@ void main() data_out[dst_id++] = %f(value); } } -)" \ No newline at end of file +)" diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/OverlayRenderFS.glsl b/rpcs3/Emu/RSX/Program/GLSLSnippets/OverlayRenderFS.glsl index 0bfc5eda9a..de1992174f 100644 --- a/rpcs3/Emu/RSX/Program/GLSLSnippets/OverlayRenderFS.glsl +++ b/rpcs3/Emu/RSX/Program/GLSLSnippets/OverlayRenderFS.glsl @@ -90,7 +90,7 @@ vec4 sample_image(sampler2D tex, vec2 coord, float blur_strength) { vec4 original = texture(tex, coord); if (blur_strength == 0) return original; - + vec2 constraints = 1.f / vec2(640, 360); vec2 res_offset = 1.f / textureSize(fs0, 0); vec2 tex_offset = max(res_offset, constraints); diff --git a/rpcs3/Emu/RSX/RSXDisAsm.cpp b/rpcs3/Emu/RSX/RSXDisAsm.cpp index b1469ce59e..46ef4e4123 100644 --- a/rpcs3/Emu/RSX/RSXDisAsm.cpp +++ b/rpcs3/Emu/RSX/RSXDisAsm.cpp @@ -162,7 +162,7 @@ void RSXDisAsm::Write(std::string_view str, s32 count, bool is_non_inc, u32 id) case cpu_disasm_mode::interpreter: { last_opcode.clear(); - + if (count >= 0) { fmt::append(last_opcode, "[%08x] (%s%u)", dump_pc, is_non_inc ? "+" : "", count); diff --git a/rpcs3/Emu/RSX/RSXFIFO.cpp b/rpcs3/Emu/RSX/RSXFIFO.cpp index 67bfaa1b5a..8dcc7dbad9 100644 --- a/rpcs3/Emu/RSX/RSXFIFO.cpp +++ b/rpcs3/Emu/RSX/RSXFIFO.cpp @@ -38,7 +38,7 @@ namespace rsx m_command_inc = ((m_cmd & RSX_METHOD_NON_INCREMENT_CMD_MASK) == RSX_METHOD_NON_INCREMENT_CMD) ? 0 : 4; m_remaining_commands = count; m_internal_get = m_ctrl->get - 4; - m_args_ptr = m_iotable->get_addr(m_internal_get); + m_args_ptr = m_iotable->get_addr(m_internal_get); m_command_reg = (m_cmd & 0xffff) + m_command_inc * (((m_cmd >> 18) - count) & 0x7ff) - m_command_inc; } @@ -116,7 +116,7 @@ namespace rsx if (addr < put && put < m_cache_addr + m_cache_size) { - // Adjust to knownly-prepared FIFO buffer bounds + // Adjust to knownly-prepared FIFO buffer bounds m_cache_size = put - m_cache_addr; } @@ -267,7 +267,7 @@ namespace rsx m_command_reg += m_command_inc; --m_remaining_commands; - + data.set(m_command_reg, arg); return true; } @@ -422,7 +422,7 @@ namespace rsx data.set(m_cmd & 0xfffc, arg); return; } - + inc_get(true); // Wait for data block to become available // Validate the args ptr if the command attempts to read from it diff --git a/rpcs3/Emu/RSX/RSXTexture.cpp b/rpcs3/Emu/RSX/RSXTexture.cpp index d308bb83c4..fd182e3b34 100644 --- a/rpcs3/Emu/RSX/RSXTexture.cpp +++ b/rpcs3/Emu/RSX/RSXTexture.cpp @@ -151,7 +151,7 @@ namespace rsx case 16: return rsx::texture_max_anisotropy::x16; default: break; } - + return rsx::to_texture_max_anisotropy((registers[NV4097_SET_TEXTURE_CONTROL0 + (m_index * 8)] >> 4) & 0x7); } diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp index 83f1226cf5..551104e4ce 100644 --- a/rpcs3/Emu/RSX/RSXThread.cpp +++ b/rpcs3/Emu/RSX/RSXThread.cpp @@ -478,9 +478,9 @@ namespace rsx void thread::save(utils::serial& ar) { [[maybe_unused]] const s32 version = GET_OR_USE_SERIALIZATION_VERSION(ar.is_writing(), rsx); - + ar(rsx::method_registers); - + for (auto& v : vertex_push_buffers) { ar(v.attr, v.size, v.type, v.vertex_count, v.dword_count, v.data); @@ -554,7 +554,7 @@ namespace rsx if (g_cfg.savestate.start_paused) { - // Allow to render a whole frame within this emulation session so there won't be missing graphics + // Allow to render a whole frame within this emulation session so there won't be missing graphics m_pause_after_x_flips = 2; } } @@ -3450,7 +3450,7 @@ namespace rsx async_flip_requested |= flip_request::emu_requested; m_eng_interrupt_mask |= rsx::display_interrupt; - + if (state & cpu_flag::exit) { // Resubmit possibly-ignored flip on savestate load diff --git a/rpcs3/Emu/RSX/VK/VKTextOut.h b/rpcs3/Emu/RSX/VK/VKTextOut.h index b3191474bb..bc53bd24c3 100644 --- a/rpcs3/Emu/RSX/VK/VKTextOut.h +++ b/rpcs3/Emu/RSX/VK/VKTextOut.h @@ -49,7 +49,7 @@ namespace vk m_descriptor_pool.create(dev, descriptor_pools, 1, 120, 2); // Scale and offset data plus output color - std::vector bindings = + std::vector bindings = { { .binding = 0, diff --git a/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ffx_a_flattened.inc b/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ffx_a_flattened.inc index e2a24e5a5b..cb8fdbc856 100644 --- a/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ffx_a_flattened.inc +++ b/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ffx_a_flattened.inc @@ -4,7 +4,7 @@ R"--RPCS3--( #ifndef A_SKIP_EXT #ifdef A_HALF #extension GL_EXT_shader_16bit_storage:require -#extension GL_EXT_shader_explicit_arithmetic_types:require +#extension GL_EXT_shader_explicit_arithmetic_types:require #endif #ifdef A_LONG #extension GL_ARB_gpu_shader_int64:require @@ -390,7 +390,7 @@ AW4 AWaveXorW4(AW4 v,AU1 x){return AW4_AU2(subgroupShuffleXor(AU2_AW4(v),x));} AU1 AU1_AH1_AF1_x(AF1 a){return f32tof16(a);} #define AU1_AH1_AF1(a) AU1_AH1_AF1_x(AF1(a)) AU1 AU1_AH2_AF2_x(AF2 a){return f32tof16(a.x)|(f32tof16(a.y)<<16);} -#define AU1_AH2_AF2(a) AU1_AH2_AF2_x(AF2(a)) +#define AU1_AH2_AF2(a) AU1_AH2_AF2_x(AF2(a)) #define AU1_AB4Unorm_AF4(x) D3DCOLORtoUBYTE4(AF4(x)) AF2 AF2_AH2_AU1_x(AU1 x){return AF2(f16tof32(x&0xFFFF),f16tof32(x>>16));} #define AF2_AH2_AU1(x) AF2_AH2_AU1_x(AU1(x)) @@ -906,7 +906,7 @@ AF2 APSinCosF1(AF1 x){AF1 y=AFractF1(x*AF1_(0.5)+AF1_(0.75));y=y*AF1_(2.0)-AF1_( #ifdef A_HALF AH1 APSinH1(AH1 x){return x*abs(x)-x;} AH2 APSinH2(AH2 x){return x*abs(x)-x;} // AND,FMA -AH1 APCosH1(AH1 x){x=AFractH1(x*AH1_(0.5)+AH1_(0.75));x=x*AH1_(2.0)-AH1_(1.0);return APSinH1(x);} +AH1 APCosH1(AH1 x){x=AFractH1(x*AH1_(0.5)+AH1_(0.75));x=x*AH1_(2.0)-AH1_(1.0);return APSinH1(x);} AH2 APCosH2(AH2 x){x=AFractH2(x*AH2_(0.5)+AH2_(0.75));x=x*AH2_(2.0)-AH2_(1.0);return APSinH2(x);} // 3x FMA, 2xFRACT, AND AH2 APSinCosH1(AH1 x){AH1 y=AFractH1(x*AH1_(0.5)+AH1_(0.75));y=y*AH1_(2.0)-AH1_(1.0);return APSinH2(AH2(x,y));} #endif @@ -1033,9 +1033,9 @@ AF2 ATo709F2(AF2 c){AF3 j=AF3(0.018*4.5,4.5,0.45);AF2 k=AF2(1.099,-0.099); return clamp(j.xx ,c*j.yy ,pow(c,j.zz )*k.xx +k.yy );} AF3 ATo709F3(AF3 c){AF3 j=AF3(0.018*4.5,4.5,0.45);AF2 k=AF2(1.099,-0.099); return clamp(j.xxx,c*j.yyy,pow(c,j.zzz)*k.xxx+k.yyy);} -AF1 AToGammaF1(AF1 c,AF1 rcpX){return pow(c,AF1_(rcpX));} -AF2 AToGammaF2(AF2 c,AF1 rcpX){return pow(c,AF2_(rcpX));} -AF3 AToGammaF3(AF3 c,AF1 rcpX){return pow(c,AF3_(rcpX));} +AF1 AToGammaF1(AF1 c,AF1 rcpX){return pow(c,AF1_(rcpX));} +AF2 AToGammaF2(AF2 c,AF1 rcpX){return pow(c,AF2_(rcpX));} +AF3 AToGammaF3(AF3 c,AF1 rcpX){return pow(c,AF3_(rcpX));} AF1 AToPqF1(AF1 x){AF1 p=pow(x,AF1_(0.159302)); return pow((AF1_(0.835938)+AF1_(18.8516)*p)/(AF1_(1.0)+AF1_(18.6875)*p),AF1_(78.8438));} AF2 AToPqF1(AF2 x){AF2 p=pow(x,AF2_(0.159302)); @@ -1062,9 +1062,9 @@ AF2 AFrom709F2(AF2 c){AF3 j=AF3(0.081/4.5,1.0/4.5,1.0/0.45);AF2 k=AF2(1.0/1.099, return AZolSelF2(AZolSignedF2(c-j.xx ),c*j.yy ,pow(c*k.xx +k.yy ,j.zz ));} AF3 AFrom709F3(AF3 c){AF3 j=AF3(0.081/4.5,1.0/4.5,1.0/0.45);AF2 k=AF2(1.0/1.099,0.099/1.099); return AZolSelF3(AZolSignedF3(c-j.xxx),c*j.yyy,pow(c*k.xxx+k.yyy,j.zzz));} -AF1 AFromGammaF1(AF1 c,AF1 x){return pow(c,AF1_(x));} -AF2 AFromGammaF2(AF2 c,AF1 x){return pow(c,AF2_(x));} -AF3 AFromGammaF3(AF3 c,AF1 x){return pow(c,AF3_(x));} +AF1 AFromGammaF1(AF1 c,AF1 x){return pow(c,AF1_(x));} +AF2 AFromGammaF2(AF2 c,AF1 x){return pow(c,AF2_(x));} +AF3 AFromGammaF3(AF3 c,AF1 x){return pow(c,AF3_(x));} AF1 AFromPqF1(AF1 x){AF1 p=pow(x,AF1_(0.0126833)); return pow(ASatF1(p-AF1_(0.835938))/(AF1_(18.8516)-AF1_(18.6875)*p),AF1_(6.27739));} AF2 AFromPqF1(AF2 x){AF2 p=pow(x,AF2_(0.0126833)); diff --git a/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ffx_fsr1_flattened.inc b/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ffx_fsr1_flattened.inc index 5919ab2f4f..5d8aab1062 100644 --- a/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ffx_fsr1_flattened.inc +++ b/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ffx_fsr1_flattened.inc @@ -362,7 +362,7 @@ AF1 rcpL=APrxMedRcpF1(AF1_(4.0)*lobe+AF1_(1.0)); pixR=(lobe*bR+lobe*dR+lobe*hR+lobe*fR+eR)*rcpL; pixG=(lobe*bG+lobe*dG+lobe*hG+lobe*fG+eG)*rcpL; pixB=(lobe*bB+lobe*dB+lobe*hB+lobe*fB+eB)*rcpL; -return;} +return;} #endif #if defined(A_GPU)&&defined(A_HALF)&&defined(FSR_RCAS_H) AH4 FsrRcasLoadH(ASW2 p); diff --git a/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ubershader.glsl b/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ubershader.glsl index bff86f0503..700a75c06b 100644 --- a/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ubershader.glsl +++ b/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ubershader.glsl @@ -29,7 +29,7 @@ layout(set=0,binding=1,rgba8) uniform writeonly image2D OutputTexture; #define FSR_EASU_H 1 AH4 FsrEasuRH(AF2 p) { AH4 res = AH4(textureGather(InputTexture, p, 0)); return res; } AH4 FsrEasuGH(AF2 p) { AH4 res = AH4(textureGather(InputTexture, p, 1)); return res; } - AH4 FsrEasuBH(AF2 p) { AH4 res = AH4(textureGather(InputTexture, p, 2)); return res; } + AH4 FsrEasuBH(AF2 p) { AH4 res = AH4(textureGather(InputTexture, p, 2)); return res; } #endif #if SAMPLE_RCAS #define FSR_RCAS_H diff --git a/rpcs3/Emu/RSX/rsx_decode.h b/rpcs3/Emu/RSX/rsx_decode.h index bdf0c4aabd..edbef500f6 100644 --- a/rpcs3/Emu/RSX/rsx_decode.h +++ b/rpcs3/Emu/RSX/rsx_decode.h @@ -4629,7 +4629,7 @@ struct texture_format_helper { return bf_decoder<2, 1, bool>(value); } - + u8 border_type() const { return bf_decoder<3, 1>(value); diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index ef619f3a49..059b02febf 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -182,7 +182,7 @@ void Emulator::BlockingCallFromMainThread(std::function&& func) const } } -// This function ensures constant initialization order between different compilers and builds +// This function ensures constant initialization order between different compilers and builds void init_fxo_for_exec(utils::serial* ar, bool full = false) { g_fxo->init(); @@ -2833,13 +2833,13 @@ std::shared_ptr Emulator::Kill(bool allow_autoexit, bool savestat if (fs::remove_file(old_path)) { - sys_log.success("Old savestate has been removed: path='%s'", old_path); + sys_log.success("Old savestate has been removed: path='%s'", old_path); } // For backwards compatibility - avoid having loose files if (fs::remove_file(old_path2)) { - sys_log.success("Old savestate has been removed: path='%s'", old_path2); + sys_log.success("Old savestate has been removed: path='%s'", old_path2); } sys_log.success("Saved savestate! path='%s'", path); diff --git a/rpcs3/Emu/system_config.h b/rpcs3/Emu/system_config.h index 6ddf718559..9ee57bd99c 100644 --- a/rpcs3/Emu/system_config.h +++ b/rpcs3/Emu/system_config.h @@ -91,8 +91,8 @@ struct cfg_root : cfg::node cfg::_int<10, 3000> clocks_scale{ this, "Clocks scale", 100 }; // Changing this from 100 (percentage) may affect game speed in unexpected ways cfg::uint<0, 3000> spu_wakeup_delay{ this, "SPU Wake-Up Delay", 0, true }; cfg::uint<0, (1 << 6) - 1> spu_wakeup_delay_mask{ this, "SPU Wake-Up Delay Thread Mask", (1 << 6) - 1, true }; - cfg::uint<0, 400> max_cpu_preempt_count_per_frame{ this, "Max CPU Preempt Count", 0, true }; - cfg::_bool allow_rsx_cpu_preempt{ this, "Allow RSX CPU Preemptions", true, true }; + cfg::uint<0, 400> max_cpu_preempt_count_per_frame{ this, "Max CPU Preempt Count", 0, true }; + cfg::_bool allow_rsx_cpu_preempt{ this, "Allow RSX CPU Preemptions", true, true }; #if defined (__linux__) || defined (__APPLE__) cfg::_enum sleep_timers_accuracy{ this, "Sleep Timers Accuracy", sleep_timers_accuracy_level::_as_host, true }; #else diff --git a/rpcs3/Emu/title.h b/rpcs3/Emu/title.h index 79f63d2922..7084231f32 100644 --- a/rpcs3/Emu/title.h +++ b/rpcs3/Emu/title.h @@ -13,6 +13,6 @@ namespace rpcs3 std::string vulkan_adapter; double fps = .0; }; - + std::string get_formatted_title(const title_format_data& title_data); } diff --git a/rpcs3/Input/hid_pad_handler.cpp b/rpcs3/Input/hid_pad_handler.cpp index 6ade38c54e..d241feed31 100644 --- a/rpcs3/Input/hid_pad_handler.cpp +++ b/rpcs3/Input/hid_pad_handler.cpp @@ -70,7 +70,7 @@ bool hid_pad_handler::Init() #if defined(__APPLE__) hid_darwin_set_open_exclusive(0); #endif - + for (usz i = 1; i <= MAX_GAMEPADS; i++) // Controllers 1-n in GUI { m_controllers.emplace(m_name_string + std::to_string(i), std::make_shared()); diff --git a/rpcs3/Input/sdl_pad_handler.cpp b/rpcs3/Input/sdl_pad_handler.cpp index d7ca6170fe..8f726f0dff 100644 --- a/rpcs3/Input/sdl_pad_handler.cpp +++ b/rpcs3/Input/sdl_pad_handler.cpp @@ -484,7 +484,7 @@ u32 sdl_pad_handler::get_battery_color(SDL_JoystickPowerLevel power_level, u32 b case SDL_JOYSTICK_POWER_WIRED: combined_color = 0x00FF; break; case SDL_JOYSTICK_POWER_MAX: combined_color = 0x00FF; break; } - + const u32 red = (combined_color >> 8) * brightness / 100; const u32 green = (combined_color & 0xff) * brightness / 100; return ((red << 8) | green); @@ -565,7 +565,7 @@ void sdl_pad_handler::get_extended_info(const pad_ensemble& binding) pad->m_sensors[2].m_value = Clamp0To1023((accel_z / SDL_STANDARD_GRAVITY) * -1 * 113 + 512); } } - + if (dev->sdl.has_gyro) { if (SDL_GameControllerGetSensorData(dev->sdl.game_controller, SDL_SENSOR_GYRO, dev->values_gyro.data(), 3) != 0) diff --git a/rpcs3/Loader/disc.cpp b/rpcs3/Loader/disc.cpp index 04a59e658b..7d0891bfe6 100644 --- a/rpcs3/Loader/disc.cpp +++ b/rpcs3/Loader/disc.cpp @@ -93,32 +93,32 @@ namespace disc search_dir = std::move(parent_dir); } - + for (usz i = 0; i < lines.size(); i++) { const std::string& line = lines[i]; const usz pos = line.find('='); - + if (pos == umax) { continue; } - + const std::string key = fmt::trim(line.substr(0, pos)); std::string value; - + if (pos != (line.size() - 1)) { value = fmt::trim(line.substr(pos + 1)); } - + if (value.empty() && i != (lines.size() - 1) && line.size() != 1) { // Some games have a character on the last line of the file, don't print the error in those cases. disc_log.warning("Unusual or malformed entry in SYSTEM.CNF ignored: %s", line); continue; } - + if (key == "BOOT2") { disc_log.notice("SYSTEM.CNF - Detected PS2 Disc = %s", value); @@ -138,12 +138,12 @@ namespace disc disc_log.notice("SYSTEM.CNF - Software version = %s", value); } } - + if (type == disc_type::unknown) { disc_log.error("SYSTEM.CNF - Disc is not a PSX/PSone or PS2 game!"); } - + return type; } } diff --git a/rpcs3/Loader/mself.cpp b/rpcs3/Loader/mself.cpp index 08ea803367..0437cb4d13 100644 --- a/rpcs3/Loader/mself.cpp +++ b/rpcs3/Loader/mself.cpp @@ -42,7 +42,7 @@ bool extract_mself(const std::string& file, const std::string& extract_to) if (!mself.read(recs)) { mself_log.error("Error extracting MSELF records"); - return false; + return false; } std::vector buffer; diff --git a/rpcs3/resource.h b/rpcs3/resource.h index 18aedf4013..1b0fd304b4 100644 --- a/rpcs3/resource.h +++ b/rpcs3/resource.h @@ -2,7 +2,7 @@ #define IDI_ICON1 101 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 102 diff --git a/rpcs3/rpcs3qt/game_list_grid.h b/rpcs3/rpcs3qt/game_list_grid.h index dc5b336662..f2c7bd36f9 100644 --- a/rpcs3/rpcs3qt/game_list_grid.h +++ b/rpcs3/rpcs3qt/game_list_grid.h @@ -24,5 +24,5 @@ public: [[nodiscard]] qreal getMarginFactor() const; private: - game_list_grid_delegate* grid_item_delegate; + game_list_grid_delegate* grid_item_delegate; }; diff --git a/rpcs3/rpcs3qt/gui_settings.h b/rpcs3/rpcs3qt/gui_settings.h index 9e52fd17f0..464daf21c4 100644 --- a/rpcs3/rpcs3qt/gui_settings.h +++ b/rpcs3/rpcs3qt/gui_settings.h @@ -117,7 +117,7 @@ namespace gui const QString config = "Config"; const QString log_viewer = "LogViewer"; const QString sc = "Shortcuts"; - + const QString update_on = "true"; const QString update_off = "false"; const QString update_auto = "auto"; diff --git a/rpcs3/rpcs3qt/kernel_explorer.cpp b/rpcs3/rpcs3qt/kernel_explorer.cpp index eb42958c70..2c2c7ef4ab 100644 --- a/rpcs3/rpcs3qt/kernel_explorer.cpp +++ b/rpcs3/rpcs3qt/kernel_explorer.cpp @@ -364,7 +364,7 @@ void kernel_explorer::update() case SYS_MUTEX_OBJECT: { auto& mutex = static_cast(obj); - const auto control = mutex.control.load(); + const auto control = mutex.control.load(); show_waiters(add_solid_node(node, qstr(fmt::format(u8"Mutex 0x%08x: ā€œ%sā€, %s,%s Owner: %#x, Locks: %u, Key: %#llx, Conds: %u", id, lv2_obj::name64(mutex.name), mutex.protocol, mutex.recursive == SYS_SYNC_RECURSIVE ? " Recursive," : "", control.owner, +mutex.lock_count, mutex.key, mutex.cond_count))), control.sq); break; diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index 75c700cad9..b025bb2a78 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -969,7 +969,7 @@ void main_window::HandlePackageInstallation(QStringList file_paths) if (pdlg.wasCanceled()) { cancelled = true; - + for (package_reader& reader : readers) { reader.abort_extract(); @@ -1072,7 +1072,7 @@ void main_window::HandlePackageInstallation(QStringList file_paths) QCheckBox* quick_check = new QCheckBox(tr("Add launcher shortcut(s)")); #endif QLabel* label = new QLabel(tr("Successfully installed software from package(s)!\nWould you like to install shortcuts to the installed software? (%1 new software detected)\n\n").arg(bootable_paths_installed.size()), dlg); - + vlayout->addWidget(label); vlayout->addStretch(10); vlayout->addWidget(desk_check); @@ -1081,7 +1081,7 @@ void main_window::HandlePackageInstallation(QStringList file_paths) vlayout->addStretch(3); QDialogButtonBox* btn_box = new QDialogButtonBox(QDialogButtonBox::Ok); - + vlayout->addWidget(btn_box); dlg->setLayout(vlayout); @@ -2636,7 +2636,7 @@ void main_window::CreateConnects() m_gui_settings->SetCategoryVisibility(id, checked); } }); - + connect(ui->menuGame_Categories, &QMenu::aboutToShow, ui->menuGame_Categories, [this, get_cats]() { const auto set_cat_count = [&](QAction* act, const QString& text) diff --git a/rpcs3/rpcs3qt/rsx_debugger.cpp b/rpcs3/rpcs3qt/rsx_debugger.cpp index 5525c5bd9f..8369b2ee98 100644 --- a/rpcs3/rpcs3qt/rsx_debugger.cpp +++ b/rpcs3/rpcs3qt/rsx_debugger.cpp @@ -999,7 +999,7 @@ void rsx_debugger::GetBuffers() const for (u32 i = 0; i < textures.size(); i++) { - // Technically it can also check if used by shader but idk + // Technically it can also check if used by shader but idk if (textures[i].enabled() && textures[i].width()) { if (!text.isEmpty()) @@ -1147,7 +1147,7 @@ void rsx_debugger::GetBuffers() const else if (code == 3) { return 0; - } // otherwise is the default values + } // otherwise is the default values break; } @@ -1155,7 +1155,7 @@ void rsx_debugger::GetBuffers() const { fmt::throw_exception("Unreachable!"); break; - } + } } return ((a1 * a1_portion + a0 * a0_portion) / (a0_portion + a1_portion)) << shift; diff --git a/rpcs3/rpcs3qt/sendmessage_dialog_frame.h b/rpcs3/rpcs3qt/sendmessage_dialog_frame.h index 21599128a7..0c2b5d3f10 100644 --- a/rpcs3/rpcs3qt/sendmessage_dialog_frame.h +++ b/rpcs3/rpcs3qt/sendmessage_dialog_frame.h @@ -24,7 +24,7 @@ private: private: custom_dialog* m_dialog = nullptr; QListWidget* m_lst_friends = nullptr; - + std::shared_ptr m_rpcn; Q_SIGNALS: diff --git a/rpcs3/rpcs3qt/settings.h b/rpcs3/rpcs3qt/settings.h index 54083ee614..6b68ac89a4 100644 --- a/rpcs3/rpcs3qt/settings.h +++ b/rpcs3/rpcs3qt/settings.h @@ -30,7 +30,7 @@ public: ~settings(); QString GetSettingsDir() const; - + QVariant GetValue(const QString& key, const QString& name, const QVariant& def) const; QVariant GetValue(const gui_save& entry) const; static QVariant List2Var(const q_pair_list& list); diff --git a/rpcs3/rpcs3qt/user_account.h b/rpcs3/rpcs3qt/user_account.h index 3740fd233b..46991f7565 100644 --- a/rpcs3/rpcs3qt/user_account.h +++ b/rpcs3/rpcs3qt/user_account.h @@ -5,7 +5,7 @@ #include #include -// Do not confuse this with the "user" in Emu/System.h. +// Do not confuse this with the "user" in Emu/System.h. // That user is read from config.yml, and it only represents the currently "logged in" user. // The user_account class will represent all users in the home directory for the User Manager dialog. // Selecting a user account in this dialog and saving writes it to config.yml. diff --git a/rpcs3/rpcs3qt/vfs_dialog_usb_input.cpp b/rpcs3/rpcs3qt/vfs_dialog_usb_input.cpp index fbe803bdd1..5be29d6bdf 100644 --- a/rpcs3/rpcs3qt/vfs_dialog_usb_input.cpp +++ b/rpcs3/rpcs3qt/vfs_dialog_usb_input.cpp @@ -71,7 +71,7 @@ vfs_dialog_usb_input::vfs_dialog_usb_input(const QString& name, const cfg::devic m_serial_edit = new QLineEdit; m_serial_edit->setMaxLength(64); // Max length defined in sys_fs m_serial_edit->setText(QString::fromStdString(info->serial)); - + QVBoxLayout* vbox_left = new QVBoxLayout; vbox_left->addWidget(new QLabel(tr("Vendor ID:"))); vbox_left->addWidget(new QLabel(tr("Product ID:"))); diff --git a/rpcs3/util/atomic.cpp b/rpcs3/util/atomic.cpp index 4ee23a00a1..a1612b5626 100644 --- a/rpcs3/util/atomic.cpp +++ b/rpcs3/util/atomic.cpp @@ -50,7 +50,7 @@ static bool s_null_wait_cb(const void*, u64, u64){ return true; }; static thread_local bool(*s_tls_wait_cb)(const void* data, u64 attempts, u64 stamp0) = s_null_wait_cb; // Callback for wait() function for a second custon condition, commonly passed with timeout -static thread_local bool(*s_tls_one_time_wait_cb)(u64 attempts) = nullptr; +static thread_local bool(*s_tls_one_time_wait_cb)(u64 attempts) = nullptr; // Callback for notification functions for optimizations static thread_local void(*s_tls_notify_cb)(const void* data, u64 progress) = nullptr;