gallium: rename st_context_iface::st_manager_private to frontend_context

It's really dri_context for DRI.

Reviewed-by: Emma Anholt <emma@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20027>
This commit is contained in:
Marek Olšák 2022-11-27 12:21:45 -05:00 committed by Marge Bot
parent ec564cf043
commit 64ee8d2430
9 changed files with 19 additions and 19 deletions

View file

@ -197,7 +197,7 @@ dri_create_context(struct dri_screen *screen,
}
goto fail;
}
ctx->st->st_manager_private = (void *) ctx;
ctx->st->frontend_context = (void *) ctx;
if (ctx->st->cso_context) {
ctx->pp = pp_init(ctx->st->pipe, screen->pp_enabled, ctx->st->cso_context,
@ -345,7 +345,7 @@ dri_get_current(void)
{
struct st_context_iface *st = st_api_get_current();
return (struct dri_context *) st ? st->st_manager_private : NULL;
return (struct dri_context *) st ? st->frontend_context : NULL;
}
/* vim: set sw=3 ts=8 sts=3 expandtab: */

View file

@ -47,7 +47,7 @@ dri_st_framebuffer_validate(struct st_context_iface *stctx,
unsigned count,
struct pipe_resource **out)
{
struct dri_context *ctx = (struct dri_context *)stctx->st_manager_private;
struct dri_context *ctx = (struct dri_context *)stctx->frontend_context;
struct dri_drawable *drawable =
(struct dri_drawable *) stfbi->st_manager_private;
struct dri_screen *screen = drawable->screen;
@ -114,7 +114,7 @@ dri_st_framebuffer_flush_front(struct st_context_iface *stctx,
struct st_framebuffer_iface *stfbi,
enum st_attachment_type statt)
{
struct dri_context *ctx = (struct dri_context *)stctx->st_manager_private;
struct dri_context *ctx = (struct dri_context *)stctx->frontend_context;
struct dri_drawable *drawable =
(struct dri_drawable *) stfbi->st_manager_private;
@ -129,7 +129,7 @@ static bool
dri_st_framebuffer_flush_swapbuffers(struct st_context_iface *stctx,
struct st_framebuffer_iface *stfbi)
{
struct dri_context *ctx = (struct dri_context *)stctx->st_manager_private;
struct dri_context *ctx = (struct dri_context *)stctx->frontend_context;
struct dri_drawable *drawable =
(struct dri_drawable *) stfbi->st_manager_private;

View file

@ -811,7 +811,7 @@ static void
dri_set_background_context(struct st_context_iface *st,
struct util_queue_monitoring *queue_info)
{
struct dri_context *ctx = (struct dri_context *)st->st_manager_private;
struct dri_context *ctx = (struct dri_context *)st->frontend_context;
const __DRIbackgroundCallableExtension *backgroundCallable =
ctx->screen->dri2.backgroundCallable;

View file

@ -1009,7 +1009,7 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list,
if (c->st == NULL)
goto no_st;
c->st->st_manager_private = (void *) c;
c->st->frontend_context = (void *) c;
c->hud = hud_create(c->st->cso_context, c->st, NULL);
@ -1318,7 +1318,7 @@ GLboolean XMesaUnbindContext( XMesaContext c )
XMesaContext XMesaGetCurrentContext( void )
{
struct st_context_iface *st = st_api_get_current();
return (XMesaContext) (st) ? st->st_manager_private : NULL;
return (XMesaContext) (st) ? st->frontend_context : NULL;
}

View file

@ -36,7 +36,7 @@ hgl_st_context(struct st_context_iface *stctxi)
{
struct hgl_context* context;
assert(stctxi);
context = (struct hgl_context*)stctxi->st_manager_private;
context = (struct hgl_context*)stctxi->frontend_context;
assert(context);
return context;
}
@ -345,7 +345,7 @@ hgl_create_display(struct pipe_screen* screen)
assert(display->fscreen);
display->fscreen->screen = screen;
display->fscreen->get_param = hgl_st_manager_get_param;
// display->manager->st_manager_private is used by llvmpipe
// display->fscreen->st_manager_private is used by llvmpipe
return display;
}

View file

@ -686,7 +686,7 @@ OSMesaCreateContextAttribs(const int *attribList, OSMesaContext sharelist)
return NULL;
}
osmesa->stctx->st_manager_private = osmesa;
osmesa->stctx->frontend_context = osmesa;
osmesa->format = format;
osmesa->user_row_length = 0;
@ -822,7 +822,7 @@ GLAPI OSMesaContext GLAPIENTRY
OSMesaGetCurrentContext(void)
{
struct st_context_iface *st = st_api_get_current();
return st ? (OSMesaContext) st->st_manager_private : NULL;
return st ? (OSMesaContext) st->frontend_context : NULL;
}

View file

@ -56,7 +56,7 @@ stw_current_context(void)
st = (stw_dev) ? st_api_get_current() : NULL;
return (struct stw_context *) ((st) ? st->st_manager_private : NULL);
return (struct stw_context *) ((st) ? st->frontend_context : NULL);
}
@ -246,7 +246,7 @@ stw_create_context_attribs(HDC hdc, INT iLayerPlane, struct stw_context *shareCt
if (ctx->st == NULL)
goto no_st_ctx;
ctx->st->st_manager_private = (void *) ctx;
ctx->st->frontend_context = (void *) ctx;
if (ctx->st->cso_context) {
ctx->hud = hud_create(ctx->st->cso_context, ctx->st, NULL);

View file

@ -366,12 +366,12 @@ struct st_framebuffer_iface
struct st_context_iface
{
/**
* Available for the gallium frontend and the manager to use.
* The frontend context. (such as dri_context)
*/
void *st_manager_private;
void *frontend_context;
/**
* The frontend manager that manages this object.
* The frontend screen. (such as dri_screen)
*/
struct pipe_frontend_screen *frontend_screen;

View file

@ -213,8 +213,8 @@ GalliumContext::CreateContext(HGLWinsysContext *wsContext)
return -1;
}
assert(!context->st->st_manager_private);
context->st->st_manager_private = (void*)context;
assert(!context->st->frontend_context);
context->st->frontend_context = (void*)context;
struct st_context *stContext = (struct st_context*)context->st;