diff options
author | Roland Scheidegger <sroland@vmware.com> | 2009-11-30 23:02:49 +0100 |
---|---|---|
committer | Roland Scheidegger <sroland@vmware.com> | 2009-11-30 23:02:49 +0100 |
commit | decf6ed810eae473d043a4a399a5a84f1378a725 (patch) | |
tree | a2e46901a82a9e166d3416f27c755c7a4b7430ed /src/gallium/winsys/xlib/xlib_cell.c | |
parent | ac400ffce62be47fc77e8d10cabcd39b92b6c627 (diff) |
fixups for interface changes (mostly state trackers)
Diffstat (limited to 'src/gallium/winsys/xlib/xlib_cell.c')
-rw-r--r-- | src/gallium/winsys/xlib/xlib_cell.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/gallium/winsys/xlib/xlib_cell.c b/src/gallium/winsys/xlib/xlib_cell.c index 13e609f58f..6e984ebe3c 100644 --- a/src/gallium/winsys/xlib/xlib_cell.c +++ b/src/gallium/winsys/xlib/xlib_cell.c @@ -277,15 +277,6 @@ xm_user_buffer_create(struct pipe_winsys *pws, void *ptr, unsigned bytes) -/** - * Round n up to next multiple. - */ -static INLINE unsigned -round_up(unsigned n, unsigned multiple) -{ - return (n + multiple - 1) & ~(multiple - 1); -} - static struct pipe_buffer * xm_surface_buffer_create(struct pipe_winsys *winsys, unsigned width, unsigned height, @@ -294,18 +285,15 @@ xm_surface_buffer_create(struct pipe_winsys *winsys, unsigned *stride) { const unsigned alignment = 64; - struct pipe_format_block block; - unsigned nblocksx, nblocksy; + unsigned nblocksy; - pf_get_block(format, &block); - nblocksx = pf_get_nblocksx(&block, width); - nblocksy = pf_get_nblocksy(&block, height); - *stride = round_up(nblocksx * block.size, alignment); + nblocksy = pf_get_nblocksy(format, height); + *stride = align(pf_get_stride(format, width), alignment); return winsys->buffer_create(winsys, alignment, usage, /* XXX a bit of a hack */ - *stride * round_up(nblocksy, TILE_SIZE)); + *stride * align(nblocksy, TILE_SIZE)); } |