From 9ef50d5826c92aa7c9dd19702f18b0dfec59f03c Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Tue, 26 Dec 2000 07:41:32 +0000
Subject: fix xscreensaver cores

---
 src/mesa/main/dlist.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main/dlist.h')

diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h
index a8cd34d612..e2dea89269 100644
--- a/src/mesa/main/dlist.h
+++ b/src/mesa/main/dlist.h
@@ -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
@@ -34,8 +34,9 @@
 
 #define ASSERT_OUTSIDE_SAVE_BEGIN_END_WITH_RETVAL(ctx, retval)	\
 do {								\
-   if (ctx->Driver.CurrentExecPrimitive != GL_POLYGON+1) {	\
-      gl_error( ctx, GL_INVALID_OPERATION, "begin/end" );	\
+   if (ctx->Driver.CurrentSavePrimitive < GL_POLYGON+1 ||        \
+       ctx->Driver.CurrentSavePrimitive == PRIM_INSIDE_UNKNOWN_PRIM) {	\
+      _mesa_compile_error( ctx, GL_INVALID_OPERATION, "begin/end" );	\
       return retval;						\
    }								\
 } while (0)
-- 
cgit v1.2.3