diff options
author | Dave Airlie <airlied@redhat.com> | 2007-10-12 11:02:46 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2007-10-12 11:02:46 +1000 |
commit | bf805d3bf5bf191aa669b6155316a78917cf9b0e (patch) | |
tree | d76223fb22381485f7ecc8f6c7d026dcd88d80f3 /src/mesa/drivers/dri/i965/intel_pixel_bitmap.c | |
parent | 9e06cf00cfb24528653913fc90eded4d370c1149 (diff) | |
parent | 72c888869f4e5074e57c349ec356798959be791e (diff) |
Merge branch 'master' into i915-superioctl
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_pixel_bitmap.c')
-rw-r--r-- | src/mesa/drivers/dri/i965/intel_pixel_bitmap.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c b/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c index 79c1fee9c0..3777422619 100644 --- a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c +++ b/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c @@ -91,11 +91,6 @@ static void set_bit( GLubyte *dest, dest[bit/8] |= 1 << (bit % 8); } -static int align(int x, int align) -{ - return (x + align - 1) & ~(align - 1); -} - /* Extract a rectangle's worth of data from the bitmap. Called * per-cliprect. */ @@ -147,7 +142,7 @@ static GLuint get_bitmap_rect(GLsizei width, GLsizei height, } if (row_align) - bit = (bit + row_align - 1) & ~(row_align - 1); + bit = ALIGN(bit, row_align); } return count; @@ -268,7 +263,7 @@ do_blit_bitmap( GLcontext *ctx, for (px = 0; px < box_w; px += DX) { int h = MIN2(DY, box_h - py); int w = MIN2(DX, box_w - px); - GLuint sz = align(align(w,8) * h, 64)/8; + GLuint sz = ALIGN(ALIGN(w,8) * h, 64)/8; GLenum logic_op = ctx->Color.ColorLogicOpEnabled ? ctx->Color.LogicOp : GL_COPY; |