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

fix xscreensaver cores

Browse source
This commit is contained in:
Keith Whitwell 2000-12-26 07:41:32 +00:00
parent cab974cf6c
commit 9ef50d5826
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/mesa/main/dlist.h
View file

@ -1,4 +1,4 @@
/* $Id: dlist.h,v 1.10 2000/12/26 05:09:28 keithw Exp $ */ /* $Id: dlist.h,v 1.11 2000/12/26 07:41:32 keithw Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@ -34,8 +34,9 @@
#define ASSERT_OUTSIDE_SAVE_BEGIN_END_WITH_RETVAL(ctx, retval) \ #define ASSERT_OUTSIDE_SAVE_BEGIN_END_WITH_RETVAL(ctx, retval) \
do { \ do { \
if (ctx->Driver.CurrentExecPrimitive != GL_POLYGON+1) { \ if (ctx->Driver.CurrentSavePrimitive < GL_POLYGON+1 || \
gl_error( ctx, GL_INVALID_OPERATION, "begin/end" ); \ ctx->Driver.CurrentSavePrimitive == PRIM_INSIDE_UNKNOWN_PRIM) { \
_mesa_compile_error( ctx, GL_INVALID_OPERATION, "begin/end" ); \
return retval; \ return retval; \
} \ } \
} while (0) } while (0)

5
src/mesa/tnl/t_imm_dlist.c
View file

@ -1,4 +1,4 @@
/* $Id: t_imm_dlist.c,v 1.1 2000/12/26 05:09:32 keithw Exp $ */ /* $Id: t_imm_dlist.c,v 1.2 2000/12/26 07:41:32 keithw Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@ -187,7 +187,7 @@ execute_compiled_cassette( GLcontext *ctx, void *data )
TNLvertexcassette *node = (TNLvertexcassette *)data; TNLvertexcassette *node = (TNLvertexcassette *)data;
struct immediate *IM = node->IM; struct immediate *IM = node->IM;
FLUSH_VERTICES( ctx, 0 ); /* FLUSH_VERTICES( ctx, 0 ); */
if (ctx->NewState) if (ctx->NewState)
gl_update_state(ctx); gl_update_state(ctx);
@ -369,6 +369,7 @@ _tnl_NewList( GLcontext *ctx, GLuint list, GLenum mode )
/* Set current Begin/End state to unknown: /* Set current Begin/End state to unknown:
*/ */
IM->BeginState = VERT_BEGIN_0; IM->BeginState = VERT_BEGIN_0;
ctx->Driver.CurrentSavePrimitive = PRIM_UNKNOWN;
} }