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

No need for function pointers on R_AddDynamicLights_*, they are never called from outside the R_BuildLightMaps_* function that matches them.

Browse source 
Nice spotting, taniwha!
This commit is contained in:
Ragnvald Maartmann-Moe IV 2002-07-24 15:30:28 +00:00
parent 267ba0aa85
commit d3fc8c5fb6
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libs/video/renderer/gl/gl_lightmap.c
View file

@ -74,7 +74,6 @@ glpoly_t *lightmap_modified[MAX_GLTEXTURES];
glpoly_t *lightmap_polys[MAX_LIGHTMAPS]; glpoly_t *lightmap_polys[MAX_LIGHTMAPS];
glRect_t lightmap_rectchange[MAX_LIGHTMAPS]; glRect_t lightmap_rectchange[MAX_LIGHTMAPS];
void (*R_AddDynamicLights) (msurface_t *surf);
void (*R_BuildLightMap) (msurface_t *surf); void (*R_BuildLightMap) (msurface_t *surf);
@ -276,7 +275,7 @@ R_BuildLightMap_1 (msurface_t *surf)
} }
// add all the dynamic lights // add all the dynamic lights
if (surf->dlightframe == r_framecount) if (surf->dlightframe == r_framecount)
R_AddDynamicLights (surf); R_AddDynamicLights_1 (surf);
store: store:
// bound and shift // bound and shift
@ -333,7 +332,7 @@ R_BuildLightMap_3 (msurface_t *surf)
} }
// add all the dynamic lights // add all the dynamic lights
if (surf->dlightframe == r_framecount) if (surf->dlightframe == r_framecount)
R_AddDynamicLights (surf); R_AddDynamicLights_3 (surf);
store: store:
// bound and shift // bound and shift
@ -394,7 +393,7 @@ R_BuildLightMap_4 (msurface_t *surf)
} }
// add all the dynamic lights // add all the dynamic lights
if (surf->dlightframe == r_framecount) if (surf->dlightframe == r_framecount)
R_AddDynamicLights (surf); R_AddDynamicLights_3 (surf);
store: store:
// bound and shift // bound and shift
@ -567,14 +566,12 @@ GL_BuildLightmaps (model_t **models, int num_models)
gl_internalformat = 1; gl_internalformat = 1;
gl_lightmap_format = GL_LUMINANCE; gl_lightmap_format = GL_LUMINANCE;
lightmap_bytes = 1; lightmap_bytes = 1;
R_AddDynamicLights = R_AddDynamicLights_1;
R_BuildLightMap = R_BuildLightMap_1; R_BuildLightMap = R_BuildLightMap_1;
break; break;
case 3: case 3:
gl_internalformat = 3; gl_internalformat = 3;
gl_lightmap_format = GL_RGB; gl_lightmap_format = GL_RGB;
lightmap_bytes = 3; lightmap_bytes = 3;
R_AddDynamicLights = R_AddDynamicLights_3;
R_BuildLightMap = R_BuildLightMap_3; R_BuildLightMap = R_BuildLightMap_3;
break; break;
case 4: case 4:
@ -582,7 +579,6 @@ GL_BuildLightmaps (model_t **models, int num_models)
gl_internalformat = 3; gl_internalformat = 3;
gl_lightmap_format = GL_RGBA; gl_lightmap_format = GL_RGBA;
lightmap_bytes = 4; lightmap_bytes = 4;
R_AddDynamicLights = R_AddDynamicLights_3;
R_BuildLightMap = R_BuildLightMap_4; R_BuildLightMap = R_BuildLightMap_4;
break; break;
} }