starred/AnyPS5
1
0 Fork 0
mirror of https://github.com/boykopovar/AnyPS5.git synced 2026-10-22 16:43:05 -05:00
Code Issues Packages Projects Releases 3 Wiki Activity

Merge pull request #6725 from johandavidcm/fix/agc-depth-write-address

Browse Source 
fix(agc): compare the depth write base only when the depth plane is written
This commit is contained in:
Adrià authored and GitHub committed 2026-10-19 14:48:21 +02:00
2 parents e3d401e6fe c8f7fc06e0
commit d5bbceb4f7
2 files changed
+19 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/libs/prx/libSceAgcDriver/Graphics/src/State.cpp
+2 -1
View File
@@ -317,7 +317,8 @@ void decodeDepth(const Registers& cx, std::uint32_t depthControl, bool testValEx
depth.lastSlice = (view >> 13u) & 0x7ffu;
depth.address = zFormat != 0 ? base(0x012, 0x01a) : 0;
depth.stencilAddress = stencil ? base(0x013, 0x01b) : 0;
Require(zFormat == 0 || depthReadOnly || base(0x014, 0x01c) == depth.address, "depth read and written at different addresses is unsupported");
const bool depthWritten = zFormat != 0 && !depthReadOnly && (depthClear || (depthControl & 6u) == 6u || (read(cx, 0x000) & 0x60u) != 0);
Require(!depthWritten || base(0x014, 0x01c) == depth.address, "depth read and written at different addresses is unsupported");
Require(!stencil || stencilReadOnly || base(0x015, 0x01d) == depth.stencilAddress, "stencil read and written at different addresses is unsupported");
if (depth.samples != 1u) {
depth.pipeBankXor = static_cast<std::uint32_t>(depth.address & 65535u);
core/libs/prx/libSceAgcDriver/tests/Graphics.cpp
+17
View File
@@ -2134,6 +2134,23 @@ void DepthStencilTests() {
const auto rejection = AgcDriver::Graphics::DrawRejection(queue, false);
Require(rejection.empty(), "precheck rejected a stencil draw with a surface: " + rejection);
Require(state.depth && state.depth->address == 0x10000 && state.depth->stencilAddress == 0x20000 && state.depth->format == VK_FORMAT_D32_SFLOAT_S8_UINT && state.depth->clearStencil == 7 && state.depth->htileAddress == 0x10000030000ull && !state.depth->htileStencil, "depth surface decode changed");
{
auto split = queue;
split.context[0x014] = 0;
for (const auto control : {0x00700711u, 0x00700715u, 0x00700713u}) {
split.context[0x200] = control;
const auto splitState = AgcDriver::Graphics::DecodeState(split);
Require(splitState.depth && splitState.depth->address == 0x10000 && !splitState.depthWrite, "a depth plane the draw does not write rejected another write address");
Require(AgcDriver::Graphics::DrawRejection(split, false).empty(), "precheck rejected a depth plane the draw does not write at another write address");
}
split.context[0x200] = 0x00700717u;
expectFailure([&] { AgcDriver::Graphics::DecodeState(split); }, "depth read and written at different addresses");
split.context[0x200] = 0x00700711u;
for (const auto control : {0x01u, 0x20u, 0x40u, 0x60u}) {
split.context[0x000] = control;
expectFailure([&] { AgcDriver::Graphics::DecodeState(split); }, "depth read and written at different addresses");
}
}
for (const auto clear : {0u, 1u, 2u, 3u}) {
auto retained = queue;
retained.context[0x8e] = retained.context[0x8f] = retained.context[0x203] = 0;