diff options
| -rw-r--r-- | src/mesa/main/image.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/macros.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/pack.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c index c37900cf954..e97b006e071 100644 --- a/src/mesa/main/image.c +++ b/src/mesa/main/image.c @@ -151,7 +151,7 @@ _mesa_image_offset( GLuint dimensions, assert(format == GL_COLOR_INDEX || format == GL_STENCIL_INDEX); bytes_per_row = alignment - * CEILING( comp_per_pixel*pixels_per_row, 8*alignment ); + * DIV_ROUND_UP( comp_per_pixel*pixels_per_row, 8*alignment ); bytes_per_image = bytes_per_row * rows_per_image; diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h index cd5f2d6f28b..2d59c6f1e3d 100644 --- a/src/mesa/main/macros.h +++ b/src/mesa/main/macros.h @@ -808,7 +808,7 @@ DIFFERENT_SIGNS(GLfloat x, GLfloat y) /** Compute ceiling of integer quotient of A divided by B. */ -#define CEILING( A, B ) ( (A) % (B) == 0 ? (A)/(B) : (A)/(B)+1 ) +#define DIV_ROUND_UP( A, B ) ( (A) % (B) == 0 ? (A)/(B) : (A)/(B)+1 ) /** casts to silence warnings with some compilers */ diff --git a/src/mesa/main/pack.c b/src/mesa/main/pack.c index 4cc8468d0d9..2111a760400 100644 --- a/src/mesa/main/pack.c +++ b/src/mesa/main/pack.c @@ -155,7 +155,7 @@ _mesa_pack_bitmap( GLint width, GLint height, const GLubyte *source, if (!source) return; - width_in_bytes = CEILING( width, 8 ); + width_in_bytes = DIV_ROUND_UP( width, 8 ); src = source; for (row = 0; row < height; row++) { GLubyte *dst = (GLubyte *) _mesa_image_address2d(packing, dest, |