mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-12-06 07:12:28 +01:00
rsx: Fix an oops causing DEVICE_LOST
Some checks failed
Generate Translation Template / Generate Translation Template (push) Has been cancelled
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (/rpcs3/.ci/build-linux-aarch64.sh, gcc, rpcs3/rpcs3-ci-jammy-aarch64:1.7, ubuntu-24.04-arm) (push) Has been cancelled
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (/rpcs3/.ci/build-linux.sh, gcc, rpcs3/rpcs3-ci-jammy:1.7, ubuntu-24.04) (push) Has been cancelled
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1, rpcs3/rpcs3-binaries-linux-arm64, /rpcs3/.ci/build-linux-aarch64.sh, clang, rpcs3/rpcs3-ci-jammy-aarch64:1.7, ubuntu-24.04-arm) (push) Has been cancelled
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (d812f1254a1157c80fd402f94446310560f54e5f, rpcs3/rpcs3-binaries-linux, /rpcs3/.ci/build-linux.sh, clang, rpcs3/rpcs3-ci-jammy:1.7, ubuntu-24.04) (push) Has been cancelled
Build RPCS3 / RPCS3 Mac ${{ matrix.name }} (51ae32f468089a8169aaf1567de355ff4a3e0842, rpcs3/rpcs3-binaries-mac, .ci/build-mac.sh, Intel) (push) Has been cancelled
Build RPCS3 / RPCS3 Mac ${{ matrix.name }} (8e21bdbc40711a3fccd18fbf17b742348b0f4281, rpcs3/rpcs3-binaries-mac-arm64, .ci/build-mac-arm64.sh, Apple Silicon) (push) Has been cancelled
Build RPCS3 / RPCS3 Windows (push) Has been cancelled
Build RPCS3 / RPCS3 Windows Clang (win64, clang, clang64) (push) Has been cancelled
Build RPCS3 / RPCS3 FreeBSD (push) Has been cancelled
Some checks failed
Generate Translation Template / Generate Translation Template (push) Has been cancelled
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (/rpcs3/.ci/build-linux-aarch64.sh, gcc, rpcs3/rpcs3-ci-jammy-aarch64:1.7, ubuntu-24.04-arm) (push) Has been cancelled
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (/rpcs3/.ci/build-linux.sh, gcc, rpcs3/rpcs3-ci-jammy:1.7, ubuntu-24.04) (push) Has been cancelled
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1, rpcs3/rpcs3-binaries-linux-arm64, /rpcs3/.ci/build-linux-aarch64.sh, clang, rpcs3/rpcs3-ci-jammy-aarch64:1.7, ubuntu-24.04-arm) (push) Has been cancelled
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (d812f1254a1157c80fd402f94446310560f54e5f, rpcs3/rpcs3-binaries-linux, /rpcs3/.ci/build-linux.sh, clang, rpcs3/rpcs3-ci-jammy:1.7, ubuntu-24.04) (push) Has been cancelled
Build RPCS3 / RPCS3 Mac ${{ matrix.name }} (51ae32f468089a8169aaf1567de355ff4a3e0842, rpcs3/rpcs3-binaries-mac, .ci/build-mac.sh, Intel) (push) Has been cancelled
Build RPCS3 / RPCS3 Mac ${{ matrix.name }} (8e21bdbc40711a3fccd18fbf17b742348b0f4281, rpcs3/rpcs3-binaries-mac-arm64, .ci/build-mac-arm64.sh, Apple Silicon) (push) Has been cancelled
Build RPCS3 / RPCS3 Windows (push) Has been cancelled
Build RPCS3 / RPCS3 Windows Clang (win64, clang, clang64) (push) Has been cancelled
Build RPCS3 / RPCS3 FreeBSD (push) Has been cancelled
- 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:
parent
c60e5cc48a
commit
0bf9ee9fa5
|
|
@ -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)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue