Miscellaneous optimizations

CHANGELOG.md

@@ -6,6 +6,7 @@
 - fixed `/give` console command confusing logging around mismatched items (#1463, regression from 3.0)
 - fixed `/flip` console command misreporting an already enabled flipmap as off (regression from 4.0)
 - fixed console commands causing improper ring shutdown with selected inventory item (#1460, regression from 3.0)
+- improved level load times
 - improved logs module names readability
 - improved crash debug information on Windows
 

src/game/gamebuf.c

@@ -63,6 +63,18 @@ void GameBuf_Init(void)
     m_GameAllocMemFree = MALLOC_SIZE;
 }
 
+void GameBuf_Reset(void)
+{
+    if (m_GameMemoryPointer == NULL) {
+        m_GameAllocMemPointer = NULL;
+        m_GameAllocMemFree = 0;
+        return;
+    }
+
+    m_GameAllocMemPointer = m_GameMemoryPointer;
+    m_GameAllocMemFree = MALLOC_SIZE;
+}
+
 void GameBuf_Shutdown(void)
 {
     Memory_FreePointer(&m_GameMemoryPointer);

src/game/gamebuf.h

@@ -48,5 +48,6 @@ typedef enum GAME_BUFFER {
 } GAME_BUFFER;
 
 void GameBuf_Init(void);
+void GameBuf_Reset(void);
 void *GameBuf_Alloc(int32_t alloc_size, GAME_BUFFER buffer);
 void GameBuf_Shutdown(void);

src/game/level.c

@@ -70,8 +70,7 @@ static size_t Level_CalculateMaxVertices(void);
 static void Level_LoadFromFile(
     const char *filename, int32_t level_num, bool is_demo)
 {
-    GameBuf_Shutdown();
-    GameBuf_Init();
+    GameBuf_Reset();
 
     MYFILE *fp = File_Open(filename, FILE_OPEN_READ);
     if (!fp) {

src/game/shell.c

@@ -122,6 +122,7 @@ void Shell_Init(const char *gameflow_path)
         return;
     }
 
+    GameBuf_Init();
     Text_Init();
     Clock_Init();
     Sound_Init();

src/specific/s_output.c

@@ -863,8 +863,6 @@ void S_Output_DrawShadow(PHD_VBUF *vbufs, int clip, int vertex_count)
 
 void S_Output_ApplyRenderSettings(void)
 {
-    S_Output_ReleaseSurfaces();
-
     m_SurfaceWidth = Screen_GetResWidth();
     m_SurfaceHeight = Screen_GetResHeight();
     m_SurfaceMinX = 0.0f;
@@ -876,19 +874,21 @@ void S_Output_ApplyRenderSettings(void)
     GFX_Context_SetDisplaySize(m_SurfaceWidth, m_SurfaceHeight);
     GFX_Context_SetRenderingMode(g_Config.rendering.render_mode);
 
-    {
+    if (m_PrimarySurface == NULL) {
         GFX_2D_SurfaceDesc surface_desc = { 0 };
         m_PrimarySurface = GFX_2D_Surface_Create(&surface_desc);
-
-        S_Output_ClearSurface(m_PrimarySurface);
     }
 
+    S_Output_ClearSurface(m_PrimarySurface);
+
     for (int i = 0; i < GFX_MAX_TEXTURES; i++) {
         GFX_2D_SurfaceDesc surface_desc = {
             .width = 256,
             .height = 256,
         };
-        m_TextureSurfaces[i] = GFX_2D_Surface_Create(&surface_desc);
+        if (m_TextureSurfaces[i] == NULL) {
+            m_TextureSurfaces[i] = GFX_2D_Surface_Create(&surface_desc);
+        }
     }
 }