/*
* Mesa 3-D graphics library
- * Version: 4.1
+ * Version: 6.5.1
*
- * Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2006 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"),
#include "mtypes.h"
-/**
- * Macro to assert that the API call was made outside the
- * glBegin()/glEnd() pair, with return value.
- *
- * \param ctx GL context.
- * \param retval value to return value in case the assertion fails.
- */
-#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; \
- } \
-} while (0)
-
-/**
- * Macro to assert that the API call was made outside the
- * glBegin()/glEnd() pair.
- *
- * \param ctx GL context.
- */
-#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)
-
-/**
- * Macro to assert that the API call was made outside the
- * glBegin()/glEnd() pair and flush the vertices.
- *
- * \param ctx GL context.
- */
-#define ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx) \
-do { \
- ASSERT_OUTSIDE_SAVE_BEGIN_END(ctx); \
- FLUSH_VERTICES(ctx, 0); \
-} while (0)
-
-/**
- * Macro to assert that the API call was made outside the
- * glBegin()/glEnd() pair and flush the vertices, with return value.
- *
- * \param ctx GL context.
- * \param retval value to return value in case the assertion fails.
- */
-#define ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, retval)\
-do { \
- ASSERT_OUTSIDE_SAVE_BEGIN_END_WITH_RETVAL(ctx, retval); \
- FLUSH_VERTICES(ctx, 0); \
-} while (0)
+#if _HAVE_FULL_GL
+extern void
+_mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist);
-#if _HAVE_FULL_GL
+extern void GLAPIENTRY _mesa_CallList( GLuint list );
-extern void _mesa_init_lists( void );
+extern void GLAPIENTRY _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
-extern void _mesa_destroy_list( GLcontext *ctx, GLuint list );
+extern void GLAPIENTRY _mesa_DeleteLists( GLuint list, GLsizei range );
-extern void _mesa_CallList( GLuint list );
+extern void GLAPIENTRY _mesa_EndList( void );
-extern void _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
+extern GLuint GLAPIENTRY _mesa_GenLists( GLsizei range );
-extern void _mesa_DeleteLists( GLuint list, GLsizei range );
+extern GLboolean GLAPIENTRY _mesa_IsList( GLuint list );
-extern void _mesa_EndList( void );
+extern void GLAPIENTRY _mesa_ListBase( GLuint base );
-extern GLuint _mesa_GenLists( GLsizei range );
+extern void GLAPIENTRY _mesa_NewList( GLuint list, GLenum mode );
-extern GLboolean _mesa_IsList( GLuint list );
+extern void GLAPIENTRY _mesa_save_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
-extern void _mesa_ListBase( GLuint base );
+extern void GLAPIENTRY _mesa_save_CallList( GLuint list );
-extern void _mesa_NewList( GLuint list, GLenum mode );
-extern void _mesa_init_dlist_table( struct _glapi_table *table,
- GLuint tableSize );
-extern void _mesa_save_error( GLcontext *ctx, GLenum error, const char *s );
+extern void _mesa_init_dlist_table( struct _glapi_table *table );
extern void _mesa_compile_error( GLcontext *ctx, GLenum error, const char *s );
-extern void *_mesa_alloc_instruction( GLcontext *ctx, int opcode, GLint sz );
+extern void *_mesa_alloc_instruction(GLcontext *ctx, GLuint opcode, GLuint sz);
-extern int _mesa_alloc_opcode( GLcontext *ctx, GLuint sz,
- void (*execute)( GLcontext *, void * ),
- void (*destroy)( GLcontext *, void * ),
- void (*print)( GLcontext *, void * ) );
+extern GLint _mesa_alloc_opcode( GLcontext *ctx, GLuint sz,
+ void (*execute)( GLcontext *, void * ),
+ void (*destroy)( GLcontext *, void * ),
+ void (*print)( GLcontext *, void * ) );
-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 );
-extern void _mesa_save_CallList( GLuint list );
extern void _mesa_init_display_list( GLcontext * ctx );
-#else
+extern void _mesa_save_vtxfmt_init( GLvertexformat *vfmt );
-/** No-op */
-#define _mesa_init_lists() ((void)0)
-/** No-op */
-#define _mesa_destroy_list(c,l) ((void)0)
+#else
/** No-op */
#define _mesa_init_dlist_table(t,ts) ((void)0)
/** No-op */
#define _mesa_init_display_list(c) ((void)0)
+/** No-op */
+#define _mesa_save_vtxfmt_init(v) ((void)0)
+
#endif
#endif