Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Silence some warnings #10814

Merged
merged 1 commit into from Sep 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion rpcs3/Emu/Cell/SPUThread.cpp
Expand Up @@ -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<void>(check_state());
}
}())
{
Expand Down
16 changes: 8 additions & 8 deletions rpcs3/Emu/Cell/lv2/sys_net.cpp
Expand Up @@ -1672,7 +1672,7 @@ error_code sys_net_bnet_connect(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sockaddr
sock.p2ps.op_vport = dst_vport;
sock.p2ps.cur_seq = send_hdr.seq + 1;
sock.p2ps.data_beg_seq = 0;
sock.p2ps.data_available = 0;
sock.p2ps.data_available = 0u;
sock.p2ps.received_data.clear();
sock.p2ps.status = lv2_socket::p2ps_i::stream_status::stream_handshaking;

Expand Down Expand Up @@ -2320,8 +2320,8 @@ error_code sys_net_bnet_recvfrom(ppu_thread& ppu, s32 s, vm::ptr<void> 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<u32>(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)
Expand Down Expand Up @@ -2652,7 +2652,7 @@ error_code sys_net_bnet_sendto(ppu_thread& ppu, s32 s, vm::cptr<void> 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;
Expand All @@ -2664,10 +2664,10 @@ error_code sys_net_bnet_sendto(ppu_thread& ppu, s32 s, vm::cptr<void> buf, u32 l
tcp_header.dst_port = sock.p2ps.op_vport;
// chop it up
std::vector<std::vector<u8>> 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
Expand All @@ -2676,7 +2676,7 @@ error_code sys_net_bnet_sendto(ppu_thread& ppu, s32 s, vm::cptr<void> 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;
Expand Down Expand Up @@ -3273,7 +3273,7 @@ error_code sys_net_bnet_poll(ppu_thread& ppu, vm::ptr<sys_net_pollfd> 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;
}

Expand Down
4 changes: 2 additions & 2 deletions rpcs3/Emu/Cell/lv2/sys_net.h
Expand Up @@ -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<u64, std::vector<u8>> 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
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp
Expand Up @@ -141,7 +141,7 @@ namespace rsx
value.insert(caret_position, str);
}

caret_position += ::narrow<u16>(str.length());
caret_position += str.length();
m_reset_caret_pulse = true;
set_unicode_text(value);
refresh();
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/RSX/Overlays/overlay_edit_text.hpp
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp
Expand Up @@ -283,7 +283,7 @@ namespace rsx
}
}

void font::render_text_ex(std::vector<vertex>& 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<vertex>& 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;
Expand All @@ -294,7 +294,7 @@ namespace rsx
return;
}

u32 i = 0u;
usz i = 0u;
bool skip_whitespace = false;

while (true)
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -428,7 +428,7 @@ namespace rsx
return result;
}

std::pair<f32, f32> font::get_char_offset(const char32_t* text, u16 max_length, u16 max_width, bool wrap)
std::pair<f32, f32> font::get_char_offset(const char32_t* text, usz max_length, u16 max_width, bool wrap)
{
std::vector<vertex> unused;
f32 loc_x, loc_y;
Expand Down
4 changes: 2 additions & 2 deletions rpcs3/Emu/RSX/Overlays/overlay_fonts.h
Expand Up @@ -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<vertex>& 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<vertex>& result, f32& x_advance, f32& y_advance, const char32_t* text, usz char_limit, u16 max_width, bool wrap);

std::vector<vertex> render_text(const char32_t* text, u16 max_width = -1, bool wrap = false);

std::pair<f32, f32> get_char_offset(const char32_t* text, u16 max_length, u16 max_width = -1, bool wrap = false);
std::pair<f32, f32> 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<int>(size_pt) == size; }
std::string_view get_name() const { return font_name; }
Expand Down
4 changes: 2 additions & 2 deletions rpcs3/Emu/RSX/Overlays/overlay_osk.cpp
Expand Up @@ -280,7 +280,7 @@ namespace rsx
}
else
{
m_preview.caret_position = ::narrow<u16>(m_preview.value.length());
m_preview.caret_position = m_preview.value.length();
m_preview.fore_color.a = 1.f;
}

Expand Down Expand Up @@ -593,7 +593,7 @@ namespace rsx
// Append to output text
if (m_preview.value.empty())
{
m_preview.caret_position = ::narrow<u16>(str.length());
m_preview.caret_position = str.length();
m_preview.set_unicode_text(str);
}
else
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/RSX/RSXThread.cpp
Expand Up @@ -50,7 +50,7 @@ bool serialize<rsx::frame_capture_data>(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;
}
Expand Down
6 changes: 3 additions & 3 deletions rpcs3/Emu/System.cpp
Expand Up @@ -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"};

Expand Down Expand Up @@ -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<u64>(g_cfg.core.tx_limit1_ns * _1ns);
g_rtm_tx_limit2 = static_cast<u64>(g_cfg.core.tx_limit2_ns * _1ns);
}

// Load patches from different locations
Expand Down
8 changes: 4 additions & 4 deletions rpcs3/Emu/system_progress.cpp
Expand Up @@ -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<u64>(ptotal, 1) * std::max<u64>(ftotal, 1);
const u64 done = pdone * std::max<u64>(fdone, 1);
const double value = std::fmin(done * 100. / total, 100.);
const u64 total = std::max<u64>(ptotal, 1) * std::max<u64>(ftotal, 1);
const u64 done = pdone * std::max<u64>(fdone, 1);
const f32 value = static_cast<f32>(std::fmin(done * 100. / total, 100.f));

std::string progr = "Progress:";

Expand All @@ -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<u32>(std::floor(value)));
});
}
}
Expand Down
4 changes: 2 additions & 2 deletions rpcs3/util/media_utils.cpp
Expand Up @@ -130,15 +130,15 @@ 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<s32>(stream->codecpar->bit_rate);
}

// Get audio info if available
if (audio_stream_index >= 0)
{
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<s32>(stream->codecpar->bit_rate);
info.sample_rate = stream->codecpar->sample_rate;
}

Expand Down