diff options
| author | Brian Paul <[email protected]> | 2009-10-07 16:03:04 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-10-07 16:03:09 -0600 |
| commit | 6e1697bee72a95f7d605e42ce60e2cb4a545106f (patch) | |
| tree | 202d194f287878d6c021bbcc537caa27c511b1d3 /src/mesa/main | |
| parent | 0083d2e40a8b0aa9ea36f98d4b6b7981d5dca0e3 (diff) | |
mesa: rename display list functions
_mesa_alloc_instruction() sounded like it was related to vertex/fragment
program instructions, but it wasn't.
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/dlist.c | 14 | ||||
| -rw-r--r-- | src/mesa/main/dlist.h | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 95c1b9015bd..b886bd039f5 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -796,7 +796,7 @@ unpack_image(GLcontext *ctx, GLuint dimensions, * opcode). */ void * -_mesa_alloc_instruction(GLcontext *ctx, GLuint opcode, GLuint bytes) +_mesa_dlist_alloc(GLcontext *ctx, GLuint opcode, GLuint bytes) { const GLuint numNodes = 1 + (bytes + sizeof(Node) - 1) / sizeof(Node); Node *n; @@ -847,11 +847,11 @@ _mesa_alloc_instruction(GLcontext *ctx, GLuint opcode, GLuint bytes) * \return the new opcode number or -1 if error */ GLint -_mesa_alloc_opcode(GLcontext *ctx, - GLuint size, - void (*execute) (GLcontext *, void *), - void (*destroy) (GLcontext *, void *), - void (*print) (GLcontext *, void *)) +_mesa_dlist_alloc_opcode(GLcontext *ctx, + GLuint size, + void (*execute) (GLcontext *, void *), + void (*destroy) (GLcontext *, void *), + void (*print) (GLcontext *, void *)) { if (ctx->ListExt.NumOpcodes < MAX_DLIST_EXT_OPCODES) { const GLuint i = ctx->ListExt.NumOpcodes++; @@ -875,7 +875,7 @@ _mesa_alloc_opcode(GLcontext *ctx, * usable data area. */ #define ALLOC_INSTRUCTION(CTX, OPCODE, NPARAMS) \ - ((Node *)_mesa_alloc_instruction(CTX, OPCODE, (NPARAMS)*sizeof(Node)) - 1) + ((Node *)_mesa_dlist_alloc(CTX, OPCODE, (NPARAMS)*sizeof(Node)) - 1) diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h index af36991d5ec..589cbc5992b 100644 --- a/src/mesa/main/dlist.h +++ b/src/mesa/main/dlist.h @@ -61,12 +61,12 @@ extern void GLAPIENTRY _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *li extern void _mesa_compile_error( GLcontext *ctx, GLenum error, const char *s ); -extern void *_mesa_alloc_instruction(GLcontext *ctx, GLuint opcode, GLuint sz); +extern void *_mesa_dlist_alloc(GLcontext *ctx, GLuint opcode, GLuint sz); -extern GLint _mesa_alloc_opcode( GLcontext *ctx, GLuint sz, - void (*execute)( GLcontext *, void * ), - void (*destroy)( GLcontext *, void * ), - void (*print)( GLcontext *, void * ) ); +extern GLint _mesa_dlist_alloc_opcode( GLcontext *ctx, GLuint sz, + void (*execute)( GLcontext *, void * ), + void (*destroy)( GLcontext *, void * ), + void (*print)( GLcontext *, void * ) ); extern void _mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist); |