From b1bc22330ea7a5c714fc3601f56df55b80560c6b Mon Sep 17 00:00:00 2001 From: water Date: Fri, 12 Apr 2024 19:22:25 -0400 Subject: [PATCH] [jak3] Minimap texture fix --- game/graphics/opengl_renderer/ProgressRenderer.cpp | 3 +++ goal_src/jak3/engine/gfx/texture/texture.gc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/game/graphics/opengl_renderer/ProgressRenderer.cpp b/game/graphics/opengl_renderer/ProgressRenderer.cpp index 1db82092f0..bdc27979d8 100644 --- a/game/graphics/opengl_renderer/ProgressRenderer.cpp +++ b/game/graphics/opengl_renderer/ProgressRenderer.cpp @@ -42,6 +42,9 @@ void ProgressRenderer::handle_frame(u64 val, break; case kMinimapFbp: // 126 m_fb_ctxt.emplace(m_minimap_fb); + // replace any other texture that the game loaded to this slot with our PC with the GPU + // one that we assume will get written to now. + render_state->texture_pool->move_existing_to_vram(m_minimap_gpu_tex, kMinimapVramAddr); m_offscreen_mode = true; break; default: diff --git a/goal_src/jak3/engine/gfx/texture/texture.gc b/goal_src/jak3/engine/gfx/texture/texture.gc index 1658b7f37e..37da3de8a7 100644 --- a/goal_src/jak3/engine/gfx/texture/texture.gc +++ b/goal_src/jak3/engine/gfx/texture/texture.gc @@ -1409,7 +1409,7 @@ (let ((t0-22 (-> lev texture-mask category))) (set! (-> t0-22 mask quad) (the-as uint128 -1)) (set! (-> lev upload-size 8) - (upload-vram-pages-pris pool (-> pool segment-common) a2-1 bucket (the-as (pointer int32) t0-22)) + (upload-vram-pages-pris-pc pool (-> pool segment-common) a2-1 bucket (the-as (pointer int32) t0-22)) ) ) )