mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-05-26 07:38:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35 from robojumper/eggGraphicsFifo

Browse Source 
eggGraphicsFifo matching
This commit is contained in:
Elijah Thomas
2024-05-12 12:47:00 -04:00
committed by GitHub
parent c86982a60e 9da8f877e1
commit d91a829295
5 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/splits.txt
+2 -1
View File
@@ -390,7 +390,8 @@ egg/core/eggXfbManager.cpp:
egg/core/eggGraphicsFifo.cpp:
.text start:0x80498E20 end:0x80498F90
.sbss start:0x80576798 end:0x805767A8
.data start:0x8056EB80 end:0x8056EB90
.sbss start:0x80576798 end:0x805767A4
egg/core/eggController.cpp:
.text start:0x80498F90 end:0x8049AB58
config/SOUE01/symbols.txt
+5 -5
View File
@@ -26309,9 +26309,9 @@ isRegisterd__Q23EGG10XfbManagerCFRQ23EGG3Xfb = .text:0x80498AF0; // type:functio
attach__Q23EGG10XfbManagerFPQ23EGG3Xfb = .text:0x80498B30; // type:function size:0xE0
copyEFB__Q23EGG10XfbManagerFb = .text:0x80498C10; // type:function size:0xE8
setNextFrameBuffer__Q23EGG10XfbManagerFv = .text:0x80498D00; // type:function size:0x120
create__Q23EGG12GraphicsFifoFUlPQ23EGG4Heap = .text:0x80498E20; // type:function size:0x68
create__Q23EGG12GraphicsFifoFUiPQ23EGG4Heap = .text:0x80498E20; // type:function size:0x68
__dt__Q23EGG12GraphicsFifoFv = .text:0x80498E90; // type:function size:0x98
__ct__Q23EGG12GraphicsFifoFUlPQ23EGG4Heap = .text:0x80498F30; // type:function size:0x60
__ct__Q23EGG12GraphicsFifoFUiPQ23EGG4Heap = .text:0x80498F30; // type:function size:0x60
init__Q23EGG10CoreStatusFv = .text:0x80498F90; // type:function size:0xC
getFSStickButton__Q23EGG10CoreStatusCFv = .text:0x80498FA0; // type:function size:0xAC
__ct__Q23EGG14CoreControllerFv = .text:0x80499050; // type:function size:0x60
@@ -37109,7 +37109,7 @@ __vt__Q23EGG7Display = .data:0x8056EAC8; // type:object size:0x20
__vt__Q23EGG10ColorFader = .data:0x8056EAE8; // type:object size:0x24
clear_z_TX__29@unnamed@eggAsyncDisplay_cpp@ = .data:0x8056EB20; // type:object size:0x40 scope:local
__vt__Q23EGG12AsyncDisplay = .data:0x8056EB60; // type:object size:0x20
lbl_8056EB80 = .data:0x8056EB80; // type:object size:0x10
__vt__Q23EGG12GraphicsFifo = .data:0x8056EB80; // type:object size:0xC
lbl_8056EB90 = .data:0x8056EB90; // type:object size:0x18
lbl_8056EBA8 = .data:0x8056EBA8; // type:object size:0xC
lbl_8056EBB4 = .data:0x8056EBB4; // type:object size:0xC
@@ -40900,8 +40900,8 @@ lbl_80576778 = .sbss:0x80576778; // type:object size:0x8 data:4byte
mConfigData__Q23EGG10BaseSystem = .sbss:0x80576780; // type:object size:0x4 data:4byte
sTickPeriod__Q23EGG7Display = .sbss:0x80576788; // type:object size:0x4 data:4byte
spSelector = .sbss:0x80576790; // type:object size:0x4 data:4byte
lbl_80576798 = .sbss:0x80576798; // type:object size:0x4 data:4byte
lbl_8057679C = .sbss:0x8057679C; // type:object size:0xC
sGraphicsFifo__Q23EGG12GraphicsFifo = .sbss:0x80576798; // type:object size:0x4 data:4byte
sGpStatus__Q23EGG12GraphicsFifo = .sbss:0x8057679C; // type:object size:0x5 data:byte
lbl_805767A8 = .sbss:0x805767A8; // type:object size:0x4 data:4byte
lbl_805767AC = .sbss:0x805767AC; // type:object size:0x4 data:4byte
lbl_805767B0 = .sbss:0x805767B0; // type:object size:0x4 data:4byte
configure.py
+1 -1
View File
@@ -370,7 +370,7 @@ config.libs = [
Object(Matching, "egg/core/eggVideo.cpp"),
Object(Matching, "egg/core/eggXfb.cpp"),
Object(NonMatching, "egg/core/eggXfbManager.cpp"),
Object(NonMatching, "egg/core/eggGraphicsFifo.cpp"),
Object(Matching, "egg/core/eggGraphicsFifo.cpp"),
Object(NonMatching, "egg/core/eggController.cpp"),
],
),
include/egg/core/eggGraphicsFifo.h
+1 -1
View File
@@ -22,7 +22,7 @@ public:
public:
/* 80576798 */ static GraphicsFifo *sGraphicsFifo;
/* 8057679c */ static bool sGpStatus[4];
/* 8057679c */ static u8 sGpStatus[5];
};
} // namespace EGG
src/egg/core/eggGraphicsFifo.cpp
+35
View File
@@ -0,0 +1,35 @@
#include <rvl/GX.h>
#include <egg/core/eggGraphicsFifo.h>
#include <egg/core/eggHeap.h>
extern "C" void *GXInit(void *buf, u32 bufSize);
extern "C" void GXGetGPStatus(GXBool *overhi, GXBool *underlow, GXBool *readIdle, GXBool *cmdIdle, GXBool *brkpt);
namespace EGG {
GraphicsFifo *GraphicsFifo::sGraphicsFifo;
u8 GraphicsFifo::sGpStatus[];
void GraphicsFifo::create(u32 size, Heap *heap) {
if (heap == nullptr) {
heap = Heap::sCurrentHeap;
}
sGraphicsFifo = new(heap, 0x04) GraphicsFifo(size, heap);
}
GraphicsFifo::~GraphicsFifo() {
do {
GXGetGPStatus(&sGpStatus[0], &sGpStatus[1], &sGpStatus[2], &sGpStatus[3], &sGpStatus[4]);
} while (sGpStatus[2] == false);
Heap::free(mBuffBase, nullptr);
}
GraphicsFifo::GraphicsFifo(u32 size, Heap *heap) {
mBufSize = ROUND_UP(size, 0x20);
mBuffBase = Heap::alloc(mBufSize, 0x20, heap);
mGxInitData = GXInit(mBuffBase, mBufSize);
}
} // namespace EGG