diff options
| author | Dave Airlie <[email protected]> | 2015-08-25 14:36:01 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2015-09-02 09:16:43 +1000 |
| commit | 0ad3a475ef81dad3baf607d749b91dfa1700ca23 (patch) | |
| tree | a9232bc66a31900353ab3d0a1135333c8b6f9299 /src/mesa/main/readpix.c | |
| parent | 60aea3011525de8bf6506e08c913cbe24cc17767 (diff) | |
mesa: fix SwapBytes handling in numerous places
In a number of places the SwapBytes handling didn't handle cases with
GL_(UN)PACK_ALIGNMENT set and 7 byte width cases aligned to 8 bytes.
This adds a common routine to swap bytes a 2D image and uses this
code in:
texture storage
texture get
readpixels
swrast drawpixels.
[airlied: updated with Brian's nitpicks].
Cc: "11.0" <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/mesa/main/readpix.c')
| -rw-r--r-- | src/mesa/main/readpix.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c index 12779446c6d..03a484c438c 100644 --- a/src/mesa/main/readpix.c +++ b/src/mesa/main/readpix.c @@ -613,15 +613,8 @@ read_rgba_pixels( struct gl_context *ctx, done_swap: /* Handle byte swapping if required */ if (packing->SwapBytes) { - GLint swapSize = _mesa_sizeof_packed_type(type); - if (swapSize == 2 || swapSize == 4) { - int swapsPerPixel = _mesa_bytes_per_pixel(format, type) / swapSize; - assert(_mesa_bytes_per_pixel(format, type) % swapSize == 0); - if (swapSize == 2) - _mesa_swap2((GLushort *) dst, width * height * swapsPerPixel); - else if (swapSize == 4) - _mesa_swap4((GLuint *) dst, width * height * swapsPerPixel); - } + _mesa_swap_bytes_2d_image(format, type, packing, + width, height, dst, dst); } done_unmap: |