vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ref_gl: fix out-by-one when all lightstyles are used. Also fix broken in this case in vbo after previous fix

Browse source
This commit is contained in:
mittorn 2023-10-16 16:28:17 +03:00 • committed by Alibek Omarov
parent 96f7f5457d
commit b81f94518a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ref/gl/gl_rsurf.c
View file

@ -1182,7 +1182,7 @@ dynamic:
if( is_dynamic ) if( is_dynamic )
{ {
if(( fa->styles[maps] >= 32 || fa->styles[maps] == 0 || fa->styles[maps] == 20 ) && ( fa->dlightframe != tr.framecount )) if(( maps < MAXLIGHTMAPS ) && ( fa->styles[maps] >= 32 || fa->styles[maps] == 0 || fa->styles[maps] == 20 ) && ( fa->dlightframe != tr.framecount ))
{ {
byte temp[132*132*4]; byte temp[132*132*4];
mextrasurf_t *info = fa->info; mextrasurf_t *info = fa->info;
@ -2878,11 +2878,11 @@ static qboolean R_CheckLightMap( msurface_t *fa )
} }
// already up to date // already up to date
if( !is_dynamic && ( fa->dlightframe != tr.framecount || maps == MAXLIGHTMAPS ) ) if( !is_dynamic && ( fa->dlightframe != tr.framecount ))
return false; return false;
// build lightmap // build lightmap
if(( fa->styles[maps] >= 32 || fa->styles[maps] == 0 ) && ( fa->dlightframe != tr.framecount )) if(( maps < MAXLIGHTMAPS ) && ( fa->styles[maps] >= 32 || fa->styles[maps] == 0 ) && ( fa->dlightframe != tr.framecount ))
{ {
byte temp[132*132*4]; byte temp[132*132*4];
int smax, tmax; int smax, tmax;