DOOM: Fixed/Improved pre-caching to reduce stuttering

Author: ducalex

base.sdkconfig

@@ -87,7 +87,7 @@ CONFIG_SPIRAM_MEMTEST=n
 CONFIG_SPIRAM_CACHE_WORKAROUND=n
 CONFIG_SPIRAM_BANKSWITCH_ENABLE=n
 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=32768
-CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=4096
+CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=8192
 CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=n
 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y
 CONFIG_SPIRAM_OCCUPY_HSPI_HOST=n

components/retro-go/rg_display.c

@@ -606,7 +606,7 @@ void rg_display_reset_config(void)
         // TO DO: We probably should call the setters to ensure valid values...
         .screen.width = RG_SCREEN_WIDTH - RG_SCREEN_MARGIN_LEFT - RG_SCREEN_MARGIN_RIGHT,
         .screen.height = RG_SCREEN_HEIGHT - RG_SCREEN_MARGIN_TOP - RG_SCREEN_MARGIN_BOTTOM,
-        .config.backlight = RG_MIN(RG_MAX(rg_settings_get_int32(SETTING_BACKLIGHT, 40), 0), 100),
+        .config.backlight = RG_MIN(RG_MAX(rg_settings_get_int32(SETTING_BACKLIGHT, 80), 0), 100),
         .config.scaling = rg_settings_get_app_int32(SETTING_SCALING, RG_DISPLAY_SCALING_FILL),
         .config.filter = rg_settings_get_app_int32(SETTING_FILTER, RG_DISPLAY_FILTER_HORIZ),
         .config.rotation = rg_settings_get_app_int32(SETTING_ROTATION, RG_DISPLAY_ROTATION_AUTO),

components/retro-go/rg_gui.c

@@ -710,7 +710,7 @@ static dialog_return_t brightness_update_cb(dialog_option_t *option, dialog_even
     if (event == RG_DIALOG_PREV) level -= 10;
     if (event == RG_DIALOG_NEXT) level += 10;
 
-    level = RG_MIN(RG_MAX(level, 10), 100);
+    level = RG_MIN(RG_MAX(level & ~1, 1), 100);
 
     if (level != old_level)
         rg_display_set_backlight(level);

prboom-go/components/prboom/d_main.c

@@ -519,7 +519,7 @@ void D_StartTitle (void)
 //
 // Add files to be loaded later by W_Init()
 //
-boolean D_AddFile(const char *file, wad_source_t source)
+bool D_AddFile(const char *file)
 {
   char relpath[PATH_MAX + 1];
 
@@ -691,11 +691,11 @@ static void D_DoomMainSetup(void)
 
   // Try loading iwad specified as parameter
   if ((p = M_CheckParm("-iwad")) && (++p < myargc))
-    D_AddFile(myargv[p], source_iwad);
+    D_AddFile(myargv[p]);
 
   // If that fails then try known standard iwad names
   for (int i = 0; !numwadfiles && standard_iwads[i]; i++)
-    D_AddFile(standard_iwads[i], source_iwad);
+    D_AddFile(standard_iwads[i]);
 
   if (!numwadfiles)
     I_Error("IWAD not found\n");
@@ -745,6 +745,20 @@ static void D_DoomMainSetup(void)
     "It comes with ABSOLUTELY NO WARRANTY. See the file COPYING for details.\n",
     PACKAGE, VERSION, version_date, doomverstr);
 
+  // Add prboom.wad at the very beginning so it can be overriden by mods
+#ifdef PRBOOMWAD
+  #include "prboom_wad.h"
+  wadfiles[numwadfiles++] = (wadfile_info_t){
+      .name = "prboom.wad",
+      .data = prboom_wad,
+      .size = prboom_wad_size,
+      .handle = NULL,
+  };
+#else
+  if (!D_AddFile("prboom.wad"))
+    I_Error("PRBOOM.WAD not found\n");
+#endif
+
   if ((devparm = M_CheckParm("-devparm")))
     lprintf(LO_CONFIRM, "%s", s_D_DEVSTR);
 
@@ -901,7 +915,7 @@ static void D_DoomMainSetup(void)
       // the parms after p are wadfile/lump names,
       // until end of parms or another - preceded parm
       while (++p != myargc && *myargv[p] != '-')
-        if (D_AddFile(myargv[p], source_pwad))
+        if (D_AddFile(myargv[p]))
           modifiedgame = true;
     }
 
@@ -917,32 +931,14 @@ static void D_DoomMainSetup(void)
       char file[PATH_MAX+1];      // cph - localised
       strcpy(file,myargv[p+1]);
       AddDefaultExtension(file,".lmp");     // killough
-      D_AddFile (file,source_lmp);
+      D_AddFile (file);
       //jff 9/3/98 use logical output routine
       lprintf(LO_CONFIRM,"Playing demo %s\n",file);
       if ((p = M_CheckParm ("-ffmap")) && p < myargc-1) {
         ffmap = atoi(myargv[p+1]);
       }
-
     }
 
