nzp-team/dquakeplus
0
0
Fork 0
mirror of https://github.com/nzp-team/dquakeplus.git synced 2024-11-29 23:22:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

ericw's AllocBlock optimization

Browse source
This commit is contained in:
moto 2022-05-19 12:19:25 -04:00
parent e54c7d1ea4
commit 431f5bd09f
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
source/psp/video_hardware_surface.cpp
View file

@ -40,6 +40,7 @@ extern int LIGHTMAP_BYTES;
using namespace quake; using namespace quake;
int skytexturenum; int skytexturenum;
int last_lightmap_allocated; // ericw -- optimization: remember the index of the last lightmap AllocBlock stored a surf in
#define BLOCK_WIDTH 128 #define BLOCK_WIDTH 128
#define BLOCK_HEIGHT 128 #define BLOCK_HEIGHT 128
@ -1627,14 +1628,23 @@ void R_MarkLeaves (void)
============================================================================= =============================================================================
*/ */
// returns a texture number and the position inside it /*
static int AllocBlock (int w, int h, int *x, int *y) ========================
AllocBlock -- returns a texture number and the position inside it
========================
*/
int AllocBlock (int w, int h, int *x, int *y)
{ {
int i, j; int i, j;
int best, best2; int best, best2;
int texnum; int texnum;
for (texnum=0 ; texnum<MAX_LIGHTMAPS ; texnum++) // ericw -- rather than searching starting at lightmap 0 every time,
// start at the last lightmap we allocated a surface in.
// This makes AllocBlock much faster on large levels (can shave off 3+ seconds
// of load time on a level with 180 lightmaps), at a cost of not quite packing
// lightmaps as tightly vs. not doing this (uses ~5% more lightmaps)
for (texnum=last_lightmap_allocated ; texnum<MAX_LIGHTMAPS ; texnum++, last_lightmap_allocated++)
{ {
best = BLOCK_HEIGHT; best = BLOCK_HEIGHT;
@ -1657,17 +1667,16 @@ static int AllocBlock (int w, int h, int *x, int *y)
} }
if (best + h > BLOCK_HEIGHT) if (best + h > BLOCK_HEIGHT)
{
//Con_Printf("best + h > BLOCK_HEIGHT\n");
continue; continue;
}
for (i=0 ; i<w ; i++) for (i=0 ; i<w ; i++)
allocated[texnum][*x + i] = best + h; allocated[texnum][*x + i] = best + h;
return texnum; return texnum;
} }
Host_Error("AllocBlock: full\n"); Sys_Error ("AllocBlock: full");
return 0; return 0; //johnfitz -- shut up compiler
} }
mvertex_t *r_pcurrentvertbase; mvertex_t *r_pcurrentvertbase;
@ -1862,6 +1871,8 @@ void GL_BuildLightmaps (void)
r_framecount = 1; // no dlightcache r_framecount = 1; // no dlightcache
last_lightmap_allocated = 0;
if (!lightmap_textures) if (!lightmap_textures)
{ {
lightmap_textures = 0; lightmap_textures = 0;