Skip to content

Commit 60986dc

Browse files
committed
Fix bogus checks for SHADER_MAX_VERTEXES and SHADER_MAX_INDEXES
These make no sense when static VBOs are used, so only do those checks if `r_vboModels` is disabled.
1 parent 5c4a703 commit 60986dc

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/engine/renderer/tr_model_md3.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,13 +152,13 @@ bool R_LoadMD3( model_t *mod, int lod, const void *buffer, const char *modName )
152152
LL( md3Surf->ofsXyzNormals );
153153
LL( md3Surf->ofsEnd );
154154

155-
if ( md3Surf->numVerts > SHADER_MAX_VERTEXES )
155+
if ( !r_vboModels.Get() && md3Surf->numVerts > SHADER_MAX_VERTEXES )
156156
{
157157
Sys::Drop( "R_LoadMD3: %s has more than %i verts on a surface (%i)",
158158
modName, SHADER_MAX_VERTEXES, md3Surf->numVerts );
159159
}
160160

161-
if ( md3Surf->numTriangles * 3 > SHADER_MAX_INDEXES )
161+
if ( !r_vboModels.Get() && md3Surf->numTriangles * 3 > SHADER_MAX_INDEXES )
162162
{
163163
Sys::Drop( "R_LoadMD3: %s has more than %i triangles on a surface (%i)",
164164
modName, SHADER_MAX_INDEXES / 3, md3Surf->numTriangles );

src/engine/renderer/tr_model_md5.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ bool R_LoadMD5( model_t *mod, const char *buffer, const char *modName )
340340
token = COM_ParseExt2( &buf_p, false );
341341
surf->numVerts = atoi( token );
342342

343-
if ( surf->numVerts > SHADER_MAX_VERTEXES )
343+
if ( !r_vboModels.Get() && surf->numVerts > SHADER_MAX_VERTEXES )
344344
{
345345
Sys::Drop( "R_LoadMD5: '%s' has more than %i verts on a surface (%i)",
346346
modName, SHADER_MAX_VERTEXES, surf->numVerts );
@@ -417,7 +417,7 @@ bool R_LoadMD5( model_t *mod, const char *buffer, const char *modName )
417417
token = COM_ParseExt2( &buf_p, false );
418418
surf->numTriangles = atoi( token );
419419

420-
if ( surf->numTriangles > SHADER_MAX_TRIANGLES )
420+
if ( !r_vboModels.Get() && surf->numTriangles > SHADER_MAX_TRIANGLES )
421421
{
422422
Sys::Drop( "R_LoadMD5: '%s' has more than %i triangles on a surface (%i)",
423423
modName, SHADER_MAX_TRIANGLES, surf->numTriangles );

0 commit comments

Comments
 (0)