diff options
author | Eric Anholt <[email protected]> | 2013-01-17 16:53:31 -0800 |
---|---|---|
committer | Eric Anholt <[email protected]> | 2013-01-21 21:26:47 -0800 |
commit | ced98f17efc73c313700bbf936f7258131037ef3 (patch) | |
tree | e4e74808be08e55ee5e291c086e040f5d9532d21 /src/mesa/main/context.c | |
parent | cb49016622312082a636640488be50bef6b379ed (diff) |
mesa: Remove the size argument from _mesa_alloc_dispatch_table().
All callers are in Mesa core and all use _gloffset_COUNT, so just rely on
the already baked-in use of _gloffset_COUNT in the function.
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/main/context.c')
-rw-r--r-- | src/mesa/main/context.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index e30b63a443e..1f06b53f571 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -836,7 +836,7 @@ _mesa_generic_nop(void) * Allocate and initialize a new dispatch table. */ struct _glapi_table * -_mesa_alloc_dispatch_table(int size) +_mesa_alloc_dispatch_table() { /* Find the larger of Mesa's dispatch table and libGL's dispatch table. * In practice, this'll be the same for stand-alone Mesa. But for DRI @@ -846,9 +846,6 @@ _mesa_alloc_dispatch_table(int size) GLint numEntries = MAX2(_glapi_get_dispatch_table_size(), _gloffset_COUNT); struct _glapi_table *table; - /* should never happen, but just in case */ - numEntries = MAX2(numEntries, size); - table = malloc(numEntries * sizeof(_glapi_proc)); if (table) { _glapi_proc *entry = (_glapi_proc *) table; @@ -892,7 +889,7 @@ create_beginend_table(const struct gl_context *ctx) { struct _glapi_table *table; - table = _mesa_alloc_dispatch_table(_gloffset_COUNT); + table = _mesa_alloc_dispatch_table(); if (!table) return NULL; @@ -1013,7 +1010,7 @@ _mesa_initialize_context(struct gl_context *ctx, goto fail; /* setup the API dispatch tables with all nop functions */ - ctx->OutsideBeginEnd = _mesa_alloc_dispatch_table(_gloffset_COUNT); + ctx->OutsideBeginEnd = _mesa_alloc_dispatch_table(); if (!ctx->OutsideBeginEnd) goto fail; ctx->Exec = ctx->OutsideBeginEnd; |