fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 13:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

winsys/xlib: Fix a segfault when USE_XSHM is not defined.

Browse source
This commit is contained in:
Chia-I Wu 2010-03-09 12:36:34 +08:00
parent 3ab8211be4
commit da92f6db5b
1 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/gallium/winsys/xlib/xlib_sw_winsys.c
View file

@ -193,6 +193,26 @@ alloc_shm_ximage(struct xm_displaytarget *xm_dt,
#endif /* USE_XSHM */
static void
alloc_ximage(struct xm_displaytarget *xm_dt,
struct xlib_drawable *xmb,
unsigned width, unsigned height)
{
#ifdef USE_XSHM
if (xm_dt->shm) {
alloc_shm_ximage(xm_dt, xmb, width, height);
return;
}
#endif
xm_dt->tempImage = XCreateImage(xm_dt->display,
xmb->visual,
xmb->depth,
ZPixmap, 0,
NULL, width, height,
8, 0);
}
static boolean
xm_is_displaytarget_format_supported( struct sw_winsys *ws,
enum pipe_format format )
@ -265,19 +285,20 @@ xlib_sw_display(struct xlib_drawable *xlib_drawable,
if (no_swap)
return;
if (xm_dt->tempImage == NULL)
{
assert(util_format_get_blockwidth(xm_dt->format) == 1);
assert(util_format_get_blockheight(xm_dt->format) == 1);
alloc_ximage(xm_dt, xlib_drawable,
xm_dt->stride / util_format_get_blocksize(xm_dt->format),
xm_dt->height);
if (!xm_dt->tempImage)
return;
}
#ifdef USE_XSHM
if (xm_dt->shm)
{
if (xm_dt->tempImage == NULL)
{
assert(util_format_get_blockwidth(xm_dt->format) == 1);
assert(util_format_get_blockheight(xm_dt->format) == 1);
alloc_shm_ximage(xm_dt,
xlib_drawable,
xm_dt->stride / util_format_get_blocksize(xm_dt->format),
xm_dt->height);
}
ximage = xm_dt->tempImage;
ximage->data = xm_dt->data;