X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=inline;f=gl_draw.c;h=a798805d0435fc907bb92b5de5afba2fd157adc9;hb=5487a6f74245074ed93b2efcb4249c697b7409fe;hp=a6b3323690e86af748e04d4a48e07e685d38f9dc;hpb=c21ba48e547026f3e5a99dbe5c0b84f7c2c3ae45;p=xonotic%2Fdarkplaces.git diff --git a/gl_draw.c b/gl_draw.c index a6b33236..a798805d 100644 --- a/gl_draw.c +++ b/gl_draw.c @@ -358,6 +358,9 @@ void GL_Draw_Init (void) } extern cvar_t gl_mesh_drawmode; +extern int gl_maxdrawrangeelementsvertices; +extern int gl_maxdrawrangeelementsindices; + void R_DrawQueue(void) { int pos, num, chartexnum, overbright; @@ -555,7 +558,7 @@ void R_DrawQueue(void) Cvar_SetValueQuick(&gl_mesh_drawmode, 0); if (gl_mesh_drawmode.integer > 3) Cvar_SetValueQuick(&gl_mesh_drawmode, 3); - if (gl_mesh_drawmode.integer >= 3 && (qglDrawRangeElements == NULL || gl_maxdrawrangeelementsindices < 3072 || gl_maxdrawrangeelementsvertices < 3072)) + if (gl_mesh_drawmode.integer >= 3 && qglDrawRangeElements == NULL) Cvar_SetValueQuick(&gl_mesh_drawmode, 2); if (gl_mesh_drawmode.integer > 0) @@ -568,7 +571,7 @@ void R_DrawQueue(void) qglEnableClientState(GL_COLOR_ARRAY);CHECKGLERROR } - if (gl_mesh_drawmode.integer >= 3) + if (gl_mesh_drawmode.integer >= 3/* && (mesh->numvertices) <= gl_maxdrawrangeelementsvertices && (mesh->numindices) <= gl_maxdrawrangeelementsindices*/) { // GL 1.2 or GL 1.1 with extension GL_LockArray(0, mesh->numvertices);