diff options
| author | Matthieu Herrb <matthieu@herrb.eu> | 2024-08-02 08:41:00 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2024-08-02 08:41:00 +0200 |
| commit | 56c4a40008fe47ad1d46376b4146e034b8c50c5e (patch) | |
| tree | b6dc2d92cef762018f496c5aaa5228673c66a40e | |
| parent | d873aa20b4638a96a72696598dce4ceb2807c14a (diff) | |
| parent | b65036af74bbb5084587d3d5743b8b97292235bc (diff) | |
Merge remote-tracking branch 'origin/master' into obsdobsd
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/radeon.h | 25 | ||||
| -rw-r--r-- | src/radeon_accel.c | 25 |
3 files changed, 41 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 58fb50eb..d44a2dda 100644 --- a/configure.ac +++ b/configure.ac @@ -254,11 +254,11 @@ b = bswap16(a); if test "$USE_SYS_ENDIAN_H" = "yes" ; then AC_DEFINE([USE_SYS_ENDIAN_H], 1, [Define to use byteswap macros from <sys/endian.h>]) - AC_DEFINE_UNQUOTED([bswap_16], ${BSWAP}16, + AC_DEFINE_UNQUOTED([radeon_bswap_16], ${BSWAP}16, [Define to 16-bit byteswap macro]) - AC_DEFINE_UNQUOTED([bswap_32], ${BSWAP}32, + AC_DEFINE_UNQUOTED([radeon_bswap_32], ${BSWAP}32, [Define to 32-bit byteswap macro]) - AC_DEFINE_UNQUOTED([bswap_64], ${BSWAP}64, + AC_DEFINE_UNQUOTED([radeon_bswap_64], ${BSWAP}64, [Define to 64-bit byteswap macro]) fi fi diff --git a/src/radeon.h b/src/radeon.h index 68d7756a..6d1d21ee 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -125,27 +125,30 @@ RegionDuplicate(RegionPtr pOld) #if HAVE_BYTESWAP_H #include <byteswap.h> +#define radeon_bswap_16 bswap_16 +#define radeon_bswap_32 bswap_32 +#define radeon_bswap_64 bswap_64 #elif defined(USE_SYS_ENDIAN_H) #include <sys/endian.h> #else -#define bswap_16(value) \ +#define radeon_bswap_16(value) \ ((((value) & 0xff) << 8) | ((value) >> 8)) -#define bswap_32(value) \ - (((uint32_t)bswap_16((uint16_t)((value) & 0xffff)) << 16) | \ - (uint32_t)bswap_16((uint16_t)((value) >> 16))) +#define radeon_bswap_32(value) \ + (((uint32_t)radeon_bswap_16((uint16_t)((value) & 0xffff)) << 16) | \ + (uint32_t)radeon_bswap_16((uint16_t)((value) >> 16))) -#define bswap_64(value) \ - (((uint64_t)bswap_32((uint32_t)((value) & 0xffffffff)) \ +#define radeon_bswap_64(value) \ + (((uint64_t)radeon_bswap_32((uint32_t)((value) & 0xffffffff)) \ << 32) | \ - (uint64_t)bswap_32((uint32_t)((value) >> 32))) + (uint64_t)radeon_bswap_32((uint32_t)((value) >> 32))) #endif #if X_BYTE_ORDER == X_BIG_ENDIAN -#define le32_to_cpu(x) bswap_32(x) -#define le16_to_cpu(x) bswap_16(x) -#define cpu_to_le32(x) bswap_32(x) -#define cpu_to_le16(x) bswap_16(x) +#define le32_to_cpu(x) radeon_bswap_32(x) +#define le16_to_cpu(x) radeon_bswap_16(x) +#define cpu_to_le32(x) radeon_bswap_32(x) +#define cpu_to_le16(x) radeon_bswap_16(x) #else #define le32_to_cpu(x) (x) #define le16_to_cpu(x) (x) diff --git a/src/radeon_accel.c b/src/radeon_accel.c index 8d4e76a5..a0dca68c 100644 --- a/src/radeon_accel.c +++ b/src/radeon_accel.c @@ -142,7 +142,30 @@ void RADEONCopySwap(uint8_t *dst, uint8_t *src, unsigned int size, int swap) return; } case RADEON_HOST_DATA_SWAP_32BIT: - { + if (((uintptr_t)dst & 1) || ((uintptr_t)src & 1)) { + uint8_t *d = (uint8_t *)dst; + uint8_t *s = (uint8_t *)src; + unsigned int nwords = size >> 2; + + for (; nwords > 0; --nwords, d+=4, s+=4) { + d[0] = s[3]; + d[1] = s[2]; + d[2] = s[1]; + d[3] = s[0]; + } + return; + } else if (((uintptr_t)dst & 3) || ((uintptr_t)src & 3)) { + /* copy 16bit wise */ + uint16_t *d = (uint16_t *)dst; + uint16_t *s = (uint16_t *)src; + unsigned int nwords = size >> 2; + + for (; nwords > 0; --nwords, d+=2, s+=2) { + d[0] = ((s[1] >> 8) & 0xff) | ((s[1] & 0xff) << 8); + d[1] = ((s[0] >> 8) & 0xff) | ((s[0] & 0xff) << 8); + } + return; + } else { unsigned int *d = (unsigned int *)dst; unsigned int *s = (unsigned int *)src; unsigned int nwords = size >> 2; |