Mesa (master): mesa/main: replace uses of _mesa_little_endian with preprocessor
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Nov 5 16:40:23 UTC 2019
Module: Mesa
Branch: master
Commit: 453d52acd8f9de9ed06b9e65bfba1baaf607cf96
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=453d52acd8f9de9ed06b9e65bfba1baaf607cf96
Author: Dylan Baker <dylan at pnwbakers.com>
Date: Thu Sep 6 15:14:24 2018 -0700
mesa/main: replace uses of _mesa_little_endian with preprocessor
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
---
src/mesa/main/format_utils.c | 20 +++++++++++++++++---
src/mesa/main/formats.c | 11 ++++++-----
src/mesa/main/texcompress_bptc.c | 7 +++++--
src/mesa/main/texcompress_fxt1.c | 7 +++++--
src/mesa/main/texcompress_s3tc.c | 21 +++++++++++++++------
src/mesa/main/texstore.c | 4 +---
6 files changed, 49 insertions(+), 21 deletions(-)
diff --git a/src/mesa/main/format_utils.c b/src/mesa/main/format_utils.c
index 58a65adc4de..f87cbdf1155 100644
--- a/src/mesa/main/format_utils.c
+++ b/src/mesa/main/format_utils.c
@@ -652,8 +652,10 @@ _mesa_format_convert(void *void_dst, uint32_t dst_format, size_t dst_stride,
}
static const uint8_t map_identity[7] = { 0, 1, 2, 3, 4, 5, 6 };
+#if PIPE_ARCH_BIG_ENDIAN
static const uint8_t map_3210[7] = { 3, 2, 1, 0, 4, 5, 6 };
static const uint8_t map_1032[7] = { 1, 0, 3, 2, 4, 5, 6 };
+#endif
/**
* Describes a format as an array format, if possible
@@ -704,10 +706,18 @@ _mesa_format_to_array(mesa_format format, GLenum *type, int *num_components,
endian = map_identity;
break;
case 2:
- endian = _mesa_little_endian() ? map_identity : map_1032;
+#if PIPE_ARCH_LITTLE_ENDIAN
+ endian = map_identity;
+#else
+ endian = map_1032;
+#endif
break;
case 4:
- endian = _mesa_little_endian() ? map_identity : map_3210;
+#if PIPE_ARCH_LITTLE_ENDIAN
+ endian = map_identity;
+#else
+ endian = map_3210;
+#endif
break;
default:
endian = map_identity;
@@ -725,7 +735,11 @@ _mesa_format_to_array(mesa_format format, GLenum *type, int *num_components,
endian = map_identity;
break;
case 2:
- endian = _mesa_little_endian() ? map_identity : map_1032;
+#if PIPE_ARCH_LITTLE_ENDIAN
+ endian = map_identity;
+#else
+ endian = map_1032;
+#endif
break;
default:
endian = map_identity;
diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index 7767249c190..325a1091ac9 100644
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -425,10 +425,11 @@ uint32_t
_mesa_format_to_array_format(mesa_format format)
{
const struct mesa_format_info *info = _mesa_get_format_info(format);
- if (info->ArrayFormat && !_mesa_little_endian() &&
- info->Layout == MESA_FORMAT_LAYOUT_PACKED)
+#if PIPE_ARCH_BIG_ENDIAN
+ if (info->ArrayFormat && info->Layout == MESA_FORMAT_LAYOUT_PACKED)
return _mesa_array_format_flip_channels(info->ArrayFormat);
else
+#endif
return info->ArrayFormat;
}
@@ -467,11 +468,11 @@ format_array_format_table_init(void)
if (!info->ArrayFormat)
continue;
- if (_mesa_little_endian()) {
+#if PIPE_ARCH_LITTLE_ENDIAN
array_format = info->ArrayFormat;
- } else {
+#else
array_format = _mesa_array_format_flip_channels(info->ArrayFormat);
- }
+#endif
/* This can happen and does for some of the BGR formats. Let's take
* the first one in the list.
diff --git a/src/mesa/main/texcompress_bptc.c b/src/mesa/main/texcompress_bptc.c
index 46279f144ff..d7f4ecf9abb 100644
--- a/src/mesa/main/texcompress_bptc.c
+++ b/src/mesa/main/texcompress_bptc.c
@@ -142,8 +142,11 @@ _mesa_texstore_bptc_rgba_unorm(TEXSTORE_PARAMS)
tempImageSlices[0] = (GLubyte *) tempImage;
_mesa_texstore(ctx, dims,
baseInternalFormat,
- _mesa_little_endian() ? MESA_FORMAT_R8G8B8A8_UNORM
- : MESA_FORMAT_A8B8G8R8_UNORM,
+#if PIPE_ARCH_LITTLE_ENDIAN
+ MESA_FORMAT_R8G8B8A8_UNORM,
+#else
+ MESA_FORMAT_A8B8G8R8_UNORM,
+#endif
rgbaRowStride, tempImageSlices,
srcWidth, srcHeight, srcDepth,
srcFormat, srcType, srcAddr,
diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c
index 19df6baf371..6642fe7cf0e 100644
--- a/src/mesa/main/texcompress_fxt1.c
+++ b/src/mesa/main/texcompress_fxt1.c
@@ -132,8 +132,11 @@ _mesa_texstore_rgba_fxt1(TEXSTORE_PARAMS)
tempImageSlices[0] = (GLubyte *) tempImage;
_mesa_texstore(ctx, dims,
baseInternalFormat,
- _mesa_little_endian() ? MESA_FORMAT_R8G8B8A8_UNORM
- : MESA_FORMAT_A8B8G8R8_UNORM,
+#if PIPE_ARCH_LITTLE_ENDIAN
+ MESA_FORMAT_R8G8B8A8_UNORM,
+#else
+ MESA_FORMAT_A8B8G8R8_UNORM,
+#endif
rgbaRowStride, tempImageSlices,
srcWidth, srcHeight, srcDepth,
srcFormat, srcType, srcAddr,
diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c
index 1c6cbba892a..3e4b9acd4c6 100644
--- a/src/mesa/main/texcompress_s3tc.c
+++ b/src/mesa/main/texcompress_s3tc.c
@@ -121,8 +121,11 @@ _mesa_texstore_rgba_dxt1(TEXSTORE_PARAMS)
tempImageSlices[0] = (GLubyte *) tempImage;
_mesa_texstore(ctx, dims,
baseInternalFormat,
- _mesa_little_endian() ? MESA_FORMAT_R8G8B8A8_UNORM
- : MESA_FORMAT_A8B8G8R8_UNORM,
+#if PIPE_ARCH_LITTLE_ENDIAN
+ MESA_FORMAT_R8G8B8A8_UNORM,
+#else
+ MESA_FORMAT_A8B8G8R8_UNORM,
+#endif
rgbaRowStride, tempImageSlices,
srcWidth, srcHeight, srcDepth,
srcFormat, srcType, srcAddr,
@@ -174,8 +177,11 @@ _mesa_texstore_rgba_dxt3(TEXSTORE_PARAMS)
tempImageSlices[0] = (GLubyte *) tempImage;
_mesa_texstore(ctx, dims,
baseInternalFormat,
- _mesa_little_endian() ? MESA_FORMAT_R8G8B8A8_UNORM
- : MESA_FORMAT_A8B8G8R8_UNORM,
+#if PIPE_ARCH_LITTLE_ENDIAN
+ MESA_FORMAT_R8G8B8A8_UNORM,
+#else
+ MESA_FORMAT_A8B8G8R8_UNORM,
+#endif
rgbaRowStride, tempImageSlices,
srcWidth, srcHeight, srcDepth,
srcFormat, srcType, srcAddr,
@@ -226,8 +232,11 @@ _mesa_texstore_rgba_dxt5(TEXSTORE_PARAMS)
tempImageSlices[0] = (GLubyte *) tempImage;
_mesa_texstore(ctx, dims,
baseInternalFormat,
- _mesa_little_endian() ? MESA_FORMAT_R8G8B8A8_UNORM
- : MESA_FORMAT_A8B8G8R8_UNORM,
+#if PIPE_ARCH_LITTLE_ENDIAN
+ MESA_FORMAT_R8G8B8A8_UNORM,
+#else
+ MESA_FORMAT_A8B8G8R8_UNORM,
+#endif
rgbaRowStride, tempImageSlices,
srcWidth, srcHeight, srcDepth,
srcFormat, srcType, srcAddr,
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 207695041a7..77c4bccbe07 100755
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -280,8 +280,6 @@ _mesa_texstore_z16(TEXSTORE_PARAMS)
static GLboolean
_mesa_texstore_ycbcr(TEXSTORE_PARAMS)
{
- const GLboolean littleEndian = _mesa_little_endian();
-
(void) ctx; (void) dims; (void) baseInternalFormat;
assert((dstFormat == MESA_FORMAT_YCBCR) ||
@@ -305,7 +303,7 @@ _mesa_texstore_ycbcr(TEXSTORE_PARAMS)
if (srcPacking->SwapBytes ^
(srcType == GL_UNSIGNED_SHORT_8_8_REV_MESA) ^
(dstFormat == MESA_FORMAT_YCBCR_REV) ^
- !littleEndian) {
+ !PIPE_ARCH_LITTLE_ENDIAN) {
GLint img, row;
for (img = 0; img < srcDepth; img++) {
GLubyte *dstRow = dstSlices[img];
More information about the mesa-commit
mailing list