diff options
| author | Stéphane Marchesin <[email protected]> | 2011-06-15 15:09:12 -0700 |
|---|---|---|
| committer | Stéphane Marchesin <[email protected]> | 2011-06-17 11:20:19 -0700 |
| commit | bf69ce37f0dcbb479078ee676d5100ac63e20750 (patch) | |
| tree | cfb0bf5deb989d947503e2bbeddde5aa5080fb62 /src/glx/drisw_glx.c | |
| parent | 8173471fc25f4c768cab54fa840fd4c53d1c3c0f (diff) | |
glx: implement drawable refcounting.
The current dri context unbind logic will leak drawables until the process
dies (they will then get released by the GEM code). There are two ways to fix
this: either always call driReleaseDrawables every time we unbind a context
(but that costs us round trips to the X server at getbuffers() time) or
implement proper drawable refcounting. This patch implements the latter.
Signed-off-by: Antoine Labour <[email protected]>
Signed-off-by: Stéphane Marchesin <[email protected]>
Reviewed-by: Adam Jackson <[email protected]>
Diffstat (limited to 'src/glx/drisw_glx.c')
| -rw-r--r-- | src/glx/drisw_glx.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c index 2eaa3c59348..00756959320 100644 --- a/src/glx/drisw_glx.c +++ b/src/glx/drisw_glx.c @@ -242,6 +242,8 @@ drisw_destroy_context(struct glx_context *context) struct drisw_context *pcp = (struct drisw_context *) context; struct drisw_screen *psc = (struct drisw_screen *) context->psc; + driReleaseDrawables(&pcp->base); + if (context->xid) glx_send_destroy_context(psc->base.dpy, context->xid); @@ -264,6 +266,8 @@ drisw_bind_context(struct glx_context *context, struct glx_context *old, pdraw = (struct drisw_drawable *) driFetchDrawable(context, draw); pread = (struct drisw_drawable *) driFetchDrawable(context, read); + driReleaseDrawables(&pcp->base); + if (pdraw == NULL || pread == NULL) return GLXBadDrawable; @@ -281,8 +285,6 @@ drisw_unbind_context(struct glx_context *context, struct glx_context *new) struct drisw_screen *psc = (struct drisw_screen *) pcp->base.psc; (*psc->core->unbindContext) (pcp->driContext); - - driReleaseDrawables(&pcp->base); } static const struct glx_context_vtable drisw_context_vtable = { |