nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-29 07:02:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Enable scenecache by default, lets see who complains.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5923 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2021-07-01 01:15:59 +00:00
parent 2ce0947948
commit c71a4f8587
3 changed files with 59 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
engine/client/r_surf.c
View file

@ -3022,7 +3022,7 @@ struct webostate_s
//TODO qbyte *bakedsubmodels; //flags saying whether each submodel was baked or not. baked submodels need to be untinted uncaled unrotated at origin etc
vec3_t lastpos;
vec3_t lastpos; //for better stale ebo selection when we're generating a new position.
batch_t *rbatches[SHADER_SORT_COUNT];
@ -3501,6 +3501,9 @@ void R_GenWorldEBO(void *ctx, void *data, size_t a, size_t b)
COM_AddWork(WG_MAIN, R_GeneratedWorldEBO, es, NULL, 0, 0);
}
cvar_t r_temporalscenecache = CVARAFD ("r_temporalscenecache", "", "r_scenecache", CVAR_ARCHIVE, "Controls whether to generate+reuse a scene cache over multiple frames. This is generated on a separate thread to avoid any associated costs. This can significantly boost framerates on complex maps, but can also stress the gpu more (performance tradeoff that varies per map). An outdated cache may be used if the cache takes too long to build (eg: lightmap animations), which could cause the odd glitch when moving fast (but retain more consistent framerates - another tradeoff).\n0: Tranditional quake rendering.\n1: Generate+Use the scene cache.");
#else
cvar_t r_temporalscenecache = CVARAFD ("r_temporalscenecache", "", "r_scenecache", CVAR_NOSET, "Controls whether to generate+reuse a scene cache over multiple frames. This is generated on a separate thread to avoid any associated costs. This can significantly boost framerates on complex maps, but can also stress the gpu more (performance tradeoff that varies per map). An outdated cache may be used if the cache takes too long to build (eg: lightmap animations), which could cause the odd glitch when moving fast (but retain more consistent framerates - another tradeoff).\n0: Tranditional quake rendering.\n1: Generate+Use the scene cache.");
#endif
/*
@ -3534,21 +3537,42 @@ void Surf_DrawWorld (void)
currententity = &r_worldentity;
{
int sc = r_temporalscenecache.ival;
RSpeedRemark();
Surf_LightmapShift(currentmodel);
#ifdef THREADEDWORLD
#warning Enable auto threaded world when ready
/*
if (!*r_temporalscenecache.string && cl.worldmodel && cl.worldmodel->loadstate == MLS_LOADED && (cl.worldmodel->fromgame == fg_quake || cl.worldmodel->fromgame == fg_halflife))
{ //when empty, pick a suitable default.
//at what point is it a win? should we consider batch counts? probability of offscreen-only surfaces?
if (cl.worldmodel->fromgame == fg_quake || cl.worldmodel->fromgame == fg_halflife)
r_temporalscenecache.ival = cl.worldmodel->numleafs > 6000 && r_waterstyle.ival<=1 && r_telestyle.ival<=1 && r_slimestyle.ival<=1 && r_lavastyle.ival<=1;
sc = cl.worldmodel->numleafs > 6000 && r_waterstyle.ival<=1 && r_telestyle.ival<=1 && r_slimestyle.ival<=1 && r_lavastyle.ival<=1 && Media_Capturing()<2;
}
*/
if ((r_temporalscenecache.ival /*|| currentmodel->numbatches*/) && !r_refdef.recurse && currentmodel->type == mod_brush)
if (sc != r_temporalscenecache.ival)
{
r_temporalscenecache.ival = sc;
r_temporalscenecache.modified = true;
}
if (r_temporalscenecache.modified || r_dynamic.modified)
{
r_dynamic.modified = false;
r_temporalscenecache.modified = false;
Sh_CheckSettings(); //fiddle with r_dynamic vs r_shadow_realtime_dlight.
}
if (!r_temporalscenecache.ival)
{
r_dynamic.ival = r_dynamic.value;
webo_blocklightmapupdates = false;
while (webostates)
{
void *webostate = webostates;
webostates = webostates->next;
R_DestroyWorldEBO(webostate);
}
}
else if (!r_refdef.recurse && currentmodel->type == mod_brush)
{
struct webostate_s *webostate, *best = NULL, *kill, **link;
vec_t bestdist = FLT_MAX;
@ -3567,6 +3591,7 @@ void Surf_DrawWorld (void)
if (webostate->cluster[0] == r_viewcluster && webostate->cluster[1] == r_viewcluster2)
{
best = webostate;
bestdist = 0;
break;
}
else
@ -3607,7 +3632,7 @@ void Surf_DrawWorld (void)
}
}
if (!gennew && webostate)// && (webostate->cluster[0] != r_viewcluster || webostate->cluster[1] != r_viewcluster2))
if (!gennew && webostate && (webostate->cluster[0] != r_viewcluster || webostate->cluster[1] != r_viewcluster2))
{
if (webostate->pvs.buffersize != currentmodel->pvsbytes || r_viewcluster2 != -1)
gennew = true; //o.O
@ -3645,7 +3670,7 @@ void Surf_DrawWorld (void)
webostate->lastvalid = cls.framecount;
for (link = &webostates; (kill=*link); )
{
if (kill->lastvalid < cls.framecount-5 && kill->wmodel == currentmodel)
if (kill->lastvalid < cls.framecount-5 && kill->wmodel == currentmodel && kill != webostate)
{ //this one looks old... kill it.
if (webogenerating)
R_DestroyWorldEBO(webogenerating); //can't use more than one!
@ -3663,6 +3688,7 @@ void Surf_DrawWorld (void)
webogenerating->ebomem = NULL;
webogenerating->numbatches = 0;
}
VectorCopy(r_refdef.vieworg, webogenerating->lastpos);
webogenerating->wmodel = currentmodel;
webogenerating->framecount = -r_framecount;
webogenerating->cluster[0] = r_viewcluster;
@ -3678,12 +3704,22 @@ void Surf_DrawWorld (void)
}
#endif
//if they teleported, don't show something ugly - like obvious wallhacks.
if (webogenerating && bestdist > 16 && cl.splitclients<=1)
{
Con_DPrintf("Blocking for scenecache generation\n");
webostate = webogenerating;
COM_WorkerPartialSync(webogenerating, &webogeneratingstate, true);
}
if (webostate)
{
entvis = surfvis = webostate->pvs.buffer;
webostate->lastvalid = cls.framecount;
VectorCopy(r_refdef.vieworg, webostate->lastpos);
r_dynamic.ival = -1; //don't waste time on dlighting models.
RSpeedEnd(RSPEED_WORLDNODE);

2
engine/client/renderer.c
View file

@ -174,7 +174,7 @@ cvar_t r_drawviewmodel = CVARF ("r_drawviewmodel", "1", CVAR_ARCHIVE);
cvar_t r_drawviewmodelinvis = CVAR ("r_drawviewmodelinvis", "0");
cvar_t r_dynamic = CVARFD ("r_dynamic", IFMINIMAL("0","1"),
CVAR_ARCHIVE, "0: no standard dlights at all.\n1: coloured dlights will be used, they may show through walls. These are not realtime things.\n2: The dlights will be forced to monochrome (this does not affect coronas/flashblends/rtlights attached to the same light).");
cvar_t r_temporalscenecache = CVARAFD ("r_temporalscenecache", "", "r_scenecache", CVAR_ARCHIVE, "Controls whether to generate+reuse a scene cache over multiple frames. This is generated on a separate thread to avoid any associated costs. This can significantly boost framerates on complex maps, but can also stress the gpu more (performance tradeoff that varies per map). An outdated cache may be used if the cache takes too long to build (eg: lightmap animations), which could cause the odd glitch when moving fast (but retain more consistent framerates - another tradeoff).\n0: Tranditional quake rendering.\n1: Generate+Use the scene cache.");
extern cvar_t r_temporalscenecache;
cvar_t r_fastturb = CVARF ("r_fastturb", "0",
CVAR_SHADERSYSTEM);
cvar_t r_skycloudalpha = CVARFD ("r_skycloudalpha", "1", CVAR_RENDERERLATCH, "Controls how opaque the front layer of legacy scrolling skies should be.");

20
engine/gl/gl_shadow.c
View file

@ -3765,8 +3765,8 @@ void Sh_PreGenerateLights(void)
}
}
ignoreflags = (r_shadow_realtime_world.value?LFLAG_REALTIMEMODE:0)
| (r_shadow_realtime_dlight.value?LFLAG_NORMALMODE:0);
ignoreflags = (r_shadow_realtime_world.ival?LFLAG_REALTIMEMODE:0)
| (r_shadow_realtime_dlight.ival?LFLAG_NORMALMODE:0);
for (dl = cl_dlights+rtlights_first, i=rtlights_first; i<rtlights_max; i++, dl++)
{
@ -3913,6 +3913,14 @@ void Sh_CheckSettings(void)
//both shadow methods available.
}
r_dynamic.ival = r_dynamic.value;
if (canshadowless && r_dynamic.value && !r_shadow_realtime_dlight.ival && (r_temporalscenecache.ival || (cl.worldmodel && cl.worldmodel->fromgame == fg_quake3)))
{
r_shadow_realtime_dlight.ival = 1;
r_shadow_realtime_dlight_shadows.ival = 0;
r_dynamic.ival = 0;
}
cansmap = cansmap && (r_shadows.ival==2);
if (r_fakeshadows != cansmap)
{
@ -3933,8 +3941,8 @@ void Sh_CalcPointLight(vec3_t point, vec3_t light)
unsigned int ignoreflags;
vec3_t norm, impact;
ignoreflags = (r_shadow_realtime_world.value?LFLAG_REALTIMEMODE:0)
| (r_shadow_realtime_dlight.value?LFLAG_NORMALMODE:0);
ignoreflags = (r_shadow_realtime_world.ival?LFLAG_REALTIMEMODE:0)
| (r_shadow_realtime_dlight.ival?LFLAG_NORMALMODE:0);
VectorClear(light);
if (ignoreflags)
@ -4013,8 +4021,8 @@ void Sh_DrawLights(qbyte *vis)
return;
}
ignoreflags = (r_shadow_realtime_world.value?LFLAG_REALTIMEMODE:0)
| (r_shadow_realtime_dlight.value?LFLAG_NORMALMODE:0);
ignoreflags = (r_shadow_realtime_world.ival?LFLAG_REALTIMEMODE:0)
| (r_shadow_realtime_dlight.ival?LFLAG_NORMALMODE:0);
// if (r_refdef.recurse)
for (dl = cl_dlights+rtlights_first, i=rtlights_first; i<rtlights_max; i++, dl++)