KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "mesa: make _mesa_alloc_dispatch_table() static" 

This reverts commit 4009d22b61.

glthread needs it.

Acked-by: Timothy Arceri <tarceri@itsqueeze.com>
Acked-by: Marek Olšák <maraeo@gmail.com>
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
Tested-by: Mike Lothian <mike@fireburn.co.uk>
This commit is contained in:
Marek Olšák 2016-09-29 01:00:39 +02:00 committed by Timothy Arceri
parent ef30ce97a6
commit db06e91de2
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/main/api_exec.h
View File

@ -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);

10
src/mesa/main/context.c
View File

@ -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;