The-Homebrew-Cloud/sdcafiine_plugin
2
0
Fork 0
mirror of https://github.com/wiiu-env/sdcafiine_plugin.git synced 2024-11-25 12:46:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Split up the allocation for the screenbuffer

Browse Source
This commit is contained in:
Maschell 2022-10-08 19:13:06 +02:00
parent 9fb13e19c8
commit dbb9321540
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/modpackSelector.cpp
View File

@ -19,10 +19,11 @@
#define TEXT_SEL(x, text1, text2) ((x) ? (text1) : (text2)) #define TEXT_SEL(x, text1, text2) ((x) ? (text1) : (text2))
uint8_t *screenBuffer = nullptr; uint8_t *screenBuffer_0 = nullptr;
uint8_t *screenBuffer_1 = nullptr;
bool ScreenInit() { bool ScreenInit() {
if (screenBuffer != nullptr) { if (screenBuffer_0 != nullptr) {
// allocated // allocated
return true; return true;
} }
@ -30,14 +31,23 @@ bool ScreenInit() {
OSScreenInit(); OSScreenInit();
uint32_t screen_buf0_size = OSScreenGetBufferSizeEx(SCREEN_TV); uint32_t screen_buf0_size = OSScreenGetBufferSizeEx(SCREEN_TV);
uint32_t screen_buf1_size = OSScreenGetBufferSizeEx(SCREEN_DRC); uint32_t screen_buf1_size = OSScreenGetBufferSizeEx(SCREEN_DRC);
screenBuffer = (uint8_t *) MEMAllocFromMappedMemoryForGX2Ex(screen_buf0_size + screen_buf1_size, 0x100); screenBuffer_0 = (uint8_t *) MEMAllocFromMappedMemoryForGX2Ex(screen_buf0_size, 0x100);
if (screenBuffer == nullptr) { screenBuffer_1 = (uint8_t *) MEMAllocFromMappedMemoryForGX2Ex(screen_buf1_size, 0x100);
DEBUG_FUNCTION_LINE_ERR("Failed to alloc screenBuffer"); if (screenBuffer_0 == nullptr || screenBuffer_1 == nullptr) {
OSFatal("SDCafiine plugin: Failed to alloc screenBuffer."); if (screenBuffer_0) {
MEMFreeToMappedMemory(screenBuffer_0);
screenBuffer_0 = nullptr;
}
if (screenBuffer_1) {
MEMFreeToMappedMemory(screenBuffer_1);
screenBuffer_1 = nullptr;
}
DEBUG_FUNCTION_LINE_ERR("Failed to allocate screenBuffer");
OSFatal("SDCafiine plugin: Failed to allocate screenBuffer.");
return false; return false;
} }
OSScreenSetBufferEx(SCREEN_TV, (void *) screenBuffer); OSScreenSetBufferEx(SCREEN_TV, (void *) screenBuffer_0);
OSScreenSetBufferEx(SCREEN_DRC, (void *) (screenBuffer + screen_buf0_size)); OSScreenSetBufferEx(SCREEN_DRC, (void *) (screenBuffer_1));
OSScreenEnableEx(SCREEN_TV, 1); OSScreenEnableEx(SCREEN_TV, 1);
OSScreenEnableEx(SCREEN_DRC, 1); OSScreenEnableEx(SCREEN_DRC, 1);
@ -58,15 +68,20 @@ bool ScreenDeInit() {
// Flip buffers // Flip buffers
OSScreenFlipBuffersEx(SCREEN_TV); OSScreenFlipBuffersEx(SCREEN_TV);
OSScreenFlipBuffersEx(SCREEN_DRC); OSScreenFlipBuffersEx(SCREEN_DRC);
if (screenBuffer != nullptr) { if (screenBuffer_0) {
MEMFreeToMappedMemory(screenBuffer); MEMFreeToMappedMemory(screenBuffer_0);
screenBuffer = nullptr; screenBuffer_0 = nullptr;
}
if (screenBuffer_1) {
MEMFreeToMappedMemory(screenBuffer_1);
screenBuffer_1 = nullptr;
} }
return true; return true;
} }
void HandleMultiModPacks(uint64_t titleID) { void HandleMultiModPacks(uint64_t titleID) {
screenBuffer = nullptr; screenBuffer_0 = nullptr;
screenBuffer_1 = nullptr;
char TitleIDString[17]; char TitleIDString[17];
snprintf(TitleIDString, 17, "%016llX", titleID); snprintf(TitleIDString, 17, "%016llX", titleID);
@ -303,7 +318,7 @@ bool ReplaceContent(const std::string &basePath, const std::string &modpack) {
bool aocRes = ReplaceContentInternal(basePath, "aoc", &aocLayerHandle); bool aocRes = ReplaceContentInternal(basePath, "aoc", &aocLayerHandle);
if (!contentRes && !aocRes) { if (!contentRes && !aocRes) {
auto screenWasAllocated = screenBuffer != nullptr; auto screenWasAllocated = screenBuffer_0 != nullptr;
if (!ScreenInit()) { if (!ScreenInit()) {
OSFatal("Failed to apply the modpack."); OSFatal("Failed to apply the modpack.");