Memory management improvements

Author: ihatecompvir

include/SetlistHooks.h

@@ -7,6 +7,7 @@
 #include "rb3/BandLabel.h"
 #include "rb3/SortNode.h"
 #include "rb3/Rnd/RndMat.h"
+#include "rb3/Mem.h"
 
 void SetSongAndArtistNameHook(BandLabel *label, SortNode *sortNode);
 void SetSongNameFromNodeHook(BandLabel *label, SortNode *sortNode);

include/ports.h

@@ -146,7 +146,10 @@
 #define PORT_ADDMULTIGEM 0x827930d8                       // GameGemDB::AddMultiGem
 #define PORT_SONGSORTMGRGETSORT 0x82595ff8                // SongSortMgr::GetSort
 #define PORT_DYNAMICTEX_CT 0x825f2318                     // DynamicTex::__ct
+#define PORT_DYNAMICTEX_DT 0x825f2210                     // DynamicTex::__dt
 #define PORT_RNDMATSETDIFFUSETEX 0x8238b130               // RndMat::SetDiffuseTex
+#define PORT_MUSICLIBRARYONENTER 0x82542238              // MusicLibrary::OnEnter
+#define PORT_MUSICLIBRARYONUNLOAD 0x82540450               // MusicLibrary::OnExit
 // instance addresses
 #define PORT_MODIFIERMGR_POINTER 0x82dfec08 // pointer to ModifierManager
 #define PORT_ROCKCENTRALGATEWAY 0x82cc8f60  // address of RockCentralGateway
@@ -289,6 +292,9 @@ void DbgPrint(const char *s, ...);
 #define PORT_SONGSORTMGRGETSORT 0x80281b20                // SongSortMgr::GetSort
 #define PORT_RNDMATSETDIFFUSETEX 0x8025ab90               // RndMat::SetDiffuseTex
 #define PORT_DYNAMICTEX_CT 0x80292a70                     // DynamicTex::__ct
+#define PORT_DYNAMICTEX_DT 0x80292bcc                     // DynamicTex::__dt
+#define PORT_MUSICLIBRARYONENTER 0x8022dd24              // MusicLibrary::OnEnter
+#define PORT_MUSICLIBRARYONUNLOAD 0x8022e87c               // MusicLibrary::OnExit
 // instance addresses
 #define PORT_MODIFIERMGR_POINTER 0x808fda68 // pointer to ModifierManager
 #define PORT_ROCKCENTRALGATEWAY 0x80900870  // address of RockCentralGateway

include/rb3/MusicLibrary.h

@@ -17,5 +17,9 @@ typedef struct _MusicLibrary
 void MusicLibrarySelect(int theMusicLibrary, Symbol entryName, int sortType, int unk_r6);
 int *MusicLibraryConstructor(int *thisMusicLibrary, int *songPreview);
 int *MusicLibraryConstructorHook(MusicLibrary *thisMusicLibrary, int *songPreview);
+void MusicLibraryOnEnter(void* thisMusicLibrary);
+void MusicLibraryOnUnload(void* thisMusicLibrary);
+void MusicLibraryOnEnterHook(void* thisMusicLibrary);
+void MusicLibraryOnUnloadHook(void* thisMusicLibrary);
 
 #endif // _MUSICLIBRARY_H_

include/rb3/Rnd/DynamicTex.h

@@ -14,7 +14,8 @@ typedef struct _DynamicTex
     char unk; // 0x1C
 } DynamicTex;
 
-void DynamicTexConstructor(void* thisDynamicTex, const char * path, const char* matName, char createNewMat, char enableZBuffer);
+void DynamicTexConstructor(DynamicTex* thisDynamicTex, const char * path, const char* matName, char createNewMat, char enableZBuffer);
+void DynamicTexDestructor(DynamicTex* thisDynamicTex, int unk);
 
 
 

source/SetlistHooks.c

@@ -34,6 +34,10 @@ void CreateMaterial(GameOriginInfo *info)
     // it will free the dynamic tex itself, the material it created, and the texture too, so it nicely wraps it all up for you
     // this way there is not a chunk of memory permanently dedicated to game origin icons (even if it is not a large amount)
     tex = MemAlloc(0x20, 0);
+    if (tex == NULL) {
+        RB3E_DEBUG("MemAlloc failed for dynamic tex '%s'", info->gameOrigin);
+        return;
+    }
 
     // build the ark path (so dont include /gen/ or the _platform extension etc.)
     RB3E_DEBUG("Creating dynamic tex for game origin '%s'", info->gameOrigin);
@@ -43,6 +47,13 @@ void CreateMaterial(GameOriginInfo *info)
 
     // create and pray
     DynamicTexConstructor(tex, path, info->gameOrigin, 1, 0);
+    if (tex->mMat == NULL || tex->mTex == NULL) {
+        RB3E_DEBUG("DynamicTex::__ct failed for dynamic tex '%s'", path);
+
+        // we should prob do cleanup here but that is a
+        // TODO
+        return;
+    }
 
     textures[info->num] = tex;
 
@@ -60,6 +71,8 @@ void CreateMaterial(GameOriginInfo *info)
     // print the material name
     RB3E_DEBUG("Dynamic tex created at %p with material '%s'", textures[info->num], textures[info->num]->mMatName.buf);
 
+    RB3E_DEBUG("Dynamic tex created at %p with mat %p tex %p fileloader %p", tex, tex->mMat, tex->mTex, tex->mFileLoader);
+
 
 }
 
@@ -123,6 +136,64 @@ RndMat *MusicLibraryMatHook(MusicLibrary *thisMusicLibrary, int data, int idx, U
     return MusicLibraryMat(thisMusicLibrary, data, idx, listSlot);
 }
 
