mirror-games/dca3-game
1
0
Fork 0
mirror of https://gitlab.com/skmp/dca3-game.git synced 2025-09-02 19:23:16 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'skmp/avoid-pvr-lockups' into 'main'

Browse Source 
Dynamically adjust pvr guard buffer, update KOS for avoiding lockups

See merge request skmp/dca3-game!68
This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis
2025-03-16 17:40:47 +00:00
parent 3664a47755 061e137304
commit 21731e089c
2 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/dca3-kos vendored

Submodule vendor/dca3-kos updated: 1bb4adc78a...5d475f6ecf

50
vendor/librw/src/dc/rwdc.cpp vendored
View File

@@ -560,6 +560,26 @@ void DCE_InitMatrices() {
namespace rw { namespace rw {
namespace dc { namespace dc {
size_t vertexBufferFree() {
size_t end = PVR_GET(PVR_TA_VERTBUF_END);
size_t pos = PVR_GET(PVR_TA_VERTBUF_POS);
size_t free = end - pos;
return free;
}
bool vertexOverflown() {
return PVR_GET(PVR_TA_VERTBUF_POS) >= PVR_GET(PVR_TA_VERTBUF_END) ||
PVR_GET(PVR_TA_OPB_POS)*4 >= PVR_GET(PVR_TA_OPB_END);
}
constexpr size_t freeVertexTarget_Step_Up = 32 * 1024;
constexpr size_t freeVertexTarget_Step_Down = 4 * 1024;
constexpr size_t freeVertexTarget_Min = 64 * 1024;
size_t freeVertexTarget = freeVertexTarget_Min;
struct DcRaster struct DcRaster
{ {
uint32_t pvr_flags; uint32_t pvr_flags;
@@ -1116,18 +1136,30 @@ void endUpdate(Camera* cam) {
} }
pvr_list_finish(); pvr_list_finish();
} }
pvr_list_begin(PVR_LIST_TR_POLY);
if (blendCallbacks.size()) { if (blendCallbacks.size()) {
pvr_dr_init(&drState); pvr_dr_init(&drState);
pvr_list_begin(PVR_LIST_TR_POLY);
for (auto&& cb: blendCallbacks) { for (auto&& cb: blendCallbacks) {
cb(); cb();
} }
pvr_list_finish();
} }
if (vertexOverflown()) {
freeVertexTarget += freeVertexTarget_Step_Up;
} else {
freeVertexTarget -= freeVertexTarget_Step_Down;
if (freeVertexTarget < freeVertexTarget_Min) {
freeVertexTarget = freeVertexTarget_Min;
}
}
#if !defined(DC_TEXCONV) #if !defined(DC_TEXCONV)
VmuProfiler::getInstance()->updateVertexBufferUsage(); VmuProfiler::getInstance()->updateVertexBufferUsage();
#endif #endif
pvr_list_finish();
// dbglog(DBG_CRITICAL, "Free vertex target: %d\n", freeVertexTarget);
// XXX not by definition the best place to do this XXX // XXX not by definition the best place to do this XXX
// We need to know that pvr isn't using textures before moving them // We need to know that pvr isn't using textures before moving them
// XXX This is also very slow right now XXX // XXX This is also very slow right now XXX
@@ -3506,18 +3538,6 @@ void pvr_poly_cxt_txr_fast(pvr_poly_hdr_t *hdr, pvr_list_t list,
pvr_poly_compile_fast(hdr, dst); pvr_poly_compile_fast(hdr, dst);
} }
size_t vertexBufferFree() {
size_t end = PVR_GET(PVR_TA_VERTBUF_END);
size_t pos = PVR_GET(PVR_TA_VERTBUF_POS);
size_t free = end - pos;
return free;
}
void defaultRenderCB(ObjPipeline *pipe, Atomic *atomic) { void defaultRenderCB(ObjPipeline *pipe, Atomic *atomic) {
rw::Camera *cam = engine->currentCamera; rw::Camera *cam = engine->currentCamera;
// Frustum Culling // Frustum Culling
@@ -3700,7 +3720,7 @@ void defaultRenderCB(ObjPipeline *pipe, Atomic *atomic) {
// clipping performed per meshlet // clipping performed per meshlet
auto renderCB = [contextId, n] { auto renderCB = [contextId, n] {
if (vertexBufferFree() < (128 * 1024)) { if (vertexBufferFree() < freeVertexTarget) {
return; return;
} }
const atomic_context_t* acp = &atomicContexts[contextId]; const atomic_context_t* acp = &atomicContexts[contextId];