From 748d665d97fc05504a0e6b9e69f707767e5f0f7c Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 29 Oct 2023 14:04:13 -0700 Subject: [PATCH] JRenderer match --- configure.py | 2 +- src/JSystem/JRenderer/JRenderer.cpp | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/configure.py b/configure.py index a722ab280..f806a9aa1 100644 --- a/configure.py +++ b/configure.py @@ -850,7 +850,7 @@ config.libs = [ JSystemLib( "JRenderer", [ - Object(NonMatching, "JSystem/JRenderer/JRenderer.cpp"), + Object(Matching, "JSystem/JRenderer/JRenderer.cpp"), ], ), JSystemLib( diff --git a/src/JSystem/JRenderer/JRenderer.cpp b/src/JSystem/JRenderer/JRenderer.cpp index 794c89a19..425d635d3 100644 --- a/src/JSystem/JRenderer/JRenderer.cpp +++ b/src/JSystem/JRenderer/JRenderer.cpp @@ -4,8 +4,14 @@ // #include "dolphin/gx/GX.h" +#include "JSystem/J3DGraphBase/J3DGD.h" + +u8 JRNTexImage1Ids[] = { 0x8c, 0x8d, 0x8e, 0x8f, 0xac, 0xad, 0xae, 0xaf }; +u8 JRNTexImage2Ids[] = { 0x90, 0x91, 0x92, 0x93, 0xb0, 0xb1, 0xb2, 0xb3 }; /* 802D5EB8-802D5F38 .text JRNLoadTexCached__F11_GXTexMapIDUl15_GXTexCacheSizeUl15_GXTexCacheSize */ -void JRNLoadTexCached(GXTexMapID texmap, u32, GXTexCacheSize, u32, GXTexCacheSize) { - /* Nonmatching */ +void JRNLoadTexCached(GXTexMapID id, u32 addr_even, GXTexCacheSize size_even, u32 addr_odd, GXTexCacheSize size_odd) { + GFWriteBPCmd((addr_even >> 5) | ((size_even + 3) << 15) | ((size_even + 3) << 18) | (JRNTexImage1Ids[id] << 24)); + if (size_odd != GX_TEXCACHE_NONE && addr_odd < 0x100000) + GFWriteBPCmd((addr_odd >> 5) | ((size_odd + 3) << 15) | ((size_odd + 3) << 18) | (JRNTexImage2Ids[id] << 24)); }