Minor changes for more efficient endian switching

1 files changed, 12 insertions, 0 deletions

diff --git a/source/blender/blenlib/BLI_endian_switch_inline.h b/source/blender/blenlib/BLI_endian_switch_inline.h
index 358206f1177..f5f0e59cfa8 100644
--- a/source/blender/blenlib/BLI_endian_switch_inline.h
+++ b/source/blender/blenlib/BLI_endian_switch_inline.h
@@ -42,9 +42,13 @@ BLI_INLINE void BLI_endian_switch_int16(short *val)
 }
 BLI_INLINE void BLI_endian_switch_uint16(unsigned short *val)
 {
+#ifdef __GNUC__
+	*val = __builtin_bswap16(*val);
+#else
 	unsigned short tval = *val;
 	*val = (tval >> 8) |
 	       (tval << 8);
+#endif
 }
 
 
@@ -55,11 +59,15 @@ BLI_INLINE void BLI_endian_switch_int32(int *val)
 }
 BLI_INLINE void BLI_endian_switch_uint32(unsigned int *val)
 {
+#ifdef __GNUC__
+	*val = __builtin_bswap32(*val);
+#else
 	unsigned int tval = *val;
 	*val = ((tval >> 24))             |
 	       ((tval << 8) & 0x00ff0000) |
 	       ((tval >> 8) & 0x0000ff00) |
 	       ((tval << 24));
+#endif
 }
 BLI_INLINE void BLI_endian_switch_float(float *val)
 {
@@ -74,6 +82,9 @@ BLI_INLINE void BLI_endian_switch_int64(int64_t *val)
 }
 BLI_INLINE void BLI_endian_switch_uint64(uint64_t *val)
 {
+#ifdef __GNUC__
+	*val = __builtin_bswap16(*val);
+#else
 	uint64_t tval = *val;
 	*val = ((tval >> 56)) |
 	       ((tval << 40) & 0x00ff000000000000ll) |
@@ -83,6 +94,7 @@ BLI_INLINE void BLI_endian_switch_uint64(uint64_t *val)
 	       ((tval >> 24) & 0x0000000000ff0000ll) |
 	       ((tval >> 40) & 0x000000000000ff00ll) |
 	       ((tval << 56));
+#endif
 }
 BLI_INLINE void BLI_endian_switch_double(double *val)
 {