+// called when entering the music library
+// allocate the memory and load the textures here
+void MusicLibraryOnEnterHook(void *thisMusicLibrary)
+{
+    int i;
+
+    // allocate and create the materials for any game origins we found while loading songs
+    for (i = 0; i < numGameOrigins; i++) {
+        int slot = originInfo[i].num;
+        if (slot >= 0 && slot < 100) {
+            if (textures[slot] == NULL) {
+                CreateMaterial(&originInfo[i]);
+            }
+        }
+    }
+
+    // do the original logic
+    MusicLibraryOnEnter(thisMusicLibrary);
+}
+
+// called when the music library panel is unloaded
+void MusicLibraryOnUnloadHook(void *thisMusicLibrary)
+{
+    int i;
+
+    MusicLibraryOnUnload(thisMusicLibrary);
+
+    // call the dynamictex destructor for any textures we created
+    // lets just sweep all 100 to be safe
+    for (i = 0; i < 100; i++) {
+        if (textures[i] != NULL) {
+            // we can't call the DynamicTexDestructor because the FileLoader it used has already been freed by this point, so we must destruct everything but the FileLoader
+            // extremely nasty but it seems to work
+            if(textures[i]->mMat != NULL) {
+                ((Object *)textures[i]->mMat)->table->destructor((Object *)textures[i]->mMat);
+                textures[i]->mMat = NULL;
+            }
+            if(textures[i]->mTex != NULL) {
+                ((Object *)textures[i]->mTex)->table->destructor((Object *)textures[i]->mTex);
+                textures[i]->mTex = NULL;
+            }
+            // TODO: set up a proper vtable for String instead of doign this shit
+            if(textures[i]->mMatName.length != 0) {
+                if(textures[i]->mMatName.vtable != NULL) {
+                    #ifdef RB3E_WII
+                    ((void (*)(String *))textures[i]->mMatName.vtable[2])(&textures[i]->mMatName);
+                    #else
+                    ((void (*)(String *))textures[i]->mMatName.vtable[0])(&textures[i]->mMatName);
+                    #endif
+                }
+            }
+            textures[i] = NULL;
+        }
+    }
+
+    RB3E_DEBUG("Freed game origin icon textures", NULL);
+}
+
 int numGameOrigins;
 GameOriginInfo originInfo[100] = {0};
 
@@ -150,7 +221,6 @@ void AddGameOriginToIconList(char *gameOrigin)
 
     originInfo[numGameOrigins].gameOrigin = gameOrigin;
     originInfo[numGameOrigins].num = numGameOrigins;
-    CreateMaterial(&originInfo[numGameOrigins]);
     numGameOrigins++;
     RB3E_DEBUG("Adding game origin '%s' to icon list, total is now %i", gameOrigin, numGameOrigins);
     } 

source/_functions.c

@@ -98,6 +98,8 @@ RB3E_STUB(RndTexSetBitmap)
 RB3E_STUB(RndTexSetBitmap2)
 RB3E_STUB(FilePathConstructor)
 RB3E_STUB(MusicLibraryMat)
+RB3E_STUB(MusicLibraryOnEnter)
+RB3E_STUB(MusicLibraryOnUnload)
 RB3E_STUB(RndCreateDefaultTexture)
 RB3E_STUB(MusicLibraryConstructor)
 RB3E_STUB(MusicLibraryGetNodeByIndex)
@@ -112,5 +114,6 @@ RB3E_STUB(SongMetadataLoad)
 RB3E_STUB(SongSortMgrGetSort)
 RB3E_STUB(NodeSortGetNode)
 RB3E_STUB(DynamicTexConstructor)
+RB3E_STUB(DynamicTexDestructor)
 RB3E_STUB(RndMatSetDiffuseTex)
 RB3E_STUB(RndTexSetBitmap3)

source/rb3enhanced.c

@@ -334,6 +334,7 @@ void InitialiseFunctions()
     POKE_B(&GameGemDBConstructor, PORT_GAMEGEMDB_CT);
     POKE_B(&SongSortMgrGetSort, PORT_SONGSORTMGRGETSORT);
     POKE_B(&DynamicTexConstructor, PORT_DYNAMICTEX_CT);
+    POKE_B(&DynamicTexDestructor, PORT_DYNAMICTEX_DT);
     POKE_B(&RndMatSetDiffuseTex, PORT_RNDMATSETDIFFUSETEX);
     POKE_B(&RndTexSetBitmap3, PORT_RNDTEXSETBITMAP3);
     RB3E_MSG("Functions initialized!", NULL);
@@ -371,6 +372,8 @@ void ApplyHooks()
     HookFunction(PORT_UPDATEPRESENCE, &UpdatePresence, &UpdatePresenceHook);
     HookFunction(PORT_MUSICLIBRARY_CT, &MusicLibraryConstructor, &MusicLibraryConstructorHook);
     HookFunction(PORT_MUSICLIBRARYMAT, &MusicLibraryMat, &MusicLibraryMatHook);
+    HookFunction(PORT_MUSICLIBRARYONENTER, &MusicLibraryOnEnter, &MusicLibraryOnEnterHook);
+    HookFunction(PORT_MUSICLIBRARYONUNLOAD, &MusicLibraryOnUnload, &MusicLibraryOnUnloadHook);
 #ifdef RB3E_WII // wii exclusive hooks
     HookFunction(PORT_USBWIIGETTYPE, &UsbWiiGetType, &UsbWiiGetTypeHook);
     HookFunction(PORT_WIINETINIT_DNSLOOKUP, &StartDNSLookup, &StartDNSLookupHook);