From 1b569fde4d2dc8a57531bef8a310bf113e2c1324 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 15 Sep 2026 00:27:01 +0200 Subject: [PATCH] Fix some warnings --- rpcs3/Emu/Cell/PPUModule.cpp | 2 +- rpcs3/Emu/RSX/NV47/HW/nv47_sync.hpp | 4 +--- rpcs3/Emu/system_utils.cpp | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/rpcs3/Emu/Cell/PPUModule.cpp b/rpcs3/Emu/Cell/PPUModule.cpp index 7f7d537913..b188c3b294 100644 --- a/rpcs3/Emu/Cell/PPUModule.cpp +++ b/rpcs3/Emu/Cell/PPUModule.cpp @@ -2155,7 +2155,7 @@ bool ppu_load_exec(const ppu_exec_object& elf, bool virtual_load, const std::str // Fetch information needed for allocating memory segmnents for (auto& prog : elf.progs) { - switch (const u32 p_type = prog.p_type) + switch (prog.p_type) { case 0x1: // LOAD { diff --git a/rpcs3/Emu/RSX/NV47/HW/nv47_sync.hpp b/rpcs3/Emu/RSX/NV47/HW/nv47_sync.hpp index a77da374df..141e98c8d8 100644 --- a/rpcs3/Emu/RSX/NV47/HW/nv47_sync.hpp +++ b/rpcs3/Emu/RSX/NV47/HW/nv47_sync.hpp @@ -2,14 +2,12 @@ #include #include "Emu/RSX/RSXThread.h" +#include "Emu/RSX/Host/MM.h" #include "context_accessors.define.h" namespace rsx { - void mm_flush_lazy(); - void mm_flush(); - namespace util { template diff --git a/rpcs3/Emu/system_utils.cpp b/rpcs3/Emu/system_utils.cpp index 5450d2e2cc..3ff56a689d 100644 --- a/rpcs3/Emu/system_utils.cpp +++ b/rpcs3/Emu/system_utils.cpp @@ -596,7 +596,7 @@ namespace rpcs3::utils return get_input_config_dir(title_id) + g_cfg_input_configs.default_config + ".yml"; } - std::string get_game_content_path(game_content_type type, const std::string& serial, std::string sfo_dir, const std::string& disc_dir, const std::string& archive_path, const std::string& game_dir, bool* in_archive) + std::string get_game_content_path(game_content_type type, const std::string& serial, std::string sfo_dir, const std::string& disc_dir, const std::string& archive_path, bool* in_archive) { if (in_archive) *in_archive = false; @@ -695,13 +695,13 @@ namespace rpcs3::utils { const std::string sfo_dir = info.is_iso_file ? (info.game_dir.empty() ? "PS3_GAME" : info.game_dir) : rpcs3::utils::get_sfo_dir_from_game_path(info.path, info.serial); bool in_archive = false; - std::string path = get_game_content_path(type, info.serial, sfo_dir, {}, info.is_iso_file ? info.path : "", info.game_dir, &in_archive); + std::string path = get_game_content_path(type, info.serial, sfo_dir, {}, info.is_iso_file ? info.path : "", &in_archive); return { std::move(path), in_archive }; } std::string get_game_content_path(game_content_type type) { - return get_game_content_path(type, Emu.GetTitleID(), Emu.GetSfoDir(false), vfs::get("/dev_bdvd/PS3_GAME"), {}, {}, nullptr); + return get_game_content_path(type, Emu.GetTitleID(), Emu.GetSfoDir(false), vfs::get("/dev_bdvd/PS3_GAME"), {}, nullptr); } bool version_is_bigger(std::string_view v0, std::string_view v1, std::string_view serial, bool is_fw)