diff options
author | José Fonseca <[email protected]> | 2009-03-04 16:44:31 +0000 |
---|---|---|
committer | José Fonseca <[email protected]> | 2009-03-04 16:44:31 +0000 |
commit | 67cbe83a7239c7934cfaf3293677fafe9ec295be (patch) | |
tree | 9e900bec924e396bf6667947dba1abe5c45d4784 /src/gallium/winsys/xlib/xlib_cell.c | |
parent | 50e38b08780d698bad402150ab4fe007051cbc1a (diff) | |
parent | 89f1f8f0b8fb684a7b1fce5bfbb961e4521745d7 (diff) |
Merge commit 'origin/master' into gallium-map-range
Diffstat (limited to 'src/gallium/winsys/xlib/xlib_cell.c')
-rw-r--r-- | src/gallium/winsys/xlib/xlib_cell.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/gallium/winsys/xlib/xlib_cell.c b/src/gallium/winsys/xlib/xlib_cell.c index a5dbdf30f65..13e609f58fe 100644 --- a/src/gallium/winsys/xlib/xlib_cell.c +++ b/src/gallium/winsys/xlib/xlib_cell.c @@ -107,22 +107,21 @@ xm_buffer_unmap(struct pipe_winsys *pws, struct pipe_buffer *buf) } static void -xm_buffer_destroy(struct pipe_winsys *pws, +xm_buffer_destroy(/*struct pipe_winsys *pws,*/ struct pipe_buffer *buf) { struct xm_buffer *oldBuf = xm_buffer(buf); - if (oldBuf->data) { - { + if (oldBuf) { + if (oldBuf->data) { if (!oldBuf->userBuffer) { align_free(oldBuf->data); } - } - oldBuf->data = NULL; + oldBuf->data = NULL; + } + free(oldBuf); } - - free(oldBuf); } @@ -371,7 +370,7 @@ xlib_create_cell_winsys( void ) static struct pipe_screen * -xlib_create_cell_screen( struct pipe_winsys *pws ) +xlib_create_cell_screen( void ) { struct pipe_winsys *winsys; struct pipe_screen *screen; |