diff options
Diffstat (limited to 'src/gallium/state_trackers')
-rw-r--r-- | src/gallium/state_trackers/dri/dri_context.c | 4 | ||||
-rw-r--r-- | src/gallium/state_trackers/dri/dri_drawable.c | 3 | ||||
-rw-r--r-- | src/gallium/state_trackers/glx/xlib/xm_api.c | 6 | ||||
-rw-r--r-- | src/gallium/state_trackers/nine/device9.c | 2 | ||||
-rw-r--r-- | src/gallium/state_trackers/nine/swapchain9.c | 2 | ||||
-rw-r--r-- | src/gallium/state_trackers/wgl/stw_context.c | 8 | ||||
-rw-r--r-- | src/gallium/state_trackers/wgl/stw_framebuffer.c | 2 |
7 files changed, 14 insertions, 13 deletions
diff --git a/src/gallium/state_trackers/dri/dri_context.c b/src/gallium/state_trackers/dri/dri_context.c index 2f69f255250..d4ac8adee1b 100644 --- a/src/gallium/state_trackers/dri/dri_context.c +++ b/src/gallium/state_trackers/dri/dri_context.c @@ -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->cso_context); + ctx->hud = hud_create(ctx->st->cso_context, NULL); } /* Do this last. */ @@ -206,7 +206,7 @@ dri_destroy_context(__DRIcontext * cPriv) struct dri_context *ctx = dri_context(cPriv); if (ctx->hud) { - hud_destroy(ctx->hud); + hud_destroy(ctx->hud, ctx->st->cso_context); } if (ctx->pp) diff --git a/src/gallium/state_trackers/dri/dri_drawable.c b/src/gallium/state_trackers/dri/dri_drawable.c index 53dbfd707ef..92ce9d288b1 100644 --- a/src/gallium/state_trackers/dri/dri_drawable.c +++ b/src/gallium/state_trackers/dri/dri_drawable.c @@ -519,7 +519,8 @@ dri_flush(__DRIcontext *cPriv, dri_postprocessing(ctx, drawable, ST_ATTACHMENT_BACK_LEFT); if (ctx->hud) { - hud_run(ctx->hud, drawable->textures[ST_ATTACHMENT_BACK_LEFT]); + hud_run(ctx->hud, ctx->st->cso_context, + drawable->textures[ST_ATTACHMENT_BACK_LEFT]); } pipe->flush_resource(pipe, drawable->textures[ST_ATTACHMENT_BACK_LEFT]); diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c index 79bf45d7d78..934c0aba118 100644 --- a/src/gallium/state_trackers/glx/xlib/xm_api.c +++ b/src/gallium/state_trackers/glx/xlib/xm_api.c @@ -1035,7 +1035,7 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list, c->st->st_manager_private = (void *) c; - c->hud = hud_create(c->st->cso_context); + c->hud = hud_create(c->st->cso_context, NULL); return c; @@ -1051,7 +1051,7 @@ PUBLIC void XMesaDestroyContext( XMesaContext c ) { if (c->hud) { - hud_destroy(c->hud); + hud_destroy(c->hud, NULL); } c->st->destroy(c->st); @@ -1357,7 +1357,7 @@ void XMesaSwapBuffers( XMesaBuffer b ) if (xmctx && xmctx->hud) { struct pipe_resource *back = xmesa_get_framebuffer_resource(b->stfb, ST_ATTACHMENT_BACK_LEFT); - hud_run(xmctx->hud, back); + hud_run(xmctx->hud, NULL, back); } if (xmctx && xmctx->xm_buffer == b) { diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/state_trackers/nine/device9.c index f1c50d6d208..34f903a6947 100644 --- a/src/gallium/state_trackers/nine/device9.c +++ b/src/gallium/state_trackers/nine/device9.c @@ -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.cso); /* NULL result is fine */ + This->hud = hud_create(This->context.cso, NULL); /* NULL result is fine */ /* Available memory counter. Updated only for allocations with this device * instance. This is the Win 7 behavior. diff --git a/src/gallium/state_trackers/nine/swapchain9.c b/src/gallium/state_trackers/nine/swapchain9.c index 096d582d97a..f24a7d05437 100644 --- a/src/gallium/state_trackers/nine/swapchain9.c +++ b/src/gallium/state_trackers/nine/swapchain9.c @@ -606,7 +606,7 @@ handle_draw_cursor_and_hud( struct NineSwapChain9 *This, struct pipe_resource *r if (device->hud && resource) { /* Implicit use of context pipe */ (void)NineDevice9_GetPipe(This->base.device); - hud_run(device->hud, resource); /* XXX: no offset */ + hud_run(device->hud, NULL, resource); /* XXX: no offset */ /* HUD doesn't clobber stipple */ nine_state_restore_non_cso(device); } diff --git a/src/gallium/state_trackers/wgl/stw_context.c b/src/gallium/state_trackers/wgl/stw_context.c index 2155fbfcff5..a9e4024c236 100644 --- a/src/gallium/state_trackers/wgl/stw_context.c +++ b/src/gallium/state_trackers/wgl/stw_context.c @@ -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->cso_context); + ctx->hud = hud_create(ctx->st->cso_context, NULL); } stw_lock_contexts(stw_dev); @@ -291,7 +291,7 @@ stw_create_context_attribs(HDC hdc, INT iLayerPlane, DHGLRC hShareContext, if (old_ctx) { /* free the old context data associated with this handle */ if (old_ctx->hud) { - hud_destroy(old_ctx->hud); + hud_destroy(old_ctx->hud, NULL); } ctx->st->destroy(old_ctx->st); FREE(old_ctx); @@ -316,7 +316,7 @@ stw_create_context_attribs(HDC hdc, INT iLayerPlane, DHGLRC hShareContext, no_hglrc: if (ctx->hud) { - hud_destroy(ctx->hud); + hud_destroy(ctx->hud, NULL); } ctx->st->destroy(ctx->st); no_st_ctx: @@ -348,7 +348,7 @@ DrvDeleteContext(DHGLRC dhglrc) stw_dev->stapi->make_current(stw_dev->stapi, NULL, NULL, NULL); if (ctx->hud) { - hud_destroy(ctx->hud); + hud_destroy(ctx->hud, NULL); } ctx->st->destroy(ctx->st); diff --git a/src/gallium/state_trackers/wgl/stw_framebuffer.c b/src/gallium/state_trackers/wgl/stw_framebuffer.c index 47e76c6d6d6..232ab1d2305 100644 --- a/src/gallium/state_trackers/wgl/stw_framebuffer.c +++ b/src/gallium/state_trackers/wgl/stw_framebuffer.c @@ -641,7 +641,7 @@ DrvSwapBuffers(HDC hdc) struct pipe_resource *back = stw_get_framebuffer_resource(fb->stfb, ST_ATTACHMENT_BACK_LEFT); if (back) { - hud_run(ctx->hud, back); + hud_run(ctx->hud, NULL, back); } } |