Skip to content

Commit

Permalink
Rectify Load game issue of hitting tons of asserts when loading on no…
Browse files Browse the repository at this point in the history
…n-GL4 hardware
  • Loading branch information
lhog committed May 9, 2022
1 parent 7cb55ba commit 09ec5ad
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions rts/Rendering/Models/ModelPreloader.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
class ModelPreloader {
public:
static void Load() {
if (!globalRendering->haveGL4 || !enabled)
return;

// map features are loaded earlier in featureHandler.LoadFeaturesFromMap(); - not a big deal
// Functions below cannot be multithreaded because modelLoader.LoadModel() deal with OpenGL functions
LoadUnitDefs();
LoadFeatureDefs();
LoadWeaponDefs();

if (!globalRendering->haveGL4 || !enabled)
return;

// after that point we should've loaded all models, it's time to dispatch VBO/EBO/VAO creation
S3DModelVAO::Init(); //TODO figure out where to put S3DModelVAO::Kill();
}
Expand Down

0 comments on commit 09ec5ad

Please sign in to comment.