summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2007-03-12 09:49:44 -0600
committerBrian <brian@yutani.localnet.net>2007-03-12 09:50:27 -0600
commit17fb7821d7cdc0ed211eaef013ee7798619a61d3 (patch)
treed35ca2804afa4b8abee56ededb7105c39bb873c1
parentc1a544733749cd388b9f51d087c695b2ce0ec729 (diff)
clean-up, simplify _mesa_image_row_stride()
-rw-r--r--src/mesa/main/image.c42
1 files changed, 19 insertions, 23 deletions
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 58dd771484..7c0b63b173 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -651,44 +651,34 @@ _mesa_image_address3d( const struct gl_pixelstore_attrib *packing,
/**
- * Compute the stride between image rows.
+ * Compute the stride (in bytes) between image rows.
*
* \param packing the pixelstore attributes
* \param width image width.
* \param format pixel format.
* \param type pixel data type.
*
- * \return the stride in bytes for the given parameters.
+ * \return the stride in bytes for the given parameters, or -1 if error
*/
GLint
_mesa_image_row_stride( const struct gl_pixelstore_attrib *packing,
GLint width, GLenum format, GLenum type )
{
+ GLint bytesPerRow, remainder;
+
ASSERT(packing);
+
if (type == GL_BITMAP) {
- /* BITMAP data */
- GLint bytes, remainder;
if (packing->RowLength == 0) {
- bytes = (width + 7) / 8;
+ bytesPerRow = (width + 7) / 8;
}
else {
- bytes = (packing->RowLength + 7) / 8;
- }
- if (packing->Invert) {
- /* negate the bytes per row (negative row stride) */
- bytes = -bytes;
+ bytesPerRow = (packing->RowLength + 7) / 8;
}
-
- remainder = bytes % packing->Alignment;
- if (remainder > 0)
- bytes += (packing->Alignment - remainder);
-
- return bytes;
}
else {
/* Non-BITMAP data */
const GLint bytesPerPixel = _mesa_bytes_per_pixel(format, type);
- GLint bytesPerRow, remainder;
if (bytesPerPixel <= 0)
return -1; /* error */
if (packing->RowLength == 0) {
@@ -697,13 +687,19 @@ _mesa_image_row_stride( const struct gl_pixelstore_attrib *packing,
else {
bytesPerRow = bytesPerPixel * packing->RowLength;
}
- remainder = bytesPerRow % packing->Alignment;
- if (remainder > 0)
- bytesPerRow += (packing->Alignment - remainder);
- if (packing->Invert)
- bytesPerRow = -bytesPerRow;
- return bytesPerRow;
}
+
+ remainder = bytesPerRow % packing->Alignment;
+ if (remainder > 0) {
+ bytesPerRow += (packing->Alignment - remainder);
+ }
+
+ if (packing->Invert) {
+ /* negate the bytes per row (negative row stride) */
+ bytesPerRow = -bytesPerRow;
+ }
+
+ return bytesPerRow;
}