-  // Add prboom.wad at the very end
-  if (!D_AddFile("prboom.wad", source_auto_load))
-  {
-#ifdef PRBOOMWAD
-    lprintf(LO_WARN, "PRBOOM.WAD not found. Using bundled version.\n");
-    #include "prboom_wad.h"
-    wadfiles[numwadfiles++] = (wadfile_info_t){
-        .name = "prboom.wad",
-        .data = prboom_wad,
-        .size = prboom_wad_size,
-        .handle = NULL,
-    };
-#else
-    I_Error("PRBOOM.WAD not found\n");
-#endif
-  }
-
   // internal translucency set to config file value               // phares
   general_translucency = default_translucency;                    // phares
 

prboom-go/components/prboom/d_main.h

@@ -69,6 +69,6 @@ void D_Display(void);
 void D_PageTicker(void);
 void D_StartTitle(void);
 void D_DoomMain(void);
-boolean D_AddFile(const char *file, wad_source_t source);
+bool D_AddFile(const char *file);
 
 #endif

prboom-go/components/prboom/m_misc.c

@@ -178,7 +178,7 @@ default_t defaults[] =
    def_int,ss_none}, // 1=take special steps ensuring demo sync, 2=only during recordings
   // {"endoom_mode", {&endoom_mode},{5},0,7, // CPhipps - endoom flags
   //  def_hex, ss_none}, // 0, +1 for colours, +2 for non-ascii chars, +4 for skip-last-line
-  {"level_precache",{(int*)&precache},{0},0,1,
+  {"level_precache",{(int*)&precache},{1},0,1,
    def_bool,ss_none}, // precache level data?
   {"demo_smoothturns", {&demo_smoothturns},  {0},0,1,
    def_bool,ss_stat},

prboom-go/components/prboom/r_data.c

@@ -456,20 +456,19 @@ void R_InitTranMap(int progress)
   // If a tranlucency filter map lump is present, use it
   if ((lump = W_CheckNumForName("TRANMAP")) != -1)
     {
-      lprintf(LO_INFO, "R_InitTranMap: TRANMAP lump: %d\n", lump);
+      lprintf(LO_INFO, "R_InitTranMap: Using TRANMAP(%d) directly\n", lump);
       main_tranmap = W_CacheLumpNum(lump);
     }
   // Compose a default transparent filter map based on PLAYPAL.
   else if ((lump = W_CheckNumForName("PLAYPAL")) != -1)
     {
-      lprintf(LO_INFO, "R_InitTranMap: PLAYPAL lump: %d\n", lump);
-      if (progress)
-        lprintf(LO_INFO, "Tranmap build [        ]\x08\x08\x08\x08\x08\x08\x08\x08\x08");
+      lprintf(LO_INFO, "R_InitTranMap: Gen from PLAYPAL(%d) [        ]"
+              "\x08\x08\x08\x08\x08\x08\x08\x08\x08", lump);
 
       const struct PACKEDATTR {byte r, g, b;} *pal = W_CacheLumpNum(lump);
       byte *my_tranmap = Z_Malloc(256*256, PU_STATIC, 0);
-      int w1 = ((unsigned)tran_filter_pct<<TSC)/100;
-      int w2 = (1l<<TSC)-w1;
+      int w1 = (tran_filter_pct << TSC) / 100;
+      int w2 = (1 << TSC) - w1;
       int total[256];
 
       for (int i = 0; i < 256; ++i)
@@ -491,24 +490,27 @@ void R_InitTranMap(int progress)
           if (!(i & 31) && progress)
             lprintf(LO_INFO,".");
 
-          for (int j = 0; j < 256; j++, tp++)
+          for (int j = 0; j < 256; j++)
             {
               int r = r1 + (pal[j].r * w1);
               int g = g1 + (pal[j].g * w1);
               int b = b1 + (pal[j].b * w1);
-              int best = INT_MAX;
+              int bc = 0, best = INT_MAX;
               for (int color = 255; color >= 0; --color)
                 {
                   int err = total[color] - pal[color].r*r - pal[color].g*g - pal[color].b*b;
                   if (err < best)
-                    best = err, *tp = color;
+                    best = err, bc = color;
                 }
+                *tp++ = bc;
             }
         }
 
       main_tranmap = my_tranmap;
 
       W_UnlockLumpName("PLAYPAL");
+
+      lprintf(LO_INFO, "\n");
     }
 }
 
@@ -615,79 +617,85 @@ static inline void precache_lump(int l)
 
 void R_PrecacheLevel(void)
 {
-  register int i;
-  register byte *hitlist;
-
   if (demoplayback)
     return;
 
-  {
-    size_t size = numflats > numsprites  ? numflats : numsprites;
-    hitlist = malloc((size_t)numtextures > size ? numtextures : size);
-  }
+  size_t maxitems = MAX(numtextures, MAX(numflats, numsprites));
+  byte hitlist[maxitems];
+  size_t count = 0;
 
   // Precache flats.
+  memset(hitlist, 0, maxitems);
+  count = 0;
 
-  memset(hitlist, 0, numflats);
-
-  for (i = numsectors; --i >= 0; )
-    hitlist[sectors[i].floorpic] = hitlist[sectors[i].ceilingpic] = 1;
+  for (int i = numsectors; --i >= 0; )
+  {
+    hitlist[sectors[i].floorpic] = 1;
+    hitlist[sectors[i].ceilingpic] = 1;
+  }
 
-  for (i = numflats; --i >= 0; )
+  for (int i = numflats; --i >= 0; )
+  {
     if (hitlist[i])
+    {
       precache_lump(firstflat + i);
+      count++;
+    }
+  }
 
-  // Precache textures.
-
-  memset(hitlist, 0, numtextures);
+  lprintf(LO_INFO, "R_PrecacheLevel: pre-cached %d flats\n", count);
 
-  for (i = numsides; --i >= 0;)
-    hitlist[sides[i].bottomtexture] =
-      hitlist[sides[i].toptexture] =
-      hitlist[sides[i].midtexture] = 1;
 
-  // Sky texture is always present.
-  // Note that F_SKY1 is the name used to
-  //  indicate a sky floor/ceiling as a flat,
-  //  while the sky texture is stored like
-  //  a wall texture, with an episode dependend
-  //  name.
+  // Precache textures.
+  memset(hitlist, 0, maxitems);
+  count = 0;
 
+  for (int i = numsides; --i >= 0; )
+  {
+    hitlist[sides[i].bottomtexture] = 1;
+    hitlist[sides[i].toptexture] = 1;
+    hitlist[sides[i].midtexture] = 1;
+  }
   hitlist[skytexture] = 1;
 
-  for (i = numtextures; --i >= 0; )
+  for (int i = numtextures; --i >= 0; )
     if (hitlist[i])
       {
         texture_t *texture = textures[i];
-        int j = texture->patchcount;
-        while (--j >= 0)
+        for (int j = texture->patchcount; --j >= 0; )
+        {
           precache_lump(texture->patches[j].patch);
+          count++;
+        }
       }
 
+  lprintf(LO_INFO, "R_PrecacheLevel: pre-cached %d textures\n", count);
+
+
   // Precache sprites.
-  memset(hitlist, 0, numsprites);
+  memset(hitlist, 0, maxitems);
+  count = 0;
 
-  {
-    thinker_t *th = NULL;
-    while ((th = P_NextThinker(th,th_all)) != NULL)
-      if (th->function == P_MobjThinker)
-        hitlist[((mobj_t *)th)->sprite] = 1;
-  }
+  thinker_t *th = NULL;
+  while ((th = P_NextThinker(th,th_all)))
+    if (th->function == P_MobjThinker)
+      hitlist[((mobj_t *)th)->sprite] = 1;
 
-  for (i=numsprites; --i >= 0;)
+  for (int i = numsprites; --i >= 0; )
     if (hitlist[i])
       {
-        int j = sprites[i].numframes;
-        while (--j >= 0)
+        for (int j = sprites[i].numframes; --j >= 0; )
           {
             short *sflump = sprites[i].spriteframes[j].lump;
-            int k = 7;
-            do
+            for (int k = 7; --k >= 0; )
+            {
               precache_lump(firstspritelump + sflump[k]);
-            while (--k >= 0);
+              count++;
+            }
           }
       }
-  free(hitlist);
+
+  lprintf(LO_INFO, "R_PrecacheLevel: pre-cached %d sprites\n", count);
 }
 
 // Proff - Added for OpenGL

prboom-go/components/prboom/v_video.c

@@ -490,22 +490,25 @@ static int currentPaletteIndex = 0;
 // V_UpdateTrueColorPalette
 //
 void V_UpdateTrueColorPalette(video_mode_t mode) {
+  static int usegammaOnLastPaletteGeneration = -1;
   int i, w, p;
   byte r,g,b;
   int nr,ng,nb;
   float t;
   int paletteNum = currentPaletteIndex;
-  static int usegammaOnLastPaletteGeneration = -1;
-
   int pplump = W_GetNumForName("PLAYPAL");
-  int gtlump = W_CheckNumForNameNs("GAMMATBL",ns_prboom);
   const byte *pal = W_CacheLumpNum(pplump);
-  const byte *gtable = W_CacheLumpNum(gtlump) + 256*(usegamma);
-
   int numPals = W_LumpLength(pplump) / (3*256);
   const float dontRoundAbove = 220;
   float roundUpR, roundUpG, roundUpB;
 
+  byte gtable[256];
+
+  // Note: this isn't right but I haven't reverse engineered how GAMMATBL
+  // was generated yet and we don't even use truecolors for now...
+  for (i = 0; i < 256; i++)
+    gtable[i] = i << usegamma;
+
   if (usegammaOnLastPaletteGeneration != usegamma) {
     if (Palettes15) free(Palettes15);
     if (Palettes16) free(Palettes16);
@@ -608,7 +611,6 @@ void V_UpdateTrueColorPalette(video_mode_t mode) {
   }
 
   W_UnlockLumpNum(pplump);
-  W_UnlockLumpNum(gtlump);
 }