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

gallium/hud: use cso_get_pipe_context 

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák 2017-11-18 17:46:51 +01:00
parent e20364df82
commit 65433c3fd0
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gallium/auxiliary/hud/hud_context.c
View File

@ -1530,8 +1530,9 @@ print_help(struct pipe_screen *screen)
}
struct hud_context *
hud_create(struct pipe_context *pipe, struct cso_context *cso)
hud_create(struct cso_context *cso)
{
struct pipe_context *pipe = cso_get_pipe_context(cso);
struct pipe_screen *screen = pipe->screen;
struct hud_context *hud;
struct pipe_sampler_view view_templ;
@ -1548,7 +1549,7 @@ hud_create(struct pipe_context *pipe, struct cso_context *cso)
return NULL;
if (strcmp(env, "help") == 0) {
print_help(pipe->screen);
print_help(screen);
return NULL;
}

2
src/gallium/auxiliary/hud/hud_context.h
View File

@ -35,7 +35,7 @@ struct pipe_resource;
struct util_queue_monitoring;
struct hud_context *
hud_create(struct pipe_context *pipe, struct cso_context *cso);
hud_create(struct cso_context *cso);
void
hud_destroy(struct hud_context *hud);

2
src/gallium/state_trackers/dri/dri_context.c
View File

@ -168,7 +168,7 @@ dri_create_context(gl_api api, const struct gl_config * visual,
if (ctx->st->cso_context) {
ctx->pp = pp_init(ctx->st->pipe, screen->pp_enabled, ctx->st->cso_context);
ctx->hud = hud_create(ctx->st->pipe, ctx->st->cso_context);
ctx->hud = hud_create(ctx->st->cso_context);
}
/* Do this last. */

2
src/gallium/state_trackers/glx/xlib/xm_api.c
View File

@ -1035,7 +1035,7 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list,
c->st->st_manager_private = (void *) c;
c->hud = hud_create(c->st->pipe, c->st->cso_context);
c->hud = hud_create(c->st->cso_context);
return c;

2
src/gallium/state_trackers/nine/device9.c
View File

@ -205,7 +205,7 @@ NineDevice9_ctor( struct NineDevice9 *This,
if (!This->cso_sw) { return E_OUTOFMEMORY; }
/* Create first, it messes up our state. */
This->hud = hud_create(This->context.pipe, This->context.cso); /* NULL result is fine */
This->hud = hud_create(This->context.cso); /* NULL result is fine */
/* Available memory counter. Updated only for allocations with this device
* instance. This is the Win 7 behavior.

2
src/gallium/state_trackers/wgl/stw_context.c
View File

@ -278,7 +278,7 @@ stw_create_context_attribs(HDC hdc, INT iLayerPlane, DHGLRC hShareContext,
ctx->st->st_manager_private = (void *) ctx;
if (ctx->st->cso_context) {
ctx->hud = hud_create(ctx->st->pipe, ctx->st->cso_context);
ctx->hud = hud_create(ctx->st->cso_context);
}
stw_lock_contexts(stw_dev);