diff options
| author | Rozelette <Rozelette@users.noreply.github.com> | 2021-03-27 12:44:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-27 12:44:39 -0500 |
| commit | 6536afc6d3ee65c8dc86fa5009fc081242be18fe (patch) | |
| tree | 2406c463c2deec5b26e7bba7f480a4a58f11a229 /src | |
| parent | 807db1ca549de3d38c42e24eb53f0803023ffcea (diff) | |
Restructure how buffers are set up (#77)
Diffstat (limited to 'src')
| -rw-r--r-- | src/boot_O2_g3/idle.c | 6 | ||||
| -rw-r--r-- | src/buffers/gfxbuffers.c | 8 | ||||
| -rw-r--r-- | src/buffers/heaps.c | 6 | ||||
| -rw-r--r-- | src/libultra/os/initialize.c | 2 |
4 files changed, 18 insertions, 4 deletions
diff --git a/src/boot_O2_g3/idle.c b/src/boot_O2_g3/idle.c index f3c5f711c..fdc330543 100644 --- a/src/boot_O2_g3/idle.c +++ b/src/boot_O2_g3/idle.c @@ -27,9 +27,9 @@ void Idle_InitFramebuffer(u32* ptr, u32 numBytes, u32 value) { #endif void Idle_InitScreen(void) { - Idle_InitFramebuffer((u32*)&D_80000500, 0x25800, 0x00010001); + Idle_InitFramebuffer((u32*)&gFramebuffer1, 0x25800, 0x00010001); ViConfig_UpdateVi(0); - osViSwapBuffer(&D_80000500); + osViSwapBuffer(&gFramebuffer1); osViBlack(0); } @@ -37,7 +37,7 @@ void Idle_InitMemory(void) { u32 pad; void* memEnd = (void*)(0x80000000 + osMemSize); - Idle_ClearMemory((void*)0x80000400, &D_80000500); + Idle_ClearMemory((void*)0x80000400, &gFramebuffer1); Idle_ClearMemory(&D_80025D00, (int*)&boot_text_start); Idle_ClearMemory(&code_bss_end, memEnd); } diff --git a/src/buffers/gfxbuffers.c b/src/buffers/gfxbuffers.c new file mode 100644 index 000000000..cb7e36be0 --- /dev/null +++ b/src/buffers/gfxbuffers.c @@ -0,0 +1,8 @@ +#include <ultra64.h> +#include <global.h> + +u8 gGfxSPTaskYieldBuffer[OS_YIELD_DATA_SIZE]; + +u8 gGfxSPTaskStack[0x400]; + +GfxPool gGfxPools[2]; diff --git a/src/buffers/heaps.c b/src/buffers/heaps.c new file mode 100644 index 000000000..d35d0056e --- /dev/null +++ b/src/buffers/heaps.c @@ -0,0 +1,6 @@ +#include <ultra64.h> +#include <global.h> + +u8 gAudioHeap[0x138000]; + +u32 gSystemHeap[UNK_SIZE]; diff --git a/src/libultra/os/initialize.c b/src/libultra/os/initialize.c index 9e50f26fa..dd888fd73 100644 --- a/src/libultra/os/initialize.c +++ b/src/libultra/os/initialize.c @@ -48,7 +48,7 @@ void osInitialize(void) { D_80097E50 = (D_80097E50 * 3) / 4; if (osResetType == 0) { - _blkclr((u8*)&D_8000031C, 64); + _blkclr((u8*)&osAppNmiBuffer, 64); } if (osTvType == 0) { |