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

rsx: Check if memory actually exists when overallocating blit targets

Browse source
This commit is contained in:
kd-11 2019-09-06 16:39:55 +03:00 • committed by kd-11
parent cd1345b6bb
commit 9842823a8c
2 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

20
rpcs3/Emu/RSX/Common/texture_cache.h
View file

@ -2431,7 +2431,7 @@ namespace rsx
// Check if src/dst are parts of render targets // Check if src/dst are parts of render targets
typename surface_store_type::surface_overlap_info dst_subres; typename surface_store_type::surface_overlap_info dst_subres;
bool use_null_region = false; bool use_null_region = false;
if (dst_address > 0xc0000000) if (get_location(dst_address) == CELL_GCM_LOCATION_LOCAL)
{ {
// TODO: HACK // TODO: HACK
// After writing, it is required to lock the memory range from access! // After writing, it is required to lock the memory range from access!
@ -2534,6 +2534,7 @@ namespace rsx
size2i dst_dimensions = { dst.pitch / dst_bpp, dst.height }; size2i dst_dimensions = { dst.pitch / dst_bpp, dst.height };
if (src_is_render_target) if (src_is_render_target)
{ {
// Attempt to optimize...
if (dst_dimensions.width == src_subres.surface->get_surface_width(rsx::surface_metrics::samples)) if (dst_dimensions.width == src_subres.surface->get_surface_width(rsx::surface_metrics::samples))
{ {
dst_dimensions.height = std::max(src_subres.surface->get_surface_height(rsx::surface_metrics::samples), dst.height); dst_dimensions.height = std::max(src_subres.surface->get_surface_height(rsx::surface_metrics::samples), dst.height);
@ -2548,6 +2549,23 @@ namespace rsx
{ {
//LOG_TRACE(RSX, "Blit transfer to surface with dims %dx%d", dst_dimensions.width, dst.height); //LOG_TRACE(RSX, "Blit transfer to surface with dims %dx%d", dst_dimensions.width, dst.height);
} }
if (get_location(dst.rsx_address) != CELL_GCM_LOCATION_LOCAL && !dst_is_render_target)
{
// Confirm if the pages actually exist in vm
// Only need to test the extra padding memory
const auto min_end = dst_address + (dst.height * dst.pitch);
const auto max_end = dst.rsx_address + (dst_dimensions.height * dst.pitch);
if (max_end > min_end)
{
if (!vm::check_addr(min_end, (max_end - min_end), vm::page_info_t::page_allocated))
{
// Enforce strict allocation size!
dst_dimensions.height = (dst.clip_height + dst.offset_y);
}
}
}
} }
reader_lock lock(m_cache_mutex); reader_lock lock(m_cache_mutex);

7
rpcs3/Emu/RSX/rsx_utils.h
View file

@ -266,6 +266,13 @@ namespace rsx
return g_rsx_shared_tag++; return g_rsx_shared_tag++;
} }
static inline u32 get_location(u32 addr)
{
return (addr >= rsx::constants::local_mem_base) ?
CELL_GCM_LOCATION_LOCAL :
CELL_GCM_LOCATION_MAIN;
}
// Copy memory in inverse direction from source // Copy memory in inverse direction from source
// Used to scale negatively x axis while transfering image data // Used to scale negatively x axis while transfering image data
template <typename Ts = u8, typename Td = Ts> template <typename Ts = u8, typename Td = Ts>