mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-06 02:58:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Misc matches (#2845)

Browse Source 
* Misc debug matches

* Fix d_map weak function order

* Remove old nonmatching comments

* d_menu_dmap and JASAudioThread OK, fix weak func order and rodata alignment

* More misc matches
This commit is contained in:
LagoLunatic
2025-11-21 18:52:16 -05:00
committed by GitHub
parent 3f6f4ae616
commit d161aec619
55 changed files with 341 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JUtility/JUTXfb.cpp
+11 -11
View File
@@ -7,6 +7,7 @@
#include "JSystem/JUtility/JUTXfb.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "dolphin/gx.h"
void JUTXfb::clearIndex() {
@@ -29,10 +30,10 @@ JUTXfb::JUTXfb(GXRenderModeObj const* pObj, JKRHeap* pHeap, JUTXfb::EXfbNumber x
if (pObj) {
initiate(pObj->fbWidth, pObj->xfbHeight, pHeap, xfbNum);
} else {
u16 fbWidth = JUTVideo::getManager()->getRenderMode()->fbWidth;
u16 fbWidth = (u32)JUTVideo::getManager()->getRenderMode()->fbWidth;
u16 xfbHeight = (u32)JUTVideo::getManager()->getRenderMode()->xfbHeight;
u16 efbHeight = (u32)JUTVideo::getManager()->getRenderMode()->efbHeight;
u16 xfb_height = JUTVideo::getManager()->getRenderMode()->xfbHeight;
f32 scale_factor = GXGetYScaleFactor(efbHeight, xfb_height);
f32 scale_factor = GXGetYScaleFactor(efbHeight, xfbHeight);
u16 xfb_lines = GXGetNumXfbLines(efbHeight, scale_factor);
initiate(fbWidth, xfb_lines, pHeap, xfbNum);
@@ -55,6 +56,7 @@ void JUTXfb::delXfb(int xfbIdx) {
}
JUTXfb* JUTXfb::createManager(JKRHeap* pHeap, JUTXfb::EXfbNumber xfbNum) {
JUT_CONFIRM(273, sManager == NULL);
if (sManager == NULL) {
sManager = new JUTXfb(NULL, pHeap, xfbNum);
}
@@ -62,24 +64,23 @@ JUTXfb* JUTXfb::createManager(JKRHeap* pHeap, JUTXfb::EXfbNumber xfbNum) {
}
void JUTXfb::destroyManager() {
JUT_CONFIRM(344, sManager);
delete sManager;
sManager = NULL;
}
void JUTXfb::initiate(u16 width, u16 height, JKRHeap* pHeap, JUTXfb::EXfbNumber xfbNum) {
if (pHeap == NULL) {
pHeap = JKRHeap::getSystemHeap();
pHeap = JKRGetSystemHeap();
}
int size = ((u32)width + 0xf & 0xfff0) * (u32)height * 2;
int size = (u16)((u16)width + 0xf & ~0xf) * height * 2;
void* buf = ::operator new[](size, pHeap, 0x20);
mBuffer[0] = buf;
mBuffer[0] = ::operator new[](size, pHeap, 0x20);
mXfbAllocated[0] = true;
if (xfbNum >= 2) {
buf = ::operator new[](size, pHeap, 0x20);
mBuffer[1] = buf;
mBuffer[1] = ::operator new[](size, pHeap, 0x20);
mXfbAllocated[1] = true;
} else {
mBuffer[1] = NULL;
@@ -87,8 +88,7 @@ void JUTXfb::initiate(u16 width, u16 height, JKRHeap* pHeap, JUTXfb::EXfbNumber
}
if (xfbNum >= 3) {
buf = ::operator new[](size, pHeap, 0x20);
mBuffer[2] = buf;
mBuffer[2] = ::operator new[](size, pHeap, 0x20);
mXfbAllocated[2] = true;
} else {
mBuffer[2] = NULL;