qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-17 22:50:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove some unneeded variables.

Browse source 
Speed lightmap calculations up for r_lightmap_components 1.
Enough to give a 4.4% speedup to timedemo overkill.
Hint: int/float/int conversions are expensive.
This commit is contained in:
Ragnvald Maartmann-Moe IV 2001-11-04 11:20:35 +00:00
parent fd19f9332d
commit dbb6e37bb7
1 changed files with 15 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
libs/video/renderer/gl/gl_rsurf.c
View file

@ -126,20 +126,13 @@ R_RecursiveLightUpdate (mnode_t *node)
void void
R_AddDynamicLights (msurface_t *surf) R_AddDynamicLights (msurface_t *surf)
{ {
float dist, f; float dist;
int lnum, maxdist, maxdist2, maxdist3, red, green, blue, smax, int lnum, maxdist, maxdist2, maxdist3, red, green, blue, smax,
tmax, td, i, j, s, t; tmax, td, i, j, s, t;
int sdtable[18]; int sdtable[18];
unsigned int *bl; unsigned int *bl;
vec3_t impact, local; vec3_t impact, local;
// use 64bit integer... shame it's not very standardized...
#if _MSC_VER || __BORLANDC__
__int64 k;
#else
long long k;
#endif
smax = (surf->extents[0] >> 4) + 1; smax = (surf->extents[0] >> 4) + 1;
tmax = (surf->extents[1] >> 4) + 1; tmax = (surf->extents[1] >> 4) + 1;
@ -153,7 +146,7 @@ R_AddDynamicLights (msurface_t *surf)
impact[i] = impact[i] =
r_dlights[lnum].origin[i] - surf->plane->normal[i] * dist; r_dlights[lnum].origin[i] - surf->plane->normal[i] * dist;
i = f = DotProduct (impact, surf->texinfo->vecs[0]) + i = DotProduct (impact, surf->texinfo->vecs[0]) +
surf->texinfo->vecs[0][3] - surf->texturemins[0]; surf->texinfo->vecs[0][3] - surf->texturemins[0];
// reduce calculations // reduce calculations
@ -161,7 +154,7 @@ R_AddDynamicLights (msurface_t *surf)
for (s = 0; s < smax; s++, i -= 16) for (s = 0; s < smax; s++, i -= 16)
sdtable[s] = i * i + t; sdtable[s] = i * i + t;
i = f = DotProduct (impact, surf->texinfo->vecs[1]) + i = DotProduct (impact, surf->texinfo->vecs[1]) +
surf->texinfo->vecs[1][3] - surf->texturemins[1]; surf->texinfo->vecs[1][3] - surf->texturemins[1];
// for comparisons to minimum acceptable light // for comparisons to minimum acceptable light
@ -174,9 +167,9 @@ R_AddDynamicLights (msurface_t *surf)
maxdist3 = maxdist - t; maxdist3 = maxdist - t;
// convert to 8.8 blocklights format // convert to 8.8 blocklights format
red = f = r_dlights[lnum].color[0] * maxdist; red = r_dlights[lnum].color[0] * maxdist;
green = f = r_dlights[lnum].color[1] * maxdist; green = r_dlights[lnum].color[1] * maxdist;
blue = f = r_dlights[lnum].color[2] * maxdist; blue = r_dlights[lnum].color[2] * maxdist;
bl = blocklights; bl = blocklights;
for (t = 0; t < tmax; t++, i -= 16) { for (t = 0; t < tmax; t++, i -= 16) {
td = i * i; td = i * i;
@ -185,9 +178,9 @@ R_AddDynamicLights (msurface_t *surf)
for (s = 0; s < smax; s++) { for (s = 0; s < smax; s++) {
if (sdtable[s] < maxdist2) { if (sdtable[s] < maxdist2) {
j = dlightdivtable[(sdtable[s] + td) >> 7]; j = dlightdivtable[(sdtable[s] + td) >> 7];
bl[0] += (k = (red * j) >> 7); bl[0] += (red * j) >> 7;
bl[1] += (k = (green * j) >> 7); bl[1] += (green * j) >> 7;
bl[2] += (k = (blue * j) >> 7); bl[2] += (blue * j) >> 7;
} }
bl += 3; bl += 3;
} }
@ -208,11 +201,10 @@ R_AddDynamicLights (msurface_t *surf)
void void
R_BuildLightMap (msurface_t *surf, byte * dest, int stride) R_BuildLightMap (msurface_t *surf, byte * dest, int stride)
{ {
byte *lightmap; byte *lightmap;
float t2; int maps, shift, size, smax, tmax, t2, i, j;
int maps, shift, size, smax, tmax, i, j; unsigned int scale;
unsigned int scale; unsigned int *bl;
unsigned int *bl;
surf->cached_dlight = (surf->dlightframe == r_framecount); surf->cached_dlight = (surf->dlightframe == r_framecount);
@ -286,11 +278,8 @@ R_BuildLightMap (msurface_t *surf, byte * dest, int stride)
case 1: case 1:
for (i = 0; i < tmax; i++, dest += stride) { for (i = 0; i < tmax; i++, dest += stride) {
for (j = 0; j < smax; j++) { for (j = 0; j < smax; j++) {
t2 = bound (0, bl[0] >> shift, 255); t2 = (bl[0] + bl[1] + bl[2]) / 3;
t2 += bound (0, bl[1] >> shift, 255); *dest++ = bound (0, t2 >> shift, 255);
t2 += bound (0, bl[2] >> shift, 255);
t2 *= (1.0 / 3.0);
*dest++ = t2;
bl += 3; bl += 3;
} }
} }