summaryrefslogtreecommitdiff
path: root/src/gallium/winsys/xlib
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-01-19 11:51:23 -0700
committerBrian Paul <brianp@vmware.com>2009-01-19 11:51:23 -0700
commitba3a879b1cade2cb189b1d6d3b244f1fa3f8f5d7 (patch)
treeea01c8050da94597d47f7b6a324920e7ee021a1c /src/gallium/winsys/xlib
parent1907135235a684872706d1a28ea8e2b4e1b6e7d3 (diff)
gallium: use align() intead of round_up()
Diffstat (limited to 'src/gallium/winsys/xlib')
-rw-r--r--src/gallium/winsys/xlib/xlib_softpipe.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/gallium/winsys/xlib/xlib_softpipe.c b/src/gallium/winsys/xlib/xlib_softpipe.c
index e8513069fe..0c3097c42e 100644
--- a/src/gallium/winsys/xlib/xlib_softpipe.c
+++ b/src/gallium/winsys/xlib/xlib_softpipe.c
@@ -344,16 +344,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 int
xm_surface_alloc_storage(struct pipe_winsys *winsys,
struct pipe_surface *surf,
@@ -362,7 +352,7 @@ xm_surface_alloc_storage(struct pipe_winsys *winsys,
unsigned flags,
unsigned tex_usage)
{
- const unsigned alignment = 64;
+ const int alignment = 64;
surf->width = width;
surf->height = height;
@@ -370,7 +360,7 @@ xm_surface_alloc_storage(struct pipe_winsys *winsys,
pf_get_block(format, &surf->block);
surf->nblocksx = pf_get_nblocksx(&surf->block, width);
surf->nblocksy = pf_get_nblocksy(&surf->block, height);
- surf->stride = round_up(surf->nblocksx * surf->block.size, alignment);
+ surf->stride = align(surf->nblocksx * surf->block.size, alignment);
surf->usage = flags;
assert(!surf->buffer);