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

rsx: Fix get_optimal_blit_target_properties for local memory

Browse source
This commit is contained in:
Eladash 2020-04-11 13:07:37 +03:00 • committed by kd-11
parent d69bec8f59
commit ff74c241c7
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rpcs3/Emu/Cell/lv2/sys_rsx.h
View file

@ -117,6 +117,11 @@ struct RsxDisplayInfo
be_t<u32> pitch; be_t<u32> pitch;
be_t<u32> width; be_t<u32> width;
be_t<u32> height; be_t<u32> height;
bool valid() const
{
return height != 0u && width != 0u;
}
}; };
struct lv2_rsx_config struct lv2_rsx_config

12
rpcs3/Emu/RSX/Common/texture_cache_helpers.h
View file

@ -189,13 +189,21 @@ namespace rsx
for (u32 i = 0; i < renderer->display_buffers_count; ++i) for (u32 i = 0; i < renderer->display_buffers_count; ++i)
{ {
const auto& buffer = renderer->display_buffers[i]; const auto& buffer = renderer->display_buffers[i];
const u32 pitch = buffer.pitch? static_cast<u32>(buffer.pitch) : g_fxo->get<rsx::avconf>()->get_bpp() * buffer.width;
if (!buffer.valid())
{
continue;
}
const u32 bpp = g_fxo->get<rsx::avconf>()->get_bpp();
const u32 pitch = buffer.pitch ? +buffer.pitch : bpp * buffer.width;
if (pitch != dst_pitch) if (pitch != dst_pitch)
{ {
continue; continue;
} }
const auto buffer_range = address_range::start_length(rsx::constants::local_mem_base + buffer.offset, pitch * buffer.height); const auto buffer_range = address_range::start_length(rsx::get_address(buffer.offset, CELL_GCM_LOCATION_LOCAL, HERE), pitch * (buffer.height - 1) + (buffer.width * bpp));
if (dst_range.inside(buffer_range)) if (dst_range.inside(buffer_range))
{ {
// Match found // Match found