diff options
| author | Marek Olšák <[email protected]> | 2016-09-29 01:00:39 +0200 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-03-16 14:14:18 +1100 |
| commit | db06e91de205eff036cd6a2d48f41573f6a9535c (patch) | |
| tree | 2fb8bb2fe078ecc58e48c912fd8e5230ddb617d4 /src/mesa | |
| parent | ef30ce97a6bc0a9a6e625df6964e1cdea0ccee4b (diff) | |
Revert "mesa: make _mesa_alloc_dispatch_table() static"
This reverts commit 4009d22b61e76850b1b725f4e491da05c2406fa4.
glthread needs it.
Acked-by: Timothy Arceri <[email protected]>
Acked-by: Marek Olšák <[email protected]>
Tested-by: Dieter Nützel <[email protected]>
Tested-by: Mike Lothian <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/api_exec.h | 4 | ||||
| -rw-r--r-- | src/mesa/main/context.c | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/mesa/main/api_exec.h b/src/mesa/main/api_exec.h index 655cb32d0a4..f55f56bda4a 100644 --- a/src/mesa/main/api_exec.h +++ b/src/mesa/main/api_exec.h @@ -30,8 +30,12 @@ extern "C" { #endif +struct _glapi_table; struct gl_context; +extern struct _glapi_table * +_mesa_alloc_dispatch_table(void); + extern void _mesa_initialize_exec_table(struct gl_context *ctx); diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 4b654de4582..0a9c65c2ab2 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -999,8 +999,8 @@ _mesa_new_nop_table(unsigned numEntries) * populated with pointers to "no-op" functions. In turn, the no-op * functions will call nop_handler() above. */ -static struct _glapi_table * -alloc_dispatch_table(void) +struct _glapi_table * +_mesa_alloc_dispatch_table(void) { /* 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 @@ -1072,7 +1072,7 @@ create_beginend_table(const struct gl_context *ctx) { struct _glapi_table *table; - table = alloc_dispatch_table(); + table = _mesa_alloc_dispatch_table(); if (!table) return NULL; @@ -1209,7 +1209,7 @@ _mesa_initialize_context(struct gl_context *ctx, goto fail; /* setup the API dispatch tables with all nop functions */ - ctx->OutsideBeginEnd = alloc_dispatch_table(); + ctx->OutsideBeginEnd = _mesa_alloc_dispatch_table(); if (!ctx->OutsideBeginEnd) goto fail; ctx->Exec = ctx->OutsideBeginEnd; @@ -1236,7 +1236,7 @@ _mesa_initialize_context(struct gl_context *ctx, switch (ctx->API) { case API_OPENGL_COMPAT: ctx->BeginEnd = create_beginend_table(ctx); - ctx->Save = alloc_dispatch_table(); + ctx->Save = _mesa_alloc_dispatch_table(); if (!ctx->BeginEnd || !ctx->Save) goto fail; |