diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-04 16:27:02 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-04 16:27:02 +0200 |
| commit | b828531d8b6da75a258d12f97df0f4e49f75ab98 (patch) | |
| tree | fcb5da3afc321bb34cdfd8cd84dfd986a1f59083 /mesalib/src/mesa/main/dlist.c | |
| parent | 9e382b6be0e81397f18ec0b733a2e88dc3465a33 (diff) | |
| download | vcxsrv-b828531d8b6da75a258d12f97df0f4e49f75ab98.tar.gz vcxsrv-b828531d8b6da75a258d12f97df0f4e49f75ab98.tar.bz2 vcxsrv-b828531d8b6da75a258d12f97df0f4e49f75ab98.zip | |
fontconfig xkeyboard-config git update 4 Sep 2013
xkeyboard-config commit 8f49c92c54c53eab6d40d8be90ce06773d20d196
fontconfig commit 6720892e97f11fbe8d69ae5b3875d928c68ff90e
mesa commit 51a279254fecc05691524dab1bf291c7dfefccd5
Diffstat (limited to 'mesalib/src/mesa/main/dlist.c')
| -rw-r--r-- | mesalib/src/mesa/main/dlist.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c index af2b468c5..595641915 100644 --- a/mesalib/src/mesa/main/dlist.c +++ b/mesalib/src/mesa/main/dlist.c @@ -561,8 +561,8 @@ make_list(GLuint name, GLuint count) /** * Lookup function to just encapsulate casting. */ -static inline struct gl_display_list * -lookup_list(struct gl_context *ctx, GLuint list) +struct gl_display_list * +_mesa_lookup_list(struct gl_context *ctx, GLuint list) { return (struct gl_display_list *) _mesa_HashLookup(ctx->Shared->DisplayList, list); @@ -769,6 +769,7 @@ _mesa_delete_list(struct gl_context *ctx, struct gl_display_list *dlist) } } + free(dlist->Label); free(dlist); } @@ -785,7 +786,7 @@ destroy_list(struct gl_context *ctx, GLuint list) if (list == 0) return; - dlist = lookup_list(ctx, list); + dlist = _mesa_lookup_list(ctx, list); if (!dlist) return; @@ -7278,7 +7279,7 @@ _mesa_compile_error(struct gl_context *ctx, GLenum error, const char *s) static GLboolean islist(struct gl_context *ctx, GLuint list) { - if (list > 0 && lookup_list(ctx, list)) { + if (list > 0 && _mesa_lookup_list(ctx, list)) { return GL_TRUE; } else { @@ -7314,7 +7315,7 @@ execute_list(struct gl_context *ctx, GLuint list) return; } - dlist = lookup_list(ctx, list); + dlist = _mesa_lookup_list(ctx, list); if (!dlist) return; @@ -9309,7 +9310,7 @@ print_list(struct gl_context *ctx, GLuint list) return; } - dlist = lookup_list(ctx, list); + dlist = _mesa_lookup_list(ctx, list); if (!dlist) return; |