Comment out __FUNCTION__ usage.

[mesa.git] / src / mesa / main / dlist.h

diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h
index d43aed787bff56e323c7e11d403d06e483525c12..2994cf73d0c53fcf968451703c66e30bb652b236 100644 (file)
--- a/src/mesa/main/dlist.h
+++ b/src/mesa/main/dlist.h
@@ -1,10 +1,10 @@
-/* $Id: dlist.h,v 1.12 2001/01/13 18:28:20 keithw Exp $ */
+/* $Id: dlist.h,v 1.16 2001/03/24 06:01:27 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
  *
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -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 ||               \
        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 ||               \
+       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)\
@@ -57,9 +63,9 @@ do {                                                                  \
 } while (0)
 
 
-extern void gl_init_lists( void );
+extern void _mesa_init_lists( void );
 
-extern void gl_destroy_list( GLcontext *ctx, GLuint list );
+extern void _mesa_destroy_list( GLcontext *ctx, GLuint list );
 
 extern void _mesa_CallList( GLuint list );
 
@@ -79,7 +85,7 @@ extern void _mesa_NewList( GLuint list, GLenum mode );
 
 extern void _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize );
 
-extern void gl_save_error( GLcontext *ctx, GLenum error, const char *s );
+extern void _mesa_save_error( GLcontext *ctx, GLenum error, const char *s );
 
 
 void *
@@ -91,7 +97,7 @@ _mesa_alloc_opcode( GLcontext *ctx, GLuint sz,
                    void (*destroy)( GLcontext *, void * ),
                    void (*print)( GLcontext *, void * ) );
 
-extern void _mesa_save_EvalMesh2(GLenum mode, GLint i1, GLint i2, 
+extern void _mesa_save_EvalMesh2(GLenum mode, GLint i1, GLint i2,
                                 GLint j1, GLint j2 );
 extern void _mesa_save_EvalMesh1( GLenum mode, GLint i1, GLint i2 );
 extern void _mesa_save_CallLists( GLsizei n, GLenum type, const GLvoid *lists );