Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rsx: Fix an oops causing DEVICE_LOST

Browse Source 
- We only apply scaling when RTTs are part of the input set.
- This fact was previously hidden by an optional arg
This commit is contained in:
kd-11
2025-11-11 00:05:25 +03:00
committed by kd-11
parent c60e5cc48a
commit 0bf9ee9fa5
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/RSX/Common/texture_cache_helpers.h
+14 -4
View File
@@ -279,7 +279,12 @@ namespace rsx
{ {
const auto range = fbos[index].surface->get_memory_range(); const auto range = fbos[index].surface->get_memory_range();
sort_ranges.push_back(range); sort_ranges.push_back(range);
sort_list.push_back({ fbos[index].surface->last_use_tag, 0, index, range }); sort_list.push_back({
.tag = fbos[index].surface->last_use_tag,
.list = 0,
.index = index,
.bounds = range
});
} }
for (u32 index = 0; index < local.size(); ++index) for (u32 index = 0; index < local.size(); ++index)
@@ -289,7 +294,12 @@ namespace rsx
const auto range = local[index]->get_section_range(); const auto range = local[index]->get_section_range();
sort_ranges.push_back(range); sort_ranges.push_back(range);
sort_list.push_back({ local[index]->last_write_tag, 1, index, range }); sort_list.push_back({
.tag = local[index]->last_write_tag,
.list = 1,
.index = index,
.bounds = range
});
} }
if (!fbos.empty() && !local.empty()) if (!fbos.empty() && !local.empty())
@@ -375,7 +385,7 @@ namespace rsx
return { section_end <= slice_end, section_end >= slice_end }; return { section_end <= slice_end, section_end >= slice_end };
}; };
auto add_local_resource = [&](auto& section, u32 address, u16 slice, bool scaling = true) -> std::pair<bool, bool> // [ input fully consumed, output fully covered ] auto add_local_resource = [&](auto& section, u32 address, u16 slice, bool scaling) -> std::pair<bool, bool> // [ input fully consumed, output fully covered ]
{ {
// Intersect this resource with the original one. // Intersect this resource with the original one.
// Note that intersection takes place in a normalized coordinate space (bpp = 1) // Note that intersection takes place in a normalized coordinate space (bpp = 1)
@@ -488,7 +498,7 @@ namespace rsx
} }
else else
{ {
std::tie(remove, slice_complete) = add_local_resource(local[e.index], current_address, slice); std::tie(remove, slice_complete) = add_local_resource(local[e.index], current_address, slice, !fbos.empty());
} }
if (remove) if (remove)