From: Gareth Hughes <gareth@valinux.com>
Date: Sat, 24 Mar 2001 05:23:46 +0000 (+0000)
Subject: Fix ASSERT_OUTSIDE_SAVE_BEGIN_END() macro as well.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=577f318e0edd159d701a1f36893bbdee3c9e8c41;p=mesa.git

Fix ASSERT_OUTSIDE_SAVE_BEGIN_END() macro as well.
---

diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h
index 62623d9377d..1e769a10d1f 100644
--- a/src/mesa/main/dlist.h
+++ b/src/mesa/main/dlist.h
@@ -1,4 +1,4 @@
-/* $Id: dlist.h,v 1.14 2001/03/12 00:48:37 gareth Exp $ */
+/* $Id: dlist.h,v 1.15 2001/03/24 05:23:46 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -32,22 +32,28 @@
 #include "mtypes.h"
 
 
-#define ASSERT_OUTSIDE_SAVE_BEGIN_END_WITH_RETVAL(ctx, retval)	\
-do {								\
-   if (ctx->Driver.CurrentSavePrimitive < GL_POLYGON+1 ||        \
+#define ASSERT_OUTSIDE_SAVE_BEGIN_END_WITH_RETVAL(ctx, retval)		\
+do {									\
+   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;						\
-   }								\
+      return retval;							\
+   }									\
 } while (0)
 
-#define ASSERT_OUTSIDE_SAVE_BEGIN_END(ctx) \
-   ASSERT_OUTSIDE_SAVE_BEGIN_END_WITH_RETVAL(ctx,)
+#define ASSERT_OUTSIDE_SAVE_BEGIN_END(ctx)				\
+do {									\
+   if (ctx->Driver.CurrentSavePrimitive < GL_POLYGON+1 ||		\
+       ctx->Driver.CurrentSavePrimitive == PRIM_INSIDE_UNKNOWN_PRIM) {	\
+      _mesa_compile_error( ctx, GL_INVALID_OPERATION, "begin/end" );	\
+      return;								\
+   }									\
+} while (0)
 
-#define ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx)	\
-do {							\
-   ASSERT_OUTSIDE_SAVE_BEGIN_END(ctx);			\
-   FLUSH_VERTICES(ctx, 0);				\
+#define ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx)			\
+do {									\
+   ASSERT_OUTSIDE_SAVE_BEGIN_END(ctx);					\
+   FLUSH_VERTICES(ctx, 0);						\
 } while (0)
 
 #define ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, retval)\