gremling/KytyPS5
1
0 Fork 0
mirror of https://github.com/KytyPS5/KytyPS5.git synced 2026-10-28 08:13:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix command buffer capacity calculation

Browse Source 
Credits:
YuhiAida (@YuhiAida):
https://github.com/KytyPS5/KytyPS5/pull/588
https://github.com/KytyPS5/KytyPS5/pull/589
https://github.com/KytyPS5/KytyPS5/pull/652
Crimson (@Crimson3076):
https://github.com/KytyPS5/KytyPS5/pull/598
This commit is contained in:
nmzik committed 2026-09-17 08:16:59 +04:00
1 parent 63fb822f8a
commit 49b2eedd1c
1 file changed
+10 -20
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/agc.cpp
+10 -20
View File
@@ -262,35 +262,25 @@ struct CommandBuffer {
reserved_dw); reserved_dw);
} }
[[nodiscard]] KYTY_SYSV_ABI uint32_t GetAvailableSizeDW() const { [[nodiscard]] KYTY_SYSV_ABI uint64_t GetAvailableSizeDW() const {
if (cursor_up == nullptr || cursor_down == nullptr || cursor_down <= cursor_up) { // Interpret the signed cursor distance as an unsigned 64-bit DWORD count.
return 0; const auto distance = static_cast<int64_t>(reinterpret_cast<uintptr_t>(cursor_down) -
} reinterpret_cast<uintptr_t>(cursor_up));
const auto available = static_cast<uint64_t>(distance >> 2);
auto available = static_cast<uint64_t>(cursor_down - cursor_up);
if (available <= reserved_dw) { if (available <= reserved_dw) {
return 0; return 0;
} }
if (available - reserved_dw > UINT32_MAX) { return available - reserved_dw;
LOGF_COLOR(
Log::Color::Red,
"\t command buffer has suspiciously large free space: cursor_up = 0x%016" PRIx64
", cursor_down = 0x%016" PRIx64 ", reserved_dw = %" PRIu32 "\n",
reinterpret_cast<uint64_t>(cursor_up), reinterpret_cast<uint64_t>(cursor_down),
reserved_dw);
return UINT32_MAX;
}
return static_cast<uint32_t>(available - reserved_dw);
} }
KYTY_SYSV_ABI bool ReserveDW(uint32_t num_dw) { KYTY_SYSV_ABI bool ReserveDW(uint32_t num_dw) {
uint32_t remaining = GetAvailableSizeDW(); const uint64_t remaining = GetAvailableSizeDW();
if (num_dw > remaining) { if (num_dw > remaining) {
if (callback == nullptr) { if (callback == nullptr) {
LOGF_COLOR( LOGF_COLOR(
Log::Color::Red, Log::Color::Red,
"\t command buffer exhausted and has no grow callback: requested = %" PRIu32 "\t command buffer exhausted and has no grow callback: requested = %" PRIu32
", remaining = %" PRIu32 ", reserved_dw = %" PRIu32 "\n", ", remaining = %" PRIu64 ", reserved_dw = %" PRIu32 "\n",
num_dw, remaining, reserved_dw); num_dw, remaining, reserved_dw);
DbgDump(); DbgDump();
return false; return false;
@@ -300,7 +290,7 @@ struct CommandBuffer {
if (!result) { if (!result) {
LOGF_COLOR(Log::Color::Red, LOGF_COLOR(Log::Color::Red,
"\t command buffer grow callback failed: requested = %" PRIu32 "\t command buffer grow callback failed: requested = %" PRIu32
", remaining = %" PRIu32 ", reserved_dw = %" PRIu32 "\n", ", remaining = %" PRIu64 ", reserved_dw = %" PRIu32 "\n",
num_dw, remaining, reserved_dw); num_dw, remaining, reserved_dw);
DbgDump(); DbgDump();
return false; return false;
@@ -308,7 +298,7 @@ struct CommandBuffer {
if (GetAvailableSizeDW() < num_dw) { if (GetAvailableSizeDW() < num_dw) {
LOGF_COLOR(Log::Color::Red, LOGF_COLOR(Log::Color::Red,
"\t command buffer grow callback did not provide enough space: " "\t command buffer grow callback did not provide enough space: "
"requested = %" PRIu32 ", remaining = %" PRIu32 "requested = %" PRIu32 ", remaining = %" PRIu64
", reserved_dw = %" PRIu32 "\n", ", reserved_dw = %" PRIu32 "\n",
num_dw, GetAvailableSizeDW(), reserved_dw); num_dw, GetAvailableSizeDW(), reserved_dw);
DbgDump(); DbgDump();