diff --git a/glx/indirect_util.c b/glx/indirect_util.c
index 58c194c99..44309104e 100644
--- a/glx/indirect_util.c
+++ b/glx/indirect_util.c
@@ -126,7 +126,7 @@ __glXSendReply( ClientPtr client, const void * data, size_t elements,
         elements = 0;
     }
     else if ( (elements > 1) || always_array ) {
-        reply_ints = ((elements * element_size) + 3) >> 2;
+        reply_ints = bytes_to_int32(elements * element_size);
     }
 
     __glXReply.length =         reply_ints;
@@ -174,7 +174,7 @@ __glXSendReplySwap( ClientPtr client, const void * data, size_t elements,
         elements = 0;
     }
     else if ( (elements > 1) || always_array ) {
-        reply_ints = ((elements * element_size) + 3) >> 2;
+        reply_ints = bytes_to_int32(elements * element_size);
     }
 
     __glXReply.length =         bswap_32( reply_ints );
diff --git a/glx/rensize.c b/glx/rensize.c
index 5c6b1500d..8a58e08d7 100644
--- a/glx/rensize.c
+++ b/glx/rensize.c
@@ -195,7 +195,7 @@ int __glXImageSize( GLenum format, GLenum type, GLenum target,
 	} else {
 	    groupsPerRow = w;
 	}
-	rowSize = (groupsPerRow + 7) >> 3;
+	rowSize = bits_to_bytes(groupsPerRow);
 	padding = (rowSize % alignment);
 	if (padding) {
 	    rowSize += alignment - padding;