fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Don't crash if End received without a Begin...

Browse source
This commit is contained in:
Keith Whitwell 2002-12-05 11:49:46 +00:00
parent 6cb5b3475d
commit 46b99c9016
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/mesa/tnl/t_imm_api.c
View file

@ -1,4 +1,4 @@
/* $Id: t_imm_api.c,v 1.37 2002/11/25 20:27:47 brianp Exp $ */
/* $Id: t_imm_api.c,v 1.38 2002/12/05 11:49:46 keithw Exp $ */
/*
* Mesa 3-D graphics library
@ -219,8 +219,8 @@ _tnl_Begin( GLenum mode )
return;
}
assert( IM->SavedBeginState == 0 );
assert( IM->BeginState == 0 );
assert( (IM->SavedBeginState & (VERT_BEGIN_0|VERT_BEGIN_1)) == 0 );
assert( (IM->BeginState & (VERT_BEGIN_0|VERT_BEGIN_1)) == 0 );
/* Not quite right. Need to use the fallback '_aa_ArrayElement'
* when not known to be inside begin/end and arrays are
@ -346,7 +346,10 @@ _tnl_end( GLcontext *ctx )
GLuint state = IM->BeginState;
GLuint inflags = (~state) & (VERT_BEGIN_0|VERT_BEGIN_1);
assert( ctx->Driver.NeedFlush & FLUSH_STORED_VERTICES );
/* Not the case if vertices emitted without calling glBegin first:
*/
/* assert( ctx->Driver.NeedFlush & FLUSH_STORED_VERTICES ); */
state |= inflags << 2; /* errors */