From 0debcfed0a525ec5414c126a13fb5ec52bbdde37 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 2 Sep 2021 19:00:30 +0200 Subject: [PATCH] Silence some warnings --- rpcs3/Emu/Cell/SPUThread.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_net.cpp | 16 ++++++++-------- rpcs3/Emu/Cell/lv2/sys_net.h | 4 ++-- rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp | 2 +- rpcs3/Emu/RSX/Overlays/overlay_edit_text.hpp | 2 +- rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp | 8 ++++---- rpcs3/Emu/RSX/Overlays/overlay_fonts.h | 4 ++-- rpcs3/Emu/RSX/Overlays/overlay_osk.cpp | 4 ++-- rpcs3/Emu/RSX/RSXThread.cpp | 2 +- rpcs3/Emu/System.cpp | 6 +++--- rpcs3/Emu/system_progress.cpp | 8 ++++---- rpcs3/util/media_utils.cpp | 4 ++-- 12 files changed, 31 insertions(+), 31 deletions(-) diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index 37fb6a67df..c665a9ae5e 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -3205,7 +3205,7 @@ bool spu_thread::process_mfc_cmd() { state += cpu_flag::wait + cpu_flag::temp; std::this_thread::yield(); - !check_state(); + static_cast(check_state()); } }()) { diff --git a/rpcs3/Emu/Cell/lv2/sys_net.cpp b/rpcs3/Emu/Cell/lv2/sys_net.cpp index 49f464e32f..5ae2c0a925 100644 --- a/rpcs3/Emu/Cell/lv2/sys_net.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_net.cpp @@ -1672,7 +1672,7 @@ error_code sys_net_bnet_connect(ppu_thread& ppu, s32 s, vm::ptr buf, u32 { const auto get_data = [&](unsigned char *dest_buf) { - const u32 to_give = std::min(sock.p2ps.data_available, len); - sys_net.trace("STREAM-P2P socket had %d available, given %d", sock.p2ps.data_available, to_give); + const u32 to_give = std::min(sock.p2ps.data_available, len); + sys_net.trace("STREAM-P2P socket had %u available, given %u", sock.p2ps.data_available, to_give); u32 left_to_give = to_give; while (left_to_give) @@ -2652,7 +2652,7 @@ error_code sys_net_bnet_sendto(ppu_thread& ppu, s32 s, vm::cptr buf, u32 l } else if (type == SYS_NET_SOCK_STREAM_P2P) { - constexpr s64 max_data_len = (65535 - (sizeof(u16) + sizeof(lv2_socket::p2ps_i::encapsulated_tcp))); + constexpr u32 max_data_len = (65535 - (sizeof(u16) + sizeof(lv2_socket::p2ps_i::encapsulated_tcp))); // Prepare address name.sin_family = AF_INET; @@ -2664,10 +2664,10 @@ error_code sys_net_bnet_sendto(ppu_thread& ppu, s32 s, vm::cptr buf, u32 l tcp_header.dst_port = sock.p2ps.op_vport; // chop it up std::vector> stream_packets; - s64 cur_total_len = len; + u32 cur_total_len = len; while(cur_total_len > 0) { - s64 cur_data_len; + u32 cur_data_len; if (cur_total_len >= max_data_len) cur_data_len = max_data_len; else @@ -2676,7 +2676,7 @@ error_code sys_net_bnet_sendto(ppu_thread& ppu, s32 s, vm::cptr buf, u32 l tcp_header.length = cur_data_len; tcp_header.seq = sock.p2ps.cur_seq; - auto packet = nt_p2p_port::generate_u2s_packet(tcp_header, &_buf[len - cur_total_len], cur_data_len); + auto packet = nt_p2p_port::generate_u2s_packet(tcp_header, &_buf[len - cur_total_len], cur_data_len); nt_p2p_port::send_u2s_packet(sock, s, std::move(packet), &name, tcp_header.seq); cur_total_len -= cur_data_len; @@ -3273,7 +3273,7 @@ error_code sys_net_bnet_poll(ppu_thread& ppu, vm::ptr fds, s32 n { if ((fds[i].events & SYS_NET_POLLIN) && sock->p2ps.data_available) { - sys_net.trace("[P2PS] p2ps has %d bytes available", sock->p2ps.data_available); + sys_net.trace("[P2PS] p2ps has %u bytes available", sock->p2ps.data_available); fds_buf[i].revents |= SYS_NET_POLLIN; } diff --git a/rpcs3/Emu/Cell/lv2/sys_net.h b/rpcs3/Emu/Cell/lv2/sys_net.h index 006827d344..123a6010fa 100644 --- a/rpcs3/Emu/Cell/lv2/sys_net.h +++ b/rpcs3/Emu/Cell/lv2/sys_net.h @@ -414,10 +414,10 @@ struct lv2_socket final u32 op_addr = 0; u64 data_beg_seq = 0; // Seq of first byte of received_data - u32 data_available = 0; // Amount of continuous data available(calculated on ACK send) + u64 data_available = 0; // Amount of continuous data available(calculated on ACK send) std::map> received_data; // holds seq/data of data received - u32 cur_seq = 0; // SEQ of next packet to be sent + u64 cur_seq = 0; // SEQ of next packet to be sent } p2ps; // Value keepers diff --git a/rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp b/rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp index 4447e7a8ad..9e92e0cfa7 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp @@ -141,7 +141,7 @@ namespace rsx value.insert(caret_position, str); } - caret_position += ::narrow(str.length()); + caret_position += str.length(); m_reset_caret_pulse = true; set_unicode_text(value); refresh(); diff --git a/rpcs3/Emu/RSX/Overlays/overlay_edit_text.hpp b/rpcs3/Emu/RSX/Overlays/overlay_edit_text.hpp index a249343474..b7bbbaa413 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_edit_text.hpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_edit_text.hpp @@ -14,7 +14,7 @@ namespace rsx right }; - u16 caret_position = 0; + usz caret_position = 0; u16 vertical_scroll_offset = 0; bool m_reset_caret_pulse = false; diff --git a/rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp b/rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp index 0b325fbee7..09655bb141 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp @@ -283,7 +283,7 @@ namespace rsx } } - void font::render_text_ex(std::vector& result, f32& x_advance, f32& y_advance, const char32_t* text, u32 char_limit, u16 max_width, bool wrap) + void font::render_text_ex(std::vector& result, f32& x_advance, f32& y_advance, const char32_t* text, usz char_limit, u16 max_width, bool wrap) { x_advance = 0.f; y_advance = 0.f; @@ -294,7 +294,7 @@ namespace rsx return; } - u32 i = 0u; + usz i = 0u; bool skip_whitespace = false; while (true) @@ -335,7 +335,7 @@ namespace rsx if (wrap) { // scan previous chars - for (int j = i - 1, nb_chars = 0; j > 0; j--, nb_chars++) + for (usz j = i - 1, nb_chars = 0; j > 0; j--, nb_chars++) { if (text[j] == '\n') break; @@ -428,7 +428,7 @@ namespace rsx return result; } - std::pair font::get_char_offset(const char32_t* text, u16 max_length, u16 max_width, bool wrap) + std::pair font::get_char_offset(const char32_t* text, usz max_length, u16 max_width, bool wrap) { std::vector unused; f32 loc_x, loc_y; diff --git a/rpcs3/Emu/RSX/Overlays/overlay_fonts.h b/rpcs3/Emu/RSX/Overlays/overlay_fonts.h index 717374a5ac..ce5d8eb58e 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_fonts.h +++ b/rpcs3/Emu/RSX/Overlays/overlay_fonts.h @@ -73,11 +73,11 @@ namespace rsx stbtt_aligned_quad get_char(char32_t c, f32& x_advance, f32& y_advance); - void render_text_ex(std::vector& result, f32& x_advance, f32& y_advance, const char32_t* text, u32 char_limit, u16 max_width, bool wrap); + void render_text_ex(std::vector& result, f32& x_advance, f32& y_advance, const char32_t* text, usz char_limit, u16 max_width, bool wrap); std::vector render_text(const char32_t* text, u16 max_width = -1, bool wrap = false); - std::pair get_char_offset(const char32_t* text, u16 max_length, u16 max_width = -1, bool wrap = false); + std::pair get_char_offset(const char32_t* text, usz max_length, u16 max_width = -1, bool wrap = false); bool matches(const char* name, int size) const { return font_name == name && static_cast(size_pt) == size; } std::string_view get_name() const { return font_name; } diff --git a/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp b/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp index 947e317d88..3c7ac31275 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp @@ -280,7 +280,7 @@ namespace rsx } else { - m_preview.caret_position = ::narrow(m_preview.value.length()); + m_preview.caret_position = m_preview.value.length(); m_preview.fore_color.a = 1.f; } @@ -593,7 +593,7 @@ namespace rsx // Append to output text if (m_preview.value.empty()) { - m_preview.caret_position = ::narrow(str.length()); + m_preview.caret_position = str.length(); m_preview.set_unicode_text(str); } else diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp index 3726b81fc9..48b57d7cd3 100644 --- a/rpcs3/Emu/RSX/RSXThread.cpp +++ b/rpcs3/Emu/RSX/RSXThread.cpp @@ -50,7 +50,7 @@ bool serialize(utils::serial& ar, rsx::frame_capture_da { ar(o.magic, o.version, o.LE_format); - if (o.magic != rsx::c_fc_magic || o.version != rsx::c_fc_version || o.LE_format != (std::endian::little == std::endian::native)) + if (o.magic != rsx::c_fc_magic || o.version != rsx::c_fc_version || o.LE_format != u32{std::endian::little == std::endian::native}) { return false; } diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index b386e806b5..57525583d4 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -398,7 +398,7 @@ bool Emulator::BootRsxCapture(const std::string& path) return false; } - if (frame->LE_format != (std::endian::little == std::endian::native)) + if (frame->LE_format != u32{std::endian::little == std::endian::native}) { static constexpr std::string_view machines[2]{"Big-Endian", "Little-Endian"}; @@ -669,8 +669,8 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool { // Update supplementary settings const f64 _1ns = utils::get_tsc_freq() / 1000'000'000.; - g_rtm_tx_limit1 = g_cfg.core.tx_limit1_ns * _1ns; - g_rtm_tx_limit2 = g_cfg.core.tx_limit2_ns * _1ns; + g_rtm_tx_limit1 = static_cast(g_cfg.core.tx_limit1_ns * _1ns); + g_rtm_tx_limit2 = static_cast(g_cfg.core.tx_limit2_ns * _1ns); } // Load patches from different locations diff --git a/rpcs3/Emu/system_progress.cpp b/rpcs3/Emu/system_progress.cpp index 092ca399d2..b9a3f29897 100644 --- a/rpcs3/Emu/system_progress.cpp +++ b/rpcs3/Emu/system_progress.cpp @@ -136,9 +136,9 @@ void progress_dialog_server::operator()() // Compute new progress in percents // Assume not all programs were found if files were not compiled (as it may contain more) - const u64 total = std::max(ptotal, 1) * std::max(ftotal, 1); - const u64 done = pdone * std::max(fdone, 1); - const double value = std::fmin(done * 100. / total, 100.); + const u64 total = std::max(ptotal, 1) * std::max(ftotal, 1); + const u64 done = pdone * std::max(fdone, 1); + const f32 value = static_cast(std::fmin(done * 100. / total, 100.f)); std::string progr = "Progress:"; @@ -160,7 +160,7 @@ void progress_dialog_server::operator()() { dlg->SetMsg(text_new); dlg->ProgressBarSetMsg(0, progr); - dlg->ProgressBarSetValue(0, std::floor(value)); + dlg->ProgressBarSetValue(0, static_cast(std::floor(value))); }); } } diff --git a/rpcs3/util/media_utils.cpp b/rpcs3/util/media_utils.cpp index 558c46d925..324352e054 100644 --- a/rpcs3/util/media_utils.cpp +++ b/rpcs3/util/media_utils.cpp @@ -130,7 +130,7 @@ namespace utils { const AVStream* stream = av_format_ctx->streams[video_stream_index]; info.video_av_codec_id = stream->codecpar->codec_id; - info.video_bitrate_bps = stream->codecpar->bit_rate; + info.video_bitrate_bps = static_cast(stream->codecpar->bit_rate); } // Get audio info if available @@ -138,7 +138,7 @@ namespace utils { const AVStream* stream = av_format_ctx->streams[audio_stream_index]; info.audio_av_codec_id = stream->codecpar->codec_id; - info.audio_bitrate_bps = stream->codecpar->bit_rate; + info.audio_bitrate_bps = static_cast(stream->codecpar->bit_rate); info.sample_rate = stream->codecpar->sample_rate; }