diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-07 10:08:29 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-07 10:08:29 +0100 |
| commit | 74380c2fc1384a529df4f4995bddcf587fbac389 (patch) | |
| tree | 0089fa6c54409e2a9515e0f530bf33e5f9561e29 /mesalib/src/mesa/main/dlist.h | |
| parent | 2c345c9da4dedfafe791557ca3fcf891ce26249d (diff) | |
| parent | 1738a6973deb03f33a71c9527594727cb8bb64b4 (diff) | |
| download | vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.tar.gz vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.tar.bz2 vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa xkbcomp git update 7 nov 2012
Conflicts:
mesalib/src/mapi/glapi/gen/glX_API.xml
mesalib/src/mesa/main/.gitignore
xkbcomp/listing.c
xorg-server/hw/xwin/winshaddd.c
xorg-server/hw/xwin/winshadddnl.c
Diffstat (limited to 'mesalib/src/mesa/main/dlist.h')
| -rw-r--r-- | mesalib/src/mesa/main/dlist.h | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/mesalib/src/mesa/main/dlist.h b/mesalib/src/mesa/main/dlist.h index 137245161..9d4fc6899 100644 --- a/mesalib/src/mesa/main/dlist.h +++ b/mesalib/src/mesa/main/dlist.h @@ -43,9 +43,22 @@ (vfmt)->CallLists = impl ## CallLists; \ } while (0) -extern void GLAPIENTRY _mesa_CallList( GLuint list ); - -extern void GLAPIENTRY _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists ); +GLboolean GLAPIENTRY +_mesa_IsList(GLuint list); +void GLAPIENTRY +_mesa_DeleteLists(GLuint list, GLsizei range); +GLuint GLAPIENTRY +_mesa_GenLists(GLsizei range); +void GLAPIENTRY +_mesa_NewList(GLuint name, GLenum mode); +void GLAPIENTRY +_mesa_EndList(void); +void GLAPIENTRY +_mesa_CallList( GLuint list ); +void GLAPIENTRY +_mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists ); +void GLAPIENTRY +_mesa_ListBase(GLuint base); extern void _mesa_compile_error( struct gl_context *ctx, GLenum error, const char *s ); @@ -66,8 +79,6 @@ extern struct _glapi_table *_mesa_create_save_table(const struct gl_context *); extern void _mesa_install_dlist_vtxfmt(struct _glapi_table *disp, const GLvertexformat *vfmt); -extern void _mesa_init_dlist_dispatch(struct _glapi_table *disp); - extern void _mesa_init_display_list( struct gl_context * ctx ); extern void _mesa_free_display_list_data(struct gl_context *ctx); |