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/dri2_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/dri2_glx.c')
| -rw-r--r-- | src/glx/dri2_glx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index 506754ccc1f..e7c18ffe1eb 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -143,6 +143,8 @@ dri2_bind_context(struct glx_context *context, struct glx_context *old, pdraw = (struct dri2_drawable *) driFetchDrawable(context, draw); pread = (struct dri2_drawable *) driFetchDrawable(context, read); + driReleaseDrawables(&pcp->base); + if (pdraw == NULL || pread == NULL) return GLXBadDrawable; @@ -170,9 +172,6 @@ dri2_unbind_context(struct glx_context *context, struct glx_context *new) struct dri2_screen *psc = (struct dri2_screen *) pcp->base.psc; (*psc->core->unbindContext) (pcp->driContext); - - if (context == new) - driReleaseDrawables(&pcp->base); } static struct glx_context * |