From d92d55923bf621bca3e0fc90f652211532476be0 Mon Sep 17 00:00:00 2001 From: kalaposfos13 <153381648+kalaposfos13@users.noreply.github.com> Date: Mon, 2 Mar 2026 20:36:59 +0100 Subject: [PATCH] possibly the biggest clang-format commit in shadPS4 so far --- src/common/logging/backend.cpp | 3 +-- .../devtools/widget/imgui_memory_editor.h | 4 ++-- src/core/emulator_settings.cpp | 6 ++++-- src/core/libraries/audio/audioin.h | 2 +- src/core/libraries/audio/sdl_audio_out.cpp | 6 ++---- src/core/libraries/network/netctl.cpp | 5 ++--- src/core/libraries/np/np_manager.cpp | 6 ++---- src/core/libraries/np/np_matching2.cpp | 3 +-- src/core/libraries/np/trophy_ui.cpp | 3 +-- src/core/libraries/pad/pad.cpp | 6 ++---- .../libraries/save_data/save_instance.cpp | 7 +++---- src/core/libraries/save_data/savedata.cpp | 4 ++-- src/core/libraries/system/userservice.cpp | 5 +---- src/core/libraries/usbd/usbd.cpp | 1 - src/core/libraries/videoout/driver.cpp | 4 ++-- src/core/libraries/videoout/video_out.cpp | 5 ++--- src/core/user_manager.cpp | 6 ++---- src/imgui/renderer/imgui_impl_sdl3.cpp | 3 +-- src/sdl_window.cpp | 6 ++---- src/video_core/amdgpu/liverpool.cpp | 9 +++------ src/video_core/buffer_cache/memory_tracker.h | 3 +-- src/video_core/buffer_cache/region_manager.h | 6 ++---- src/video_core/cache_storage.cpp | 20 ++++++++----------- .../renderer_vulkan/vk_platform.cpp | 9 +++------ .../renderer_vulkan/vk_presenter.cpp | 3 +-- .../texture_cache/texture_cache.cpp | 7 +++---- 26 files changed, 54 insertions(+), 88 deletions(-) diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp index a689129af..5de4f64a0 100644 --- a/src/common/logging/backend.cpp +++ b/src/common/logging/backend.cpp @@ -185,8 +185,7 @@ public: void PushEntry(Class log_class, Level log_level, const char* filename, unsigned int line_num, const char* function, const char* format, const fmt::format_args& args) { - if (!filter.CheckMessage(log_class, log_level) || - !EmulatorSettings.IsLogEnabled()) { + if (!filter.CheckMessage(log_class, log_level) || !EmulatorSettings.IsLogEnabled()) { return; } diff --git a/src/core/devtools/widget/imgui_memory_editor.h b/src/core/devtools/widget/imgui_memory_editor.h index 086cfb1d2..4cef31fa4 100644 --- a/src/core/devtools/widget/imgui_memory_editor.h +++ b/src/core/devtools/widget/imgui_memory_editor.h @@ -88,8 +88,8 @@ #if defined(_MSC_VER) || defined(_UCRT) #pragma warning(push) -#pragma warning( \ - disable : 4996) // warning C4996: 'sprintf': This function or variable may be unsafe. +#pragma warning(disable \ + : 4996) // warning C4996: 'sprintf': This function or variable may be unsafe. #endif struct MemoryEditor { diff --git a/src/core/emulator_settings.cpp b/src/core/emulator_settings.cpp index 44ad17935..18954ea06 100644 --- a/src/core/emulator_settings.cpp +++ b/src/core/emulator_settings.cpp @@ -99,7 +99,8 @@ void EmulatorSettingsImpl::RemoveGameInstallDir(const std::filesystem::path& dir } } -void EmulatorSettingsImpl::SetGameInstallDirEnabled(const std::filesystem::path& dir, bool enabled) { +void EmulatorSettingsImpl::SetGameInstallDirEnabled(const std::filesystem::path& dir, + bool enabled) { auto iterator = std::find_if(m_general.install_dirs.value.begin(), m_general.install_dirs.value.end(), [&dir](const GameInstallDir& install_dir) { return install_dir.path == dir; }); @@ -108,7 +109,8 @@ void EmulatorSettingsImpl::SetGameInstallDirEnabled(const std::filesystem::path& } } -void EmulatorSettingsImpl::SetGameInstallDirs(const std::vector& dirs_config) { +void EmulatorSettingsImpl::SetGameInstallDirs( + const std::vector& dirs_config) { m_general.install_dirs.value.clear(); for (const auto& dir : dirs_config) { m_general.install_dirs.value.push_back({dir, true}); diff --git a/src/core/libraries/audio/audioin.h b/src/core/libraries/audio/audioin.h index 156fa924b..be43315e0 100644 --- a/src/core/libraries/audio/audioin.h +++ b/src/core/libraries/audio/audioin.h @@ -3,8 +3,8 @@ #pragma once -#include #include +#include #include #include "common/types.h" diff --git a/src/core/libraries/audio/sdl_audio_out.cpp b/src/core/libraries/audio/sdl_audio_out.cpp index 83b24d812..87ed5713d 100644 --- a/src/core/libraries/audio/sdl_audio_out.cpp +++ b/src/core/libraries/audio/sdl_audio_out.cpp @@ -110,8 +110,7 @@ public: max_channel_gain = std::max(max_channel_gain, channel_gain); } - const float slider_gain = - EmulatorSettings.GetVolumeSlider() * 0.01f; // Faster than /100.0f + const float slider_gain = EmulatorSettings.GetVolumeSlider() * 0.01f; // Faster than /100.0f const float total_gain = max_channel_gain * slider_gain; const float current = current_gain.load(std::memory_order_acquire); @@ -157,8 +156,7 @@ private: } // Initialize current gain - current_gain.store(EmulatorSettings.GetVolumeSlider() * 0.01f, - std::memory_order_relaxed); + current_gain.store(EmulatorSettings.GetVolumeSlider() * 0.01f, std::memory_order_relaxed); if (!SelectConverter()) { FreeAlignedBuffer(); diff --git a/src/core/libraries/network/netctl.cpp b/src/core/libraries/network/netctl.cpp index af7c071ab..b2a76f92e 100644 --- a/src/core/libraries/network/netctl.cpp +++ b/src/core/libraries/network/netctl.cpp @@ -180,9 +180,8 @@ int PS4_SYSV_ABI sceNetCtlGetInfo(int code, OrbisNetCtlInfo* info) { info->mtu = 1500; // default value break; case ORBIS_NET_CTL_INFO_LINK: - info->link = EmulatorSettings.IsConnectedToNetwork() - ? ORBIS_NET_CTL_LINK_CONNECTED - : ORBIS_NET_CTL_LINK_DISCONNECTED; + info->link = EmulatorSettings.IsConnectedToNetwork() ? ORBIS_NET_CTL_LINK_CONNECTED + : ORBIS_NET_CTL_LINK_DISCONNECTED; break; case ORBIS_NET_CTL_INFO_IP_ADDRESS: { strcpy(info->ip_address, diff --git a/src/core/libraries/np/np_manager.cpp b/src/core/libraries/np/np_manager.cpp index 2998f07dc..596a89645 100644 --- a/src/core/libraries/np/np_manager.cpp +++ b/src/core/libraries/np/np_manager.cpp @@ -631,8 +631,7 @@ s32 PS4_SYSV_ABI sceNpGetNpId(Libraries::UserService::OrbisUserServiceUserId use return ORBIS_NP_ERROR_SIGNED_OUT; } memset(np_id, 0, sizeof(OrbisNpId)); - strncpy(np_id->handle.data, - UserManagement.GetDefaultUser().user_name.c_str(), + strncpy(np_id->handle.data, UserManagement.GetDefaultUser().user_name.c_str(), sizeof(np_id->handle.data)); return ORBIS_OK; } @@ -647,8 +646,7 @@ s32 PS4_SYSV_ABI sceNpGetOnlineId(Libraries::UserService::OrbisUserServiceUserId return ORBIS_NP_ERROR_SIGNED_OUT; } memset(online_id, 0, sizeof(OrbisNpOnlineId)); - strncpy(online_id->data, - UserManagement.GetDefaultUser().user_name.c_str(), + strncpy(online_id->data, UserManagement.GetDefaultUser().user_name.c_str(), sizeof(online_id->data)); return ORBIS_OK; } diff --git a/src/core/libraries/np/np_matching2.cpp b/src/core/libraries/np/np_matching2.cpp index 8fa8068dd..dcd2a9c23 100644 --- a/src/core/libraries/np/np_matching2.cpp +++ b/src/core/libraries/np/np_matching2.cpp @@ -376,8 +376,7 @@ int PS4_SYSV_ABI sceNpMatching2ContextStart(OrbisNpMatching2ContextId ctxId, u64 } std::scoped_lock lk{g_events_mutex}; - if (EmulatorSettings.IsConnectedToNetwork() && - EmulatorSettings.IsPSNSignedIn()) { + if (EmulatorSettings.IsConnectedToNetwork() && EmulatorSettings.IsPSNSignedIn()) { g_ctx_events.emplace_back(ctxId, ORBIS_NP_MATCHING2_CONTEXT_EVENT_STARTED, ORBIS_NP_MATCHING2_EVENT_CAUSE_CONTEXT_ACTION, 0); } else { diff --git a/src/core/libraries/np/trophy_ui.cpp b/src/core/libraries/np/trophy_ui.cpp index 2ffaf615f..1116d2b4b 100644 --- a/src/core/libraries/np/trophy_ui.cpp +++ b/src/core/libraries/np/trophy_ui.cpp @@ -93,8 +93,7 @@ TrophyUI::TrophyUI(const std::filesystem::path& trophyIconPath, const std::strin return; } - MIX_SetMasterGain( - mixer, static_cast(EmulatorSettings.GetVolumeSlider() / 100.f)); + MIX_SetMasterGain(mixer, static_cast(EmulatorSettings.GetVolumeSlider() / 100.f)); auto musicPathMp3 = CustomTrophy_Dir / "trophy.mp3"; auto musicPathWav = CustomTrophy_Dir / "trophy.wav"; diff --git a/src/core/libraries/pad/pad.cpp b/src/core/libraries/pad/pad.cpp index bb94d97a4..7cb8d6db2 100644 --- a/src/core/libraries/pad/pad.cpp +++ b/src/core/libraries/pad/pad.cpp @@ -32,8 +32,7 @@ int PS4_SYSV_ABI scePadDeviceClassGetExtendedInformation( LOG_ERROR(Lib_Pad, "(STUBBED) called"); std::memset(pExtInfo, 0, sizeof(OrbisPadDeviceClassExtendedInformation)); if (EmulatorSettings.IsUsingSpecialPad()) { - pExtInfo->deviceClass = - (OrbisPadDeviceClass)EmulatorSettings.GetSpecialPadClass(); + pExtInfo->deviceClass = (OrbisPadDeviceClass)EmulatorSettings.GetSpecialPadClass(); } return ORBIS_OK; } @@ -111,8 +110,7 @@ int PS4_SYSV_ABI scePadGetControllerInformation(s32 handle, OrbisPadControllerIn pInfo->connected = true; if (EmulatorSettings.IsUsingSpecialPad()) { pInfo->connectionType = ORBIS_PAD_PORT_TYPE_SPECIAL; - pInfo->deviceClass = - (OrbisPadDeviceClass)EmulatorSettings.GetSpecialPadClass(); + pInfo->deviceClass = (OrbisPadDeviceClass)EmulatorSettings.GetSpecialPadClass(); } return ORBIS_OK; } diff --git a/src/core/libraries/save_data/save_instance.cpp b/src/core/libraries/save_data/save_instance.cpp index 6aa179cf9..463baa50b 100644 --- a/src/core/libraries/save_data/save_instance.cpp +++ b/src/core/libraries/save_data/save_instance.cpp @@ -48,14 +48,13 @@ namespace Libraries::SaveData { fs::path SaveInstance::MakeTitleSavePath(Libraries::UserService::OrbisUserServiceUserId user_id, std::string_view game_serial) { - return EmulatorSettings.GetHomeDir() / std::to_string(user_id) / "savedata" / - game_serial; + return EmulatorSettings.GetHomeDir() / std::to_string(user_id) / "savedata" / game_serial; } fs::path SaveInstance::MakeDirSavePath(OrbisUserServiceUserId user_id, std::string_view game_serial, std::string_view dir_name) { - return EmulatorSettings.GetHomeDir() / std::to_string(user_id) / "savedata" / - game_serial / dir_name; + return EmulatorSettings.GetHomeDir() / std::to_string(user_id) / "savedata" / game_serial / + dir_name; } uint64_t SaveInstance::GetMaxBlockFromSFO(const PSF& psf) { diff --git a/src/core/libraries/save_data/savedata.cpp b/src/core/libraries/save_data/savedata.cpp index 2714b3b58..30a93afff 100644 --- a/src/core/libraries/save_data/savedata.cpp +++ b/src/core/libraries/save_data/savedata.cpp @@ -439,8 +439,8 @@ static Error saveDataMount(const OrbisSaveDataMount2* mount_info, LOG_INFO(Lib_SaveData, "called with invalid block size"); } - const auto root_save = EmulatorSettings.GetHomeDir() / - std::to_string(mount_info->userId) / "savedata"; + const auto root_save = + EmulatorSettings.GetHomeDir() / std::to_string(mount_info->userId) / "savedata"; fs::create_directories(root_save); const auto available = fs::space(root_save).available; diff --git a/src/core/libraries/system/userservice.cpp b/src/core/libraries/system/userservice.cpp index 5c36b472f..dd151d31c 100644 --- a/src/core/libraries/system/userservice.cpp +++ b/src/core/libraries/system/userservice.cpp @@ -1084,10 +1084,7 @@ s32 PS4_SYSV_ABI sceUserServiceGetUserColor(int user_id, OrbisUserServiceUserCol LOG_ERROR(Lib_UserService, "color is null"); return ORBIS_USER_SERVICE_ERROR_INVALID_ARGUMENT; } - *color = (OrbisUserServiceUserColor)EmulatorSettingsImpl::GetInstance() - ->GetUserManager() - .GetUserByID(user_id) - ->user_color; + *color = (OrbisUserServiceUserColor)UserManagement.GetUserByID(user_id)->user_color; return ORBIS_OK; } diff --git a/src/core/libraries/usbd/usbd.cpp b/src/core/libraries/usbd/usbd.cpp index 27a9d8293..507aa9ce8 100644 --- a/src/core/libraries/usbd/usbd.cpp +++ b/src/core/libraries/usbd/usbd.cpp @@ -10,7 +10,6 @@ #include #include - namespace Libraries::Usbd { s32 libusb_to_orbis_error(int retVal) { diff --git a/src/core/libraries/videoout/driver.cpp b/src/core/libraries/videoout/driver.cpp index ae6c85ffa..9db70569b 100644 --- a/src/core/libraries/videoout/driver.cpp +++ b/src/core/libraries/videoout/driver.cpp @@ -268,8 +268,8 @@ void VideoOutDriver::SubmitFlipInternal(VideoOutPort* port, s32 index, s64 flip_ } void VideoOutDriver::PresentThread(std::stop_token token) { - const std::chrono::nanoseconds vblank_period( - 1000000000 / EmulatorSettings.GetVblankFrequency()); + const std::chrono::nanoseconds vblank_period(1000000000 / + EmulatorSettings.GetVblankFrequency()); Common::SetCurrentThreadName("shadPS4:PresentThread"); Common::SetCurrentThreadRealtime(vblank_period); diff --git a/src/core/libraries/videoout/video_out.cpp b/src/core/libraries/videoout/video_out.cpp index 01ea36efd..7714eb2b5 100644 --- a/src/core/libraries/videoout/video_out.cpp +++ b/src/core/libraries/videoout/video_out.cpp @@ -455,9 +455,8 @@ s32 PS4_SYSV_ABI sceVideoOutSetWindowModeMargins(s32 handle, s32 top, s32 bottom } void RegisterLib(Core::Loader::SymbolsResolver* sym) { - driver = std::make_unique( - EmulatorSettings.GetInternalScreenWidth(), - EmulatorSettings.GetInternalScreenHeight()); + driver = std::make_unique(EmulatorSettings.GetInternalScreenWidth(), + EmulatorSettings.GetInternalScreenHeight()); LIB_FUNCTION("SbU3dwp80lQ", "libSceVideoOut", 1, "libSceVideoOut", sceVideoOutGetFlipStatus); LIB_FUNCTION("U46NwOiJpys", "libSceVideoOut", 1, "libSceVideoOut", sceVideoOutSubmitFlip); diff --git a/src/core/user_manager.cpp b/src/core/user_manager.cpp index 02b2eddbd..be0b13e58 100644 --- a/src/core/user_manager.cpp +++ b/src/core/user_manager.cpp @@ -16,8 +16,7 @@ bool UserManager::AddUser(const User& user) { m_users.user.push_back(user); // Create user home directory and subfolders - const auto user_dir = - EmulatorSettings.GetHomeDir() / std::to_string(user.user_id); + const auto user_dir = EmulatorSettings.GetHomeDir() / std::to_string(user.user_id); std::error_code ec; if (!std::filesystem::exists(user_dir)) { @@ -80,8 +79,7 @@ std::vector UserManager::CreateDefaultUser() { default_user.user_name = "shadPS4"; default_user.controller_port = 1; - const auto user_dir = - EmulatorSettings.GetHomeDir() / std::to_string(default_user.user_id); + const auto user_dir = EmulatorSettings.GetHomeDir() / std::to_string(default_user.user_id); if (!std::filesystem::exists(user_dir)) { std::filesystem::create_directory(user_dir); diff --git a/src/imgui/renderer/imgui_impl_sdl3.cpp b/src/imgui/renderer/imgui_impl_sdl3.cpp index 682afd758..8e2860638 100644 --- a/src/imgui/renderer/imgui_impl_sdl3.cpp +++ b/src/imgui/renderer/imgui_impl_sdl3.cpp @@ -665,8 +665,7 @@ static void UpdateMouseCursor() { } else if (cursorState == HideCursorState::Idle && bd->time - bd->lastCursorMoveTime >= - EmulatorSettings.GetCursorHideTimeout() * - SDL_GetPerformanceFrequency()) { + EmulatorSettings.GetCursorHideTimeout() * SDL_GetPerformanceFrequency()) { bool wasCursorVisible = SDL_CursorVisible(); SDL_HideCursor(); diff --git a/src/sdl_window.cpp b/src/sdl_window.cpp index 80ee219e2..4207ce3c5 100644 --- a/src/sdl_window.cpp +++ b/src/sdl_window.cpp @@ -117,10 +117,8 @@ WindowSDL::WindowSDL(s32 width_, s32 height_, Input::GameControllers* controller error = true; } if (!error) { - SDL_SetWindowFullscreenMode(window, EmulatorSettings.GetFullScreenMode() == - "Fullscreen" - ? displayMode - : NULL); + SDL_SetWindowFullscreenMode( + window, EmulatorSettings.GetFullScreenMode() == "Fullscreen" ? displayMode : NULL); } SDL_SetWindowFullscreen(window, EmulatorSettings.IsFullScreen()); diff --git a/src/video_core/amdgpu/liverpool.cpp b/src/video_core/amdgpu/liverpool.cpp index 8446e37b0..0648df922 100644 --- a/src/video_core/amdgpu/liverpool.cpp +++ b/src/video_core/amdgpu/liverpool.cpp @@ -229,10 +229,8 @@ Liverpool::Task Liverpool::ProcessGraphics(std::span dcb, std::span(dcb.data()); while (!dcb.empty()) { @@ -901,8 +899,7 @@ template Liverpool::Task Liverpool::ProcessCompute(std::span acb, u32 vqid) { FIBER_ENTER(acb_task_name[vqid]); auto& queue = asc_queues[{vqid}]; - const bool host_markers_enabled = - rasterizer && EmulatorSettings.IsVkHostMarkersEnabled(); + const bool host_markers_enabled = rasterizer && EmulatorSettings.IsVkHostMarkersEnabled(); struct IndirectPatch { const PM4Header* header; diff --git a/src/video_core/buffer_cache/memory_tracker.h b/src/video_core/buffer_cache/memory_tracker.h index 9a74c3c7e..a093be8dd 100644 --- a/src/video_core/buffer_cache/memory_tracker.h +++ b/src/video_core/buffer_cache/memory_tracker.h @@ -74,8 +74,7 @@ public: // modified. If we need to flush the flush function is going to perform CPU // state change. std::scoped_lock lk{manager->lock}; - if (EmulatorSettings.GetReadbacksMode() != - GpuReadbacksMode::Disabled && + if (EmulatorSettings.GetReadbacksMode() != GpuReadbacksMode::Disabled && manager->template IsRegionModified(offset, size)) { return true; } diff --git a/src/video_core/buffer_cache/region_manager.h b/src/video_core/buffer_cache/region_manager.h index 104fd721a..0bec330b1 100644 --- a/src/video_core/buffer_cache/region_manager.h +++ b/src/video_core/buffer_cache/region_manager.h @@ -95,8 +95,7 @@ public: } if constexpr (type == Type::CPU) { UpdateProtection(); - } else if (EmulatorSettings.GetReadbacksMode() == - GpuReadbacksMode::Precise) { + } else if (EmulatorSettings.GetReadbacksMode() == GpuReadbacksMode::Precise) { UpdateProtection(); } } @@ -127,8 +126,7 @@ public: bits.UnsetRange(start_page, end_page); if constexpr (type == Type::CPU) { UpdateProtection(); - } else if (EmulatorSettings.GetReadbacksMode() != - GpuReadbacksMode::Disabled) { + } else if (EmulatorSettings.GetReadbacksMode() != GpuReadbacksMode::Disabled) { UpdateProtection(); } } diff --git a/src/video_core/cache_storage.cpp b/src/video_core/cache_storage.cpp index 7117737fa..bc707b6d3 100644 --- a/src/video_core/cache_storage.cpp +++ b/src/video_core/cache_storage.cpp @@ -192,9 +192,8 @@ bool DataBase::Save(BlobType type, const std::string& name, std::vector&& da return false; } - auto path = EmulatorSettings.IsPipelineCacheArchived() - ? std::filesystem::path{name} - : cache_path / name; + auto path = EmulatorSettings.IsPipelineCacheArchived() ? std::filesystem::path{name} + : cache_path / name; return WriteVector(type, std::move(path), std::move(data)); } @@ -203,9 +202,8 @@ bool DataBase::Save(BlobType type, const std::string& name, std::vector&& d return false; } - auto path = EmulatorSettings.IsPipelineCacheArchived() - ? std::filesystem::path{name} - : cache_path / name; + auto path = EmulatorSettings.IsPipelineCacheArchived() ? std::filesystem::path{name} + : cache_path / name; return WriteVector(type, std::move(path), std::move(data)); } @@ -214,9 +212,8 @@ void DataBase::Load(BlobType type, const std::string& name, std::vector& dat return; } - auto path = EmulatorSettings.IsPipelineCacheArchived() - ? std::filesystem::path{name} - : cache_path / name; + auto path = EmulatorSettings.IsPipelineCacheArchived() ? std::filesystem::path{name} + : cache_path / name; return LoadVector(type, path, data); } @@ -225,9 +222,8 @@ void DataBase::Load(BlobType type, const std::string& name, std::vector& da return; } - auto path = EmulatorSettings.IsPipelineCacheArchived() - ? std::filesystem::path{name} - : cache_path / name; + auto path = EmulatorSettings.IsPipelineCacheArchived() ? std::filesystem::path{name} + : cache_path / name; return LoadVector(type, path, data); } diff --git a/src/video_core/renderer_vulkan/vk_platform.cpp b/src/video_core/renderer_vulkan/vk_platform.cpp index 1d1080b45..c77c80223 100644 --- a/src/video_core/renderer_vulkan/vk_platform.cpp +++ b/src/video_core/renderer_vulkan/vk_platform.cpp @@ -306,12 +306,9 @@ vk::UniqueInstance CreateInstance(Frontend::WindowSystemType window_type, bool e LOG_INFO(Render_Vulkan, "Enabled instance layers: {}", layers_string); // Validation settings - vk::Bool32 enable_core = - EmulatorSettings.IsVkValidationCoreEnabled() ? vk::True : vk::False; - vk::Bool32 enable_sync = - EmulatorSettings.IsVkValidationSyncEnabled() ? vk::True : vk::False; - vk::Bool32 enable_gpuav = - EmulatorSettings.IsVkValidationGpuEnabled() ? vk::True : vk::False; + vk::Bool32 enable_core = EmulatorSettings.IsVkValidationCoreEnabled() ? vk::True : vk::False; + vk::Bool32 enable_sync = EmulatorSettings.IsVkValidationSyncEnabled() ? vk::True : vk::False; + vk::Bool32 enable_gpuav = EmulatorSettings.IsVkValidationGpuEnabled() ? vk::True : vk::False; // Crash diagnostics settings static const auto crash_diagnostic_path = diff --git a/src/video_core/renderer_vulkan/vk_presenter.cpp b/src/video_core/renderer_vulkan/vk_presenter.cpp index 1893be0b6..3bf122cfc 100644 --- a/src/video_core/renderer_vulkan/vk_presenter.cpp +++ b/src/video_core/renderer_vulkan/vk_presenter.cpp @@ -104,8 +104,7 @@ static vk::Rect2D FitImage(s32 frame_width, s32 frame_height, s32 swapchain_widt Presenter::Presenter(Frontend::WindowSDL& window_, AmdGpu::Liverpool* liverpool_) : window{window_}, liverpool{liverpool_}, - instance{window, EmulatorSettings.GetGpuId(), - EmulatorSettings.IsVkValidationEnabled(), + instance{window, EmulatorSettings.GetGpuId(), EmulatorSettings.IsVkValidationEnabled(), EmulatorSettings.IsVkCrashDiagnosticEnabled()}, draw_scheduler{instance}, present_scheduler{instance}, flip_scheduler{instance}, swapchain{instance, window}, diff --git a/src/video_core/texture_cache/texture_cache.cpp b/src/video_core/texture_cache/texture_cache.cpp index 504e89a28..c73e7902f 100644 --- a/src/video_core/texture_cache/texture_cache.cpp +++ b/src/video_core/texture_cache/texture_cache.cpp @@ -649,8 +649,8 @@ ImageView& TextureCache::FindTexture(ImageId image_id, const ImageDesc& desc) { Image& image = slot_images[image_id]; if (desc.type == BindingType::Storage) { image.flags |= ImageFlagBits::GpuModified; - if (EmulatorSettings.IsReadbackLinearImagesEnabled() && - !image.info.props.is_tiled && image.info.guest_address != 0) { + if (EmulatorSettings.IsReadbackLinearImagesEnabled() && !image.info.props.is_tiled && + image.info.guest_address != 0) { download_images.emplace(image_id); } } @@ -661,8 +661,7 @@ ImageView& TextureCache::FindTexture(ImageId image_id, const ImageDesc& desc) { ImageView& TextureCache::FindRenderTarget(ImageId image_id, const ImageDesc& desc) { Image& image = slot_images[image_id]; image.flags |= ImageFlagBits::GpuModified; - if (EmulatorSettings.IsReadbackLinearImagesEnabled() && - !image.info.props.is_tiled) { + if (EmulatorSettings.IsReadbackLinearImagesEnabled() && !image.info.props.is_tiled) { download_images.emplace(image_id); } image.usage.render_target = 1u;