mirror/psxrecomp
1
0
Fork 0
mirror of https://github.com/RetroPortingToolKit/psxrecomp synced 2026-10-26 02:11:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Render thread: HD texture residency in command order

Browse Source 
HD texture packs matched draws on the render thread but tracked uploads and
invalidations on the emulation thread, hashing gpu.c's array: a data race
(crash seen in hd_texture_pack_match) and wrong identities whenever the
emulation thread had already recorded a later upload.

The facade now sends residency changes through an optional backend hook
(hd_texture_note). The render-thread backend records them as RTH_HD_NOTE
after the upload/draw they follow; the replay hashes the render thread's own
VRAM copy, which the HD module now follows with the SW rasterizer
(gpu_hd_textures_bind_vram). Pack (re)configuration and HD mode changes are
sync points. Other backends apply the change immediately as before.

The HD GL fixture gains a render-thread case (fails without this change)
and links again: the scale fixture's facade stubs no longer collide with
the real gpu_render.c it includes.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Shokunin
2026-10-07 13:41:55 -07:00
parent cbfd24fda5
commit 64292bb23d
8 changed files with 92 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/gpu_hd_textures.cpp
+6 -1
View File
@@ -267,6 +267,9 @@ extern "C" int gpu_hd_textures_configure(const char* root, int replacements,
fail(error, capacity, dump_error); return 0;
}
}
/* Quiesce renderer users (GL render thread) before reading the old
* session's residency; the cache is rebuilt from the new session. */
if (session) gl_renderer_clear_hd_texture_cache();
if (session && (session->replacements || session->dump) && session->root == next->root) {
if (!duck_texture_pack_copy_tracking(next->duck, session->duck)) {
fail(error, capacity, "Could not preserve texture-upload tracking during reload."); return 0;
@@ -353,6 +356,7 @@ extern "C" void gpu_hd_textures_get_diag(GpuHdTextureDiag* out) {
out->diagnostic = session->diagnostics.back().c_str();
}
extern "C" void gpu_hd_textures_note_applied(void) { if (session) ++session->diag.applied_draws; }
extern "C" void gpu_hd_textures_bind_vram(const uint16_t* vram) { native_vram = vram; }
extern "C" void gpu_hd_textures_set_vram(const uint16_t* vram) { native_vram = vram; gpu_hd_textures_reset_tracking(); }
extern "C" void gpu_hd_textures_reset_tracking(void) {
if (!session) return;
@@ -391,7 +395,8 @@ extern "C" void gpu_hd_textures_invalidate(int x, int y, int width, int height)
}
extern "C" void gpu_hd_textures_track_upload(int x, int y, int width, int height,
const uint16_t* words) {
if (!session || !native_vram || !words || width < 1 || width > 1024 || height < 1 || height > 512) return;
(void)words;
if (!session || !native_vram || width < 1 || width > 1024 || height < 1 || height > 512) return;
if (width == 1024 && height == 512) { gpu_hd_textures_reset_tracking(); return; }
/* gpu.c's A0 staging already contains post-mask words. Read the canonical
* mirror here also for host-initiated transfers which use raw input. */