fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-22 08:30:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

winsys/xlib: fix up allocation/dealloction of XImage

Browse source 
Fixes a crash upon exit when using remote display.
This commit is contained in:
Brian Paul 2010-10-21 19:49:32 -06:00
parent 4d24f01cb3
commit 3bc6fe371c
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gallium/winsys/sw/xlib/xlib_sw_winsys.c
View file

@ -196,11 +196,14 @@ alloc_ximage(struct xm_displaytarget *xm_dt,
struct xlib_drawable *xmb,
unsigned width, unsigned height)
{
/* try allocating a shared memory image first */
if (xm_dt->shm) {
alloc_shm_ximage(xm_dt, xmb, width, height);
return;
if (xm_dt->tempImage)
return; /* success */
}
/* try regular (non-shared memory) image */
xm_dt->tempImage = XCreateImage(xm_dt->display,
xmb->visual,
xmb->depth,
@ -252,6 +255,10 @@ xm_displaytarget_destroy(struct sw_winsys *ws,
xm_dt->shminfo.shmid = -1;
xm_dt->shminfo.shmaddr = (char *) -1;
xm_dt->data = NULL;
if (xm_dt->tempImage)
xm_dt->tempImage->data = NULL;
}
else {
FREE(xm_dt->data);