Skip to content

Commit a70fcfd

Browse files
committed
.
1 parent adfcc93 commit a70fcfd

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

src/engine/renderer/tr_backend.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
3030
#endif
3131

3232
backEndData_t *backEndData[ SMP_FRAMES ];
33+
trRefEntity_t backEndEntities[SMP_FRAMES][MAX_REF_ENTITIES];
34+
3335
backEndState_t backEnd;
3436

3537
static Cvar::Cvar<bool> r_clear( "r_clear", "Clear screen before painting over it on every frame", Cvar::NONE, false );

src/engine/renderer/tr_local.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3611,6 +3611,7 @@ void GLimp_LogComment_( std::string comment );
36113611
};
36123612

36133613
extern backEndData_t *backEndData[ SMP_FRAMES ]; // the second one may not be allocated
3614+
extern trRefEntity_t backEndEntities[SMP_FRAMES][MAX_REF_ENTITIES];
36143615

36153616
extern volatile bool renderThreadActive;
36163617

src/engine/renderer/tr_scene.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,9 @@ void RE_AddRefEntityToScene( const refEntity_t *ent )
272272
Sys::Drop("RE_AddRefEntityToScene: bad reType %s", Util::enum_str(ent->reType));
273273
}
274274

275-
backEndData[ tr.smpFrame ]->entities[ r_numEntities ].e = *ent;
275+
backEndEntities[ tr.smpFrame ][ r_numEntities ].e = *ent;
276276

277-
TransformEntity( &backEndData[tr.smpFrame]->entities[r_numEntities] );
277+
TransformEntity( &backEndEntities[tr.smpFrame][r_numEntities] );
278278

279279
r_numEntities++;
280280
}
@@ -293,8 +293,7 @@ void RE_AddEntityToScene( const trRefEntity_t* ent ) {
293293
Sys::Drop( "RE_AddRefEntityToScene: bad reType %s", Util::enum_str( ent->e.reType ) );
294294
}
295295

296-
backEndData[tr.smpFrame]->entities[r_numEntities] = {};
297-
backEndData[tr.smpFrame]->entities[r_numEntities] = *ent;
296+
backEndEntities[tr.smpFrame][r_numEntities] = *ent;
298297

299298
r_numEntities++;
300299
}
@@ -569,7 +568,7 @@ void RE_RenderScene( const refdef_t *fd )
569568
tr.refdef.drawSurfs = backEndData[ tr.smpFrame ]->drawSurfs;
570569

571570
tr.refdef.numEntities = r_numEntities - r_firstSceneEntity;
572-
tr.refdef.entities = &backEndData[ tr.smpFrame ]->entities[ r_firstSceneEntity ];
571+
tr.refdef.entities = &backEndEntities[ tr.smpFrame ][ r_firstSceneEntity ];
573572

574573
tr.refdef.numLights = r_numLights - r_firstSceneLight;
575574
tr.refdef.lights = &backEndData[ tr.smpFrame ]->lights[ r_firstSceneLight ];

0 commit comments

Comments
 (0)