archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 22:11:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix warnings in VKGSRender

Browse source
This commit is contained in:
Nekotekina Aux1 2020-03-04 15:36:23 +03:00 • committed by Nekotekina
parent c3f3451269
commit f2f3321952
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rpcs3/Emu/RSX/VK/VKGSRender.cpp
View file

@ -2620,9 +2620,10 @@ void VKGSRender::update_vertex_env(u32 id, const vk::vertex_upload_info& vertex_
{ {
// Actual allocation must have been done previously // Actual allocation must have been done previously
u32 base_offset; u32 base_offset;
const u32 offset32 = static_cast<u32>(m_vertex_layout_stream_info.offset);
const u32 range32 = static_cast<u32>(m_vertex_layout_stream_info.range);
if (!m_vertex_layout_storage || if (!m_vertex_layout_storage || !m_vertex_layout_storage->in_range(offset32, range32, base_offset))
!m_vertex_layout_storage->in_range(m_vertex_layout_stream_info.offset, m_vertex_layout_stream_info.range, base_offset))
{ {
verify("Incompatible driver (MacOS?)" HERE), m_texbuffer_view_size >= m_vertex_layout_stream_info.range; verify("Incompatible driver (MacOS?)" HERE), m_texbuffer_view_size >= m_vertex_layout_stream_info.range;

11
rpcs3/Emu/RSX/VK/VKTexture.cpp
View file

@ -232,7 +232,7 @@ namespace vk
const auto src_texel_size = vk::get_format_texel_width(src->info.format); const auto src_texel_size = vk::get_format_texel_width(src->info.format);
const auto src_length = src_texel_size * src_copy.imageExtent.width * src_copy.imageExtent.height; const auto src_length = src_texel_size * src_copy.imageExtent.width * src_copy.imageExtent.height;
u64 min_scratch_size = src_length; u32 min_scratch_size = src_length;
// Check for DS manipulation which will affect scratch memory requirements // Check for DS manipulation which will affect scratch memory requirements
if (const VkFlags combined_aspect = src->aspect() | dst->aspect(); if (const VkFlags combined_aspect = src->aspect() | dst->aspect();
@ -684,7 +684,10 @@ namespace vk
data_length += packed_size; data_length += packed_size;
} }
job->run(cmd, scratch_buf, section.bufferOffset, scratch_buf, src_offset, data_length, const u32 buf_off32 = static_cast<u32>(section.bufferOffset);
const u32 src_off32 = static_cast<u32>(src_offset);
job->run(cmd, scratch_buf, buf_off32, scratch_buf, src_off32, data_length,
section.imageExtent.width, section.imageExtent.height, section.imageExtent.depth, packet.second); section.imageExtent.width, section.imageExtent.height, section.imageExtent.depth, packet.second);
} }
@ -882,8 +885,8 @@ namespace vk
auto src_w = src_area.width(); auto src_w = src_area.width();
auto dst_w = dst_area.width(); auto dst_w = dst_area.width();
if (xfer_info.src_is_typeless) src_w *= xfer_info.src_scaling_hint; if (xfer_info.src_is_typeless) src_w = static_cast<int>(src_w * xfer_info.src_scaling_hint);
if (xfer_info.dst_is_typeless) dst_w *= xfer_info.dst_scaling_hint; if (xfer_info.dst_is_typeless) dst_w = static_cast<int>(dst_w * xfer_info.dst_scaling_hint);
if (src_w == dst_w) if (src_w == dst_w)
{ {