mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-29 22:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

rsx: Tighten format checks in cache hit tests

Browse Source
This commit is contained in:
kd-11 2019-03-26 20:59:41 +03:00 committed by kd-11
parent 443fde760f
commit b7470cfc1a
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rpcs3/Emu/RSX/Common/texture_cache.h
View File

@ -1124,7 +1124,7 @@ namespace rsx
} }
template <bool check_unlocked = false> template <bool check_unlocked = false>
section_storage_type *find_texture_from_dimensions(u32 rsx_address, u16 width = 0, u16 height = 0, u16 depth = 0, u16 mipmaps = 0) section_storage_type *find_texture_from_dimensions(u32 rsx_address, u32 format, u16 width = 0, u16 height = 0, u16 depth = 0, u16 mipmaps = 0)
{ {
auto &block = m_storage.block_for(rsx_address); auto &block = m_storage.block_for(rsx_address);
for (auto &tex : block) for (auto &tex : block)
@ -1135,7 +1135,7 @@ namespace rsx
continue; continue;
} }
if (!tex.is_dirty() && tex.matches(rsx_address, width, height, depth, mipmaps)) if (!tex.is_dirty() && tex.matches(rsx_address, format, width, height, depth, mipmaps))
{ {
return &tex; return &tex;
} }
@ -2098,7 +2098,7 @@ namespace rsx
const auto overlapping_locals = find_texture_from_range<true>(lookup_range, tex_height > 1? tex_pitch : 0, lookup_mask); const auto overlapping_locals = find_texture_from_range<true>(lookup_range, tex_height > 1? tex_pitch : 0, lookup_mask);
for (auto& cached_texture : overlapping_locals) for (auto& cached_texture : overlapping_locals)
{ {
if (cached_texture->matches(texaddr, tex_width, tex_height, depth, 0)) if (cached_texture->matches(texaddr, format, tex_width, tex_height, depth, 0))
{ {
return{ cached_texture->get_view(tex.remap(), tex.decoded_remap()), cached_texture->get_context(), cached_texture->is_depth_texture(), scale_x, scale_y, cached_texture->get_image_type() }; return{ cached_texture->get_view(tex.remap(), tex.decoded_remap()), cached_texture->get_context(), cached_texture->is_depth_texture(), scale_x, scale_y, cached_texture->get_image_type() };
} }
@ -2147,7 +2147,7 @@ namespace rsx
{ {
// Surface cache data is newer, check if this thing fits our search parameters // Surface cache data is newer, check if this thing fits our search parameters
const auto& last = overlapping_fbos.back(); const auto& last = overlapping_fbos.back();
if (last.src_x == 0 && last.src_y == 0) if (last.src_x == 0 && last.src_y == 0 && last.surface->get_bpp() == bpp)
{ {
u16 internal_width = tex_width; u16 internal_width = tex_width;
u16 internal_height = required_surface_height; u16 internal_height = required_surface_height;
@ -2164,6 +2164,7 @@ namespace rsx
{ {
const auto last = overlapping_locals.back(); const auto last = overlapping_locals.back();
if (last->get_section_base() == texaddr && if (last->get_section_base() == texaddr &&
get_format_block_size_in_bytes(last->get_gcm_format()) == bpp &&
last->get_width() >= tex_width && last->get_height() >= tex_height) last->get_width() >= tex_width && last->get_height() >= tex_height)
{ {
return { last->get_raw_texture(), deferred_request_command::copy_image_static, texaddr, format, 0, 0, return { last->get_raw_texture(), deferred_request_command::copy_image_static, texaddr, format, 0, 0,

10
rpcs3/Emu/RSX/Common/texture_cache_utils.h
View File

@ -1637,7 +1637,7 @@ namespace rsx
return true; return true;
} }
bool matches(u32 rsx_address, u32 width, u32 height, u32 depth, u32 mipmaps) bool matches(u32 rsx_address, u32 format, u32 width, u32 height, u32 depth, u32 mipmaps)
{ {
if (!valid_range()) if (!valid_range())
return false; return false;
@ -1645,10 +1645,13 @@ namespace rsx
if (rsx_address != get_section_base()) if (rsx_address != get_section_base())
return false; return false;
if ((gcm_format & format) != format)
return false;
return matches_dimensions(width, height, depth, mipmaps); return matches_dimensions(width, height, depth, mipmaps);
} }
bool matches(const address_range& memory_range, u32 width, u32 height, u32 depth, u32 mipmaps) bool matches(const address_range& memory_range, u32 format, u32 width, u32 height, u32 depth, u32 mipmaps)
{ {
if (!valid_range()) if (!valid_range())
return false; return false;
@ -1656,6 +1659,9 @@ namespace rsx
if (!rsx::buffered_section::matches(memory_range)) if (!rsx::buffered_section::matches(memory_range))
return false; return false;
if ((gcm_format & format) != format)
return false;
return matches_dimensions(width, height, depth, mipmaps); return matches_dimensions(width, height, depth, mipmaps);
} }