From 7dae68561e25659a29a48b42de0ff2d8eb986d97 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 5 Oct 2023 21:32:08 +0200 Subject: [PATCH] optimise mipmaps https://git.do.srb2.org/STJr/SRB2/-/commit/cc12496e9c3fce929546640bbe2c1b35056d7a86 --- src/hardware/hw_cache.c | 24 ++++++++++++++---------- src/hardware/hw_glob.h | 1 + src/hardware/hw_main.c | 1 + src/hardware/hw_main.h | 2 +- src/p_setup.c | 21 ++++++++++++--------- src/r_data.c | 5 +++++ 6 files changed, 34 insertions(+), 20 deletions(-) diff --git a/src/hardware/hw_cache.c b/src/hardware/hw_cache.c index bfd5fa26d..b86022b74 100644 --- a/src/hardware/hw_cache.c +++ b/src/hardware/hw_cache.c @@ -504,6 +504,9 @@ static void FreeMipmapColormap(INT32 patchnum, void *patch) // Set the first colormap to the one that comes after it. next = pat->mipmap->nextcolormap; + if (!next) + break; + pat->mipmap->nextcolormap = next->nextcolormap; // Free image data from memory. @@ -511,14 +514,15 @@ static void FreeMipmapColormap(INT32 patchnum, void *patch) Z_Free(next->grInfo.data); next->grInfo.data = NULL; - // Free the old colormap from memory. + // Free the old colormap mipmap from memory. free(next); } } -void HWR_FreeTextureCache(void) +void HWR_FreeMipmapCache(void) { INT32 i; + // free references to the textures HWD.pfnClearMipMapCache(); @@ -528,10 +532,15 @@ void HWR_FreeTextureCache(void) Z_FreeTags(PU_HWRCACHE_UNLOCKED, PU_HWRCACHE_UNLOCKED); // Alam: free the Z_Blocks before freeing it's users - // free all patch colormaps after each level: must be done after ClearMipMapCache! for (i = 0; i < numwadfiles; i++) M_AATreeIterate(wadfiles[i]->hwrcache, FreeMipmapColormap); +} + +void HWR_FreeTextureCache(void) +{ + // free references to the textures + HWR_FreeMipmapCache(); // now the heap don't have any 'user' pointing to our // texturecache info, we can free it @@ -541,20 +550,15 @@ void HWR_FreeTextureCache(void) gr_numtextures = 0; } -void HWR_PrepLevelCache(size_t pnumtextures) +void HWR_LoadTextures(size_t pnumtextures) { - // problem: the mipmap cache management hold a list of mipmaps.. but they are - // reallocated on each level.. - //sub-optimal, but 1) just need re-download stuff in hardware cache VERY fast - // 2) sprite/menu stuff mixed with level textures so can't do anything else - // we must free it since numtextures changed HWR_FreeTextureCache(); gr_numtextures = pnumtextures; gr_textures = calloc(pnumtextures, sizeof (*gr_textures)); if (gr_textures == NULL) - I_Error("HWR_PrepLevelCache: can't alloc gr_textures"); + I_Error("HWR_LoadTextures: ran out of memory for OpenGL textures. Sad!"); } void HWR_SetPalette(RGBA_t *palette) diff --git a/src/hardware/hw_glob.h b/src/hardware/hw_glob.h index 1950a10da..dd577b9d0 100644 --- a/src/hardware/hw_glob.h +++ b/src/hardware/hw_glob.h @@ -57,6 +57,7 @@ extern size_t addsubsector; // -------- void HWR_InitTextureCache(void); void HWR_FreeTextureCache(void); +void HWR_FreeMipmapCache(void); void HWR_FreeExtraSubsectors(void); void HWR_GetFlat(lumpnum_t flatlumpnum, boolean noencoremap); diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index cee87551f..a61d65bfd 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -6207,6 +6207,7 @@ void HWR_Shutdown(void) { CONS_Printf("HWR_Shutdown()\n"); HWR_FreeExtraSubsectors(); + HWR_FreeMipmapCache(); HWR_FreeTextureCache(); HWD.pfnFlushScreenTextures(); } diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h index 5098c754e..2522cdda1 100644 --- a/src/hardware/hw_main.h +++ b/src/hardware/hw_main.h @@ -155,7 +155,7 @@ void HWR_CreatePlanePolygons(INT32 bspnum); extern boolean gr_maphasportals; // hw_cache.c -void HWR_PrepLevelCache(size_t pnumtextures); +void HWR_LoadTextures(size_t pnumtextures); // hw_trick.c void HWR_CorrectSWTricks(void); diff --git a/src/p_setup.c b/src/p_setup.c index d8dcbb877..39645771a 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -3143,8 +3143,19 @@ boolean P_SetupLevel(boolean skipprecip) P_SpawnPrecipitation(); #ifdef HWRENDER // not win32 only 19990829 by Kin - if (rendermode != render_soft && rendermode != render_none) + if (rendermode == render_opengl) { + // Lactozilla (December 8, 2019) + // Level setup used to free EVERY mipmap from memory. + // Even mipmaps that aren't related to level textures. + // Presumably, the hardware render code used to store textures as level data. + // Meaning, they had memory allocated and marked with the PU_LEVEL tag. + // Level textures are only reloaded after R_LoadTextures, which is + // when the texture list is loaded. + + // Sal: Unfortunately, NOT freeing them causes the dreaded Color Bug. + HWR_FreeMipmapCache(); + // Correct missing sidedefs & deep water trick HWR_CorrectSWTricks(); HWR_CreatePlanePolygons((INT32)numnodes - 1); @@ -3355,14 +3366,6 @@ boolean P_SetupLevel(boolean skipprecip) // clear special respawning que iquehead = iquetail = 0; - // preload graphics -#ifdef HWRENDER // not win32 only 19990829 by Kin - if (rendermode != render_soft && rendermode != render_none) - { - HWR_PrepLevelCache(numtextures); - } -#endif - P_MapEnd(); // Remove the loading shit from the screen diff --git a/src/r_data.c b/src/r_data.c index 4010aae0b..9498e0396 100644 --- a/src/r_data.c +++ b/src/r_data.c @@ -536,6 +536,11 @@ void R_LoadTextures(void) i++; } } + +#ifdef HWRENDER + if (rendermode == render_opengl) + HWR_LoadTextures(numtextures); +#endif } static texpatch_t *R_ParsePatch(boolean actuallyLoadPatch)