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

rsx: Improve coverage checking logic to handle 3D and cubemap resources

Browse source
This commit is contained in:
kd-11 2022-01-22 14:56:45 +03:00 • committed by kd-11
parent 4f8b5849b7
commit 2f7d38bb81
2 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -223,21 +223,29 @@ namespace rsx
// Returns true if at least threshold% is covered in pixels // Returns true if at least threshold% is covered in pixels
bool atlas_covers_target_area(int threshold) const bool atlas_covers_target_area(int threshold) const
{ {
if (external_subresource_desc.op != deferred_request_command::atlas_gather)
return true;
const int target_area = (external_subresource_desc.width * external_subresource_desc.height * external_subresource_desc.depth * threshold) / 100; const int target_area = (external_subresource_desc.width * external_subresource_desc.height * external_subresource_desc.depth * threshold) / 100;
int covered_area = 0; int covered_area = 0;
areai bbox{smax, smax, 0, 0}; areai bbox{smax, smax, 0, 0};
for (const auto& section : external_subresource_desc.sections_to_copy) for (const auto& section : external_subresource_desc.sections_to_copy)
{ {
if (section.level != 0)
{
// Ignore other slices other than mip0
continue;
}
// Calculate virtual Y coordinate
const auto dst_y = (section.dst_z * external_subresource_desc.height) + section.dst_y;
// Add this slice's dimensions to the total
covered_area += section.dst_w * section.dst_h; covered_area += section.dst_w * section.dst_h;
// Extend the covered bbox
bbox.x1 = std::min<int>(section.dst_x, bbox.x1); bbox.x1 = std::min<int>(section.dst_x, bbox.x1);
bbox.x2 = std::max<int>(section.dst_x + section.dst_w, bbox.x2); bbox.x2 = std::max<int>(section.dst_x + section.dst_w, bbox.x2);
bbox.y1 = std::min<int>(section.dst_y, bbox.y1); bbox.y1 = std::min<int>(dst_y, bbox.y1);
bbox.y2 = std::max<int>(section.dst_y + section.dst_h, bbox.y2); bbox.y2 = std::max<int>(dst_y + section.dst_h, bbox.y2);
} }
if (covered_area < target_area) if (covered_area < target_area)
@ -1861,8 +1869,8 @@ namespace rsx
if (const auto section_count = result.external_subresource_desc.sections_to_copy.size(); if (const auto section_count = result.external_subresource_desc.sections_to_copy.size();
section_count > 0) section_count > 0)
{ {
bool result_is_valid = result.atlas_covers_target_area(section_count == 1 ? 99 : 90); bool result_is_valid;
if (!result_is_valid && _pool == 0 && !g_cfg.video.write_color_buffers && !g_cfg.video.write_depth_buffer) if (_pool == 0 && !g_cfg.video.write_color_buffers && !g_cfg.video.write_depth_buffer)
{ {
// HACK: Avoid WCB requirement for some games with wrongly declared sampler dimensions. // HACK: Avoid WCB requirement for some games with wrongly declared sampler dimensions.
// TODO: Some games may render a small region (e.g 1024x256x2) and sample a huge texture (e.g 1024x1024). // TODO: Some games may render a small region (e.g 1024x256x2) and sample a huge texture (e.g 1024x1024).
@ -1871,6 +1879,10 @@ namespace rsx
// enabled by default. Blit engine already handles this correctly. // enabled by default. Blit engine already handles this correctly.
result_is_valid = true; result_is_valid = true;
} }
else
{
result_is_valid = result.atlas_covers_target_area(section_count == 1 ? 99 : 90);
}
if (result_is_valid) if (result_is_valid)
{ {

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

@ -658,7 +658,6 @@ namespace rsx
{ {
attr2.width = scaled_w; attr2.width = scaled_w;
attr2.height = scaled_h; attr2.height = scaled_h;
attr2.depth = 1;
sampled_image_descriptor desc = { nullptr, deferred_request_command::cubemap_gather, sampled_image_descriptor desc = { nullptr, deferred_request_command::cubemap_gather,
attr2, {}, attr2, {},