fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 04:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

st/mesa: inline _mesa_create_context() into its only caller

Browse source 
Inline the function into it's only caller. This way it's more obvious
how the classic and gallium drivers (st/mesa) use _mesa_initialize_context.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Emil Velikov 2016-06-07 17:33:48 +01:00 • committed by Emil Velikov
parent a4fa8bf819
commit db8790c0da
3 changed files with 6 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/mesa/main/context.c
View file

@ -1266,44 +1266,6 @@ fail:
}
/**
* Allocate and initialize a struct gl_context structure.
* Note that the driver needs to pass in its dd_function_table here since
* we need to at least call driverFunctions->NewTextureObject to initialize
* the rendering context.
*
* \param api the GL API type to create the context for
* \param visual a struct gl_config pointer (we copy the struct contents) or
* NULL to create a configless context
* \param share_list another context to share display lists with or NULL
* \param driverFunctions points to the dd_function_table into which the
* driver has plugged in all its special functions.
*
* \return pointer to a new __struct gl_contextRec or NULL if error.
*/
struct gl_context *
_mesa_create_context(gl_api api,
const struct gl_config *visual,
struct gl_context *share_list,
const struct dd_function_table *driverFunctions)
{
struct gl_context *ctx;
ctx = calloc(1, sizeof(struct gl_context));
if (!ctx)
return NULL;
if (_mesa_initialize_context(ctx, api, visual, share_list,
driverFunctions)) {
return ctx;
}
else {
free(ctx);
return NULL;
}
}
/**
* Free the data associated with the given context.
*

6
src/mesa/main/context.h
View file

@ -113,12 +113,6 @@ _mesa_initialize_context( struct gl_context *ctx,
struct gl_context *share_list,
const struct dd_function_table *driverFunctions);
extern struct gl_context *
_mesa_create_context(gl_api api,
const struct gl_config *visual,
struct gl_context *share_list,
const struct dd_function_table *driverFunctions);
extern void
_mesa_free_context_data( struct gl_context *ctx );

8
src/mesa/state_tracker/st_context.c
View file

@ -413,8 +413,12 @@ struct st_context *st_create_context(gl_api api, struct pipe_context *pipe,
memset(&funcs, 0, sizeof(funcs));
st_init_driver_functions(pipe->screen, &funcs);
ctx = _mesa_create_context(api, visual, shareCtx, &funcs);
if (!ctx) {
ctx = calloc(1, sizeof(struct gl_context));
if (!ctx)
return NULL;
if (!_mesa_initialize_context(ctx, api, visual, shareCtx, &funcs)) {
free(ctx);
return NULL;
}