summaryrefslogtreecommitdiffstats
path: root/src/gallium/include/pipe
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2008-08-22 16:09:37 -0600
committerBrian Paul <[email protected]>2008-08-22 16:09:37 -0600
commita13475ff0057f1de8e3bc08d6ca42b9e135a3f5a (patch)
tree0cfda5afba40148e34db6b7e5f777c70dce3aa9f /src/gallium/include/pipe
parentf9c04d55d045b3cf3ffef24f805166e3995096e2 (diff)
gallium: replace align_int() with align()
The two functions are identical. Removed align_int() from p_util.h
Diffstat (limited to 'src/gallium/include/pipe')
-rw-r--r--src/gallium/include/pipe/p_util.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/gallium/include/pipe/p_util.h b/src/gallium/include/pipe/p_util.h
index 8f5cb4ddc5b..cac0039e123 100644
--- a/src/gallium/include/pipe/p_util.h
+++ b/src/gallium/include/pipe/p_util.h
@@ -289,13 +289,14 @@ align16( void *unaligned )
}
-static INLINE int align_int(int x, int align)
+static INLINE int align(int value, int alignment)
{
- return (x + align - 1) & ~(align - 1);
+ return (value + alignment - 1) & ~(alignment - 1);
}
+
#if defined(PIPE_CC_MSVC) && defined(PIPE_ARCH_X86)
static INLINE unsigned ffs( unsigned u )
{
@@ -399,12 +400,6 @@ do { \
} while (0)
-static INLINE int align(int value, int alignment)
-{
- return (value + alignment - 1) & ~(alignment - 1);
-}
-
-
/* util/p_util.c
*/
extern void pipe_copy_rect(ubyte * dst, const struct pipe_format_block *block,