From 6555de6ef50cc2c979242969a84b704f7d796b63 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Fri, 21 Apr 2023 16:07:16 +0200 Subject: [PATCH] fix warnings --- rpcs3/Emu/Cell/lv2/sys_prx.cpp | 2 +- rpcs3/Emu/NP/np_requests.cpp | 3 --- rpcs3/Emu/RSX/Common/texture_cache.h | 4 ++-- rpcs3/Emu/RSX/VK/vkutils/device.cpp | 2 +- rpcs3/Emu/System.cpp | 3 +-- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/rpcs3/Emu/Cell/lv2/sys_prx.cpp b/rpcs3/Emu/Cell/lv2/sys_prx.cpp index dbdc6343d7..ebddeb06dd 100644 --- a/rpcs3/Emu/Cell/lv2/sys_prx.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_prx.cpp @@ -884,7 +884,7 @@ error_code _sys_prx_register_library(ppu_thread& ppu, vm::ptr library) if (flags.front()) { - const bool success = idm::select([&](u32 id, lv2_prx& prx) + const bool success = idm::select([&](u32 /*id*/, lv2_prx& prx) { if (prx.state == PRX_STATE_INITIALIZED) { diff --git a/rpcs3/Emu/NP/np_requests.cpp b/rpcs3/Emu/NP/np_requests.cpp index 27348a0b89..3a18173f2f 100644 --- a/rpcs3/Emu/NP/np_requests.cpp +++ b/rpcs3/Emu/NP/np_requests.cpp @@ -996,7 +996,6 @@ namespace np memset(tdata->rankArray.get_ptr(), 0, tdata->rankArraySize); auto* fb_rankarray = resp->rankArray(); - u32 target_index = 0; vm::ptr rankArray = vm::static_ptr_cast(tdata->rankArray); vm::ptr rankPlayerArray = vm::static_ptr_cast(tdata->rankArray); @@ -1030,8 +1029,6 @@ namespace np cur_rank->scoreValue = fb_rankdata->score(); cur_rank->hasGameData = fb_rankdata->hasGameData(); cur_rank->recordDate.tick = fb_rankdata->recordDate(); - - target_index++; } if (tdata->commentArray) diff --git a/rpcs3/Emu/RSX/Common/texture_cache.h b/rpcs3/Emu/RSX/Common/texture_cache.h index 02cf355fb0..de6d4fd204 100644 --- a/rpcs3/Emu/RSX/Common/texture_cache.h +++ b/rpcs3/Emu/RSX/Common/texture_cache.h @@ -609,13 +609,13 @@ namespace rsx { auto protect_ranges = [this](address_range_vector& _set, utils::protection _prot) { - u32 count = 0; + //u32 count = 0; for (auto &range : _set) { if (range.valid()) { rsx::memory_protect(range, _prot); - count++; + //count++; } } //rsx_log.error("Set protection of %d blocks to 0x%x", count, static_cast(prot)); diff --git a/rpcs3/Emu/RSX/VK/vkutils/device.cpp b/rpcs3/Emu/RSX/VK/vkutils/device.cpp index 3360780f6b..a11134e157 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/device.cpp +++ b/rpcs3/Emu/RSX/VK/vkutils/device.cpp @@ -691,7 +691,7 @@ namespace vk // GTX970 workaround/hack // The driver reports a full working 4GB of memory which is incorrect. // Limit to ~2.5GB to allow vma to avoid running over the headroom of 0.5G. - memory_map.device_local_total_bytes = 2560 * 0x100000; + memory_map.device_local_total_bytes = 2560ULL * 0x100000ULL; } } diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index 1f7a226770..7b52a1b794 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -210,7 +210,7 @@ void init_fxo_for_exec(utils::serial* ar, bool full = false) { Emu.ExecDeserializationRemnants(); - auto flags = (*ar)(Emu.m_savestate_extension_flags1); + [[maybe_unused]] auto flags = (*ar)(Emu.m_savestate_extension_flags1); const usz advance = (Emu.m_savestate_extension_flags1 & Emulator::SaveStateExtentionFlags1::SupportsMenuOpenResume ? 32 : 31); @@ -2506,7 +2506,6 @@ void Emulator::Resume() } } -s32 sysutil_send_system_cmd(u64 status, u64 param); u64 get_sysutil_cb_manager_read_count(); void process_qt_events();