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

st/xorg: Fix transfer double free

Browse source
This commit is contained in:
Jakob Bornecrantz 2009-03-04 22:54:33 +01:00
parent 5aa356d3e4
commit dca226fefb
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gallium/state_trackers/xorg/xorg_exa.c
View file

@ -55,6 +55,7 @@ struct PixmapPriv
unsigned int color;
struct pipe_surface *src_surf; /* for copies */
struct pipe_transfer *map_transfer;
unsigned map_count;
};
/*
@ -116,6 +117,8 @@ ExaPrepareAccess(PixmapPtr pPix, int index)
if (!priv->tex)
return FALSE;
if (priv->map_count++ == 0)
{
priv->map_transfer =
exa->scrn->get_tex_transfer(exa->scrn, priv->tex, 0, 0, 0,
@ -146,9 +149,12 @@ ExaFinishAccess(PixmapPtr pPix, int index)
if (!priv->map_transfer)
return;
exa->scrn->transfer_unmap(exa->scrn, priv->map_transfer);
exa->scrn->tex_transfer_destroy(priv->map_transfer);
if (--priv->map_count == 0) {
assert(priv->map_transfer);
exa->scrn->transfer_unmap(exa->scrn, priv->map_transfer);
exa->scrn->tex_transfer_destroy(priv->map_transfer);
priv->map_transfer = NULL;
}
}
static void
@ -258,7 +264,7 @@ ExaPrepareCopy(PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap, int xdir,
PIPE_BUFFER_USAGE_GPU_READ |
PIPE_BUFFER_USAGE_GPU_WRITE);
return FALSE;
return TRUE;
}
static void