move precache into hw_cache.c

This commit is contained in:
Alug committed 2025-02-14 23:02:13 +01:00
1 parent e2f311f9e0
commit 989e1a3f56
3 files changed
+97 -90

No files matched your search

+91
View File
@@ -29,6 +29,8 @@
#include "../r_draw.h"
#include "../r_main.h"
#include "../r_patch.h" // patch rotation
#include "../p_setup.h" // levelflats
#include "../r_sky.h"
INT32 patchformat = GL_TEXFMT_AP_88; // use alpha for holes
INT32 textureformat = GL_TEXFMT_P_8; // use chromakey for hole
@@ -549,6 +551,95 @@ void HWR_FreeTextureCache(void)
gl_numtextures = 0;
}
static void P_PrecacheHWRLevelFlats(void)
{
lumpnum_t lump;
size_t i, j;
// special case for encore remapping
if (encoremode)
{
// this does not account for fofs and polyobjects
// TODO: handle atleast fofs
for (i = 0; i < numsectors; i++)
{
for (j = 0; j < 2; j++)
{
boolean ceiling = (j == 1);
INT32 pic = ceiling ? sectors[i].ceilingpic : sectors[i].floorpic;
lump = levelflats[pic].lumpnum;
HWR_GetFlat(lump, R_NoEncore(&sectors[i], ceiling));
}
}
}
else
{
// on non encore we have it simple
// just load every flat
for (i = 0; i < numlevelflats; i++)
{
lump = levelflats[i].lumpnum;
HWR_GetFlat(lump, false);
}
}
}
void HWR_PrecacheLevel(void)
{
char *texturepresent;
size_t i, j;
if (rendermode != render_opengl)
return;
// Precache flats.
P_PrecacheHWRLevelFlats();
// Precache textures.
texturepresent = calloc(numtextures, sizeof (*texturepresent));
if (texturepresent == NULL) I_Error("%s: Out of memory looking up textures", "HWR_PrecacheLevel");
for (i = 0; i < numlines; i++)
{
line_t *line = &lines[i];
boolean noencoremap = (line->flags & ML_TFERLINE);
// two sides
for (j = 0; j < 2; j++)
{
side_t *side = &sides[line->sidenum[j]];
// Single-side linedef
if (line->sidenum[j] == 0xffff)
continue;
if (side->toptexture >= 0 && side->toptexture < numtextures)
texturepresent[side->toptexture] = noencoremap ? 2 : 1;
if (side->midtexture >= 0 && side->midtexture < numtextures)
texturepresent[side->midtexture] = noencoremap ? 2 : 1;
if (side->bottomtexture >= 0 && side->bottomtexture < numtextures)
texturepresent[side->bottomtexture] = noencoremap ? 2 : 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 a skynum dependent name.
texturepresent[skytexture] = 1;
for (i = 0; i < (unsigned)numtextures; i++)
{
if (!texturepresent[i])
continue;
HWR_GetTexture(i, (texturepresent[i] == 2));
}
free(texturepresent);
//TODO: precache sprites too
}
void HWR_LoadTextures(size_t pnumtextures)
{
// we must free it since numtextures changed
+4 -1
View File
@@ -51,13 +51,16 @@ void HWR_ObjectLightLevelPost(gl_vissprite_t *spr, const sector_t *sector, INT32
extern extrasubsector_t *extrasubsectors;
extern size_t addsubsector;
void HWR_FreeExtraSubsectors(void);
// --------
// hw_cache.c
// --------
void HWR_InitTextureCache(void);
void HWR_FreeTextureCache(void);
void HWR_FreeMipmapCache(void);
void HWR_FreeExtraSubsectors(void);
void HWR_PrecacheLevel(void);
void HWR_GetFlat(lumpnum_t flatlumpnum, boolean noencoremap);
// ^ some flats must NOT be remapped to encore, since we remap them as we cache them for ease, adding a toggle here seems wise.
+2 -89
View File
@@ -1825,95 +1825,6 @@ INT32 R_TextureNumForName(const char *name)
return i;
}
static void P_PrecacheHWRLevelFlats(void)
{
lumpnum_t lump;
size_t i, j;
// special case for encore remapping
if (encoremode)
{
// this does not account for fofs and polyobjects
// TODO: handle atleast fofs
for (i = 0; i < numsectors; i++)
{
for (j = 0; j < 2; j++)
{
boolean ceiling = (j == 1);
INT32 pic = ceiling ? sectors[i].ceilingpic : sectors[i].floorpic;
lump = levelflats[pic].lumpnum;
HWR_GetFlat(lump, R_NoEncore(&sectors[i], ceiling));
}
}
}
else
{
// on non encore we have it simple
// just load every flat
for (i = 0; i < numlevelflats; i++)
{
lump = levelflats[i].lumpnum;
HWR_GetFlat(lump, false);
}
}
}
static void HWR_PrecacheLevel(void)
{
char *texturepresent;
size_t i, j;
if (rendermode != render_opengl)
return;
// Precache flats.
P_PrecacheHWRLevelFlats();
// Precache textures.
texturepresent = calloc(numtextures, sizeof (*texturepresent));
if (texturepresent == NULL) I_Error("%s: Out of memory looking up textures", "HWR_PrecacheLevel");
for (i = 0; i < numlines; i++)
{
line_t *line = &lines[i];
boolean noencoremap = (line->flags & ML_TFERLINE);
// two sides
for (j = 0; j < 2; j++)
{
side_t *side = &sides[line->sidenum[j]];
// Single-side linedef
if (line->sidenum[j] == 0xffff)
continue;
if (side->toptexture >= 0 && side->toptexture < numtextures)
texturepresent[side->toptexture] = noencoremap ? 2 : 1;
if (side->midtexture >= 0 && side->midtexture < numtextures)
texturepresent[side->midtexture] = noencoremap ? 2 : 1;
if (side->bottomtexture >= 0 && side->bottomtexture < numtextures)
texturepresent[side->bottomtexture] = noencoremap ? 2 : 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 a skynum dependent name.
texturepresent[skytexture] = 1;
for (i = 0; i < (unsigned)numtextures; i++)
{
if (!texturepresent[i])
continue;
HWR_GetTexture(i, (texturepresent[i] == 2));
}
free(texturepresent);
//TODO: precache sprites too
}
//
// R_PrecacheLevel
//
@@ -1931,11 +1842,13 @@ void R_PrecacheLevel(void)
if (demo.playback)
return;
#ifdef HWRENDER
if (rendermode == render_opengl)
{
HWR_PrecacheLevel();
return;
}
#endif
// do not flush the memory, Z_Malloc twice with same user will cause error in Z_CheckHeap()
if (rendermode != render_soft)