fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 21:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: simplify save_Begin() error checking

Browse source 
The old code was hard to understand and not entirely correct.
Note that PRIM_INSIDE_UNKNOWN_PRIM is no longer set anywhere so
we'll be able to remove that next.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
This commit is contained in:
Brian Paul 2013-05-01 19:15:32 -06:00
parent bb459f6295
commit d5bdce1142
1 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/mesa/main/dlist.c
View file

@ -5646,28 +5646,21 @@ static void GLAPIENTRY
save_Begin(GLenum mode)
{
GET_CURRENT_CONTEXT(ctx);
Node *n;
GLboolean error = GL_FALSE;
if (ctx->ExecuteFlag && !_mesa_valid_prim_mode(ctx, mode, "glBegin")) {
error = GL_TRUE;
if (!_mesa_is_valid_prim_mode(ctx, mode)) {
/* compile this error into the display list */
_mesa_compile_error(ctx, GL_INVALID_ENUM, "glBegin(mode)");
}
else if (ctx->Driver.CurrentSavePrimitive == PRIM_UNKNOWN) {
/* Typically the first begin. This may raise an error on
* playback, depending on whether CallList is issued from inside
* a begin/end or not.
*/
ctx->Driver.CurrentSavePrimitive = PRIM_INSIDE_UNKNOWN_PRIM;
}
else if (!_mesa_inside_dlist_begin_end(ctx)) {
ctx->Driver.CurrentSavePrimitive = mode;
else if (_mesa_inside_dlist_begin_end(ctx) &&
ctx->Driver.CurrentSavePrimitive != PRIM_UNKNOWN) {
/* compile this error into the display list */
_mesa_compile_error(ctx, GL_INVALID_OPERATION, "recursive glBegin");
}
else {
_mesa_compile_error(ctx, GL_INVALID_OPERATION, "recursive begin");
error = GL_TRUE;
}
Node *n;
ctx->Driver.CurrentSavePrimitive = mode;
if (!error) {
/* Give the driver an opportunity to hook in an optimized
* display list compiler.
*/
@ -5679,10 +5672,10 @@ save_Begin(GLenum mode)
if (n) {
n[1].e = mode;
}
}
if (ctx->ExecuteFlag) {
CALL_Begin(ctx->Exec, (mode));
if (ctx->ExecuteFlag) {
CALL_Begin(ctx->Exec, (mode));
}
}
}