rsx: Fixup for surface cache scanning

- Fix regression when gathering cubemaps
This commit is contained in:
kd-11 2019-10-12 14:11:15 +03:00 committed by kd-11
parent 1ac976771c
commit c9e3a321b2

View file

@ -1499,8 +1499,8 @@ namespace rsx
// Check surface cache early if the option is enabled // Check surface cache early if the option is enabled
if (options.prefer_surface_cache) if (options.prefer_surface_cache)
{ {
// TODO: Should scan for block_height aka required_surface_height not simply attr.height const u16 block_h = (attr.depth * attr.slice_h);
overlapping_fbos = m_rtts.get_merged_texture_memory_region(cmd, attr.address, attr.width, attr.height, attr.pitch, attr.bpp, rsx::surface_access::read); overlapping_fbos = m_rtts.get_merged_texture_memory_region(cmd, attr.address, attr.width, block_h, attr.pitch, attr.bpp, rsx::surface_access::read);
if (!overlapping_fbos.empty()) if (!overlapping_fbos.empty())
{ {
@ -1545,8 +1545,8 @@ namespace rsx
if (!options.prefer_surface_cache) if (!options.prefer_surface_cache)
{ {
// Now check for surface cache hits // Now check for surface cache hits
// TODO: Should scan for block_height aka required_surface_height not simply attr.height const u16 block_h = (attr.depth * attr.slice_h);
overlapping_fbos = m_rtts.get_merged_texture_memory_region(cmd, attr.address, attr.width, attr.height, attr.pitch, attr.bpp, rsx::surface_access::read); overlapping_fbos = m_rtts.get_merged_texture_memory_region(cmd, attr.address, attr.width, block_h, attr.pitch, attr.bpp, rsx::surface_access::read);
} }
if (!overlapping_fbos.empty() || !overlapping_locals.empty()) if (!overlapping_fbos.empty() || !overlapping_locals.empty())