frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glx: switch to byte counting functions 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-07-06 12:07:00 +10:00
parent 87ce93c997
commit c20304226b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glx/indirect_util.c
View File

@ -126,7 +126,7 @@ __glXSendReply( ClientPtr client, const void * data, size_t elements,
elements = 0; elements = 0;
} }
else if ( (elements > 1) || always_array ) { 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; __glXReply.length = reply_ints;
@ -174,7 +174,7 @@ __glXSendReplySwap( ClientPtr client, const void * data, size_t elements,
elements = 0; elements = 0;
} }
else if ( (elements > 1) || always_array ) { 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 ); __glXReply.length = bswap_32( reply_ints );

2
glx/rensize.c
View File

@ -195,7 +195,7 @@ int __glXImageSize( GLenum format, GLenum type, GLenum target,
} else { } else {
groupsPerRow = w; groupsPerRow = w;
} }
rowSize = (groupsPerRow + 7) >> 3; rowSize = bits_to_bytes(groupsPerRow);
padding = (rowSize % alignment); padding = (rowSize % alignment);
if (padding) { if (padding) {
rowSize += alignment - padding; rowSize += alignment - padding;