diff options
| author | Dylan Baker <[email protected]> | 2018-09-06 15:13:22 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2019-11-05 16:39:55 +0000 |
| commit | f9f60da813e69aacf541d25a24622c896f15ba98 (patch) | |
| tree | ce1ba60e57b85a9ea16cfe12efcf3e1ab994d596 /src/gallium/include | |
| parent | 37e54736a7bab3397e316ae4493c2e3d4aebfa5e (diff) | |
util/u_endian: set PIPE_ARCH_*_ENDIAN to 1
This will allow it to be used as a drop in replacement for
_mesa_little_endian in a number of cases.
v2: - Always define PIPE_ARCH_LITTLE_ENDIAN and PIPE_ARCH_BIG_ENDIAN,
define the one that reflects the host system to 1 and the other to 0
- replace all uses of #ifdef, #ifndef, and #if defined() with #if
and #if ! with PIPE_ARCH_*_ENDIAN
Reviewed-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src/gallium/include')
| -rw-r--r-- | src/gallium/include/pipe/p_config.h | 13 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_defines.h | 4 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_format.h | 4 |
3 files changed, 4 insertions, 17 deletions
diff --git a/src/gallium/include/pipe/p_config.h b/src/gallium/include/pipe/p_config.h index 5c51ad41842..2c1698d0e9c 100644 --- a/src/gallium/include/pipe/p_config.h +++ b/src/gallium/include/pipe/p_config.h @@ -127,19 +127,6 @@ */ #include "util/u_endian.h" -#if !defined(PIPE_ARCH_LITTLE_ENDIAN) && !defined(PIPE_ARCH_BIG_ENDIAN) - -#if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) || defined(PIPE_ARCH_ARM) || defined(PIPE_ARCH_AARCH64) -#define PIPE_ARCH_LITTLE_ENDIAN -#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) || defined(PIPE_ARCH_S390) -#define PIPE_ARCH_BIG_ENDIAN -#endif - -#endif - -#if !defined(PIPE_ARCH_LITTLE_ENDIAN) && !defined(PIPE_ARCH_BIG_ENDIAN) -#error Unknown Endianness -#endif /* * Auto-detect the operating system family. diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 2ddb31acbdc..05dd92c0da7 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -929,9 +929,9 @@ enum pipe_endian { PIPE_ENDIAN_LITTLE = 0, PIPE_ENDIAN_BIG = 1, -#if defined(PIPE_ARCH_LITTLE_ENDIAN) +#if PIPE_ARCH_LITTLE_ENDIAN PIPE_ENDIAN_NATIVE = PIPE_ENDIAN_LITTLE -#elif defined(PIPE_ARCH_BIG_ENDIAN) +#elif PIPE_ARCH_BIG_ENDIAN PIPE_ENDIAN_NATIVE = PIPE_ENDIAN_BIG #endif }; diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h index 2da480d6dce..273abf85941 100644 --- a/src/gallium/include/pipe/p_format.h +++ b/src/gallium/include/pipe/p_format.h @@ -431,7 +431,7 @@ enum pipe_format { PIPE_FORMAT_COUNT }; -#if defined(PIPE_ARCH_LITTLE_ENDIAN) +#if PIPE_ARCH_LITTLE_ENDIAN #define PIPE_FORMAT_RGBA8888_UNORM PIPE_FORMAT_R8G8B8A8_UNORM #define PIPE_FORMAT_RGBX8888_UNORM PIPE_FORMAT_R8G8B8X8_UNORM #define PIPE_FORMAT_BGRA8888_UNORM PIPE_FORMAT_B8G8R8A8_UNORM @@ -460,7 +460,7 @@ enum pipe_format { #define PIPE_FORMAT_GR1616_UNORM PIPE_FORMAT_G16R16_UNORM #define PIPE_FORMAT_RG1616_SNORM PIPE_FORMAT_R16G16_SNORM #define PIPE_FORMAT_GR1616_SNORM PIPE_FORMAT_G16R16_SNORM -#elif defined(PIPE_ARCH_BIG_ENDIAN) +#elif PIPE_ARCH_BIG_ENDIAN #define PIPE_FORMAT_ABGR8888_UNORM PIPE_FORMAT_R8G8B8A8_UNORM #define PIPE_FORMAT_XBGR8888_UNORM PIPE_FORMAT_R8G8B8X8_UNORM #define PIPE_FORMAT_ARGB8888_UNORM PIPE_FORMAT_B8G8R8A8_UNORM |