From ed1281a17029b4c7e01163aaf3d4d36da8c20462 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Sun, 4 Jun 2023 17:15:31 +0800 Subject: [PATCH] util: Move PIPE_MASK_* from p_defines.h to u_formats.h MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit PIPE_MASK_* is used by src/util/*, so do the move to decouple src/util/* from gallium Signed-off-by: Yonggang Luo Reviewed-by: Marek Olšák Part-of: --- src/gallium/include/pipe/p_defines.h | 11 ----------- src/util/format/u_formats.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 2829880..f5e9768 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -57,17 +57,6 @@ enum pipe_error /* TODO */ }; -#define PIPE_MASK_R 0x1 -#define PIPE_MASK_G 0x2 -#define PIPE_MASK_B 0x4 -#define PIPE_MASK_A 0x8 -#define PIPE_MASK_RGBA 0xf -#define PIPE_MASK_Z 0x10 -#define PIPE_MASK_S 0x20 -#define PIPE_MASK_ZS 0x30 -#define PIPE_MASK_RGBAZS (PIPE_MASK_RGBA|PIPE_MASK_ZS) - - /** * Inequality functions. Used for depth test, stencil compare, alpha * test, shadow compare, etc. diff --git a/src/util/format/u_formats.h b/src/util/format/u_formats.h index fb2defd..6ca3f5e 100644 --- a/src/util/format/u_formats.h +++ b/src/util/format/u_formats.h @@ -666,6 +666,16 @@ enum pipe_swizzle { PIPE_SWIZZLE_MAX, /**< Number of enums counter (must be last) */ }; +#define PIPE_MASK_R 0x1 +#define PIPE_MASK_G 0x2 +#define PIPE_MASK_B 0x4 +#define PIPE_MASK_A 0x8 +#define PIPE_MASK_RGBA 0xf +#define PIPE_MASK_Z 0x10 +#define PIPE_MASK_S 0x20 +#define PIPE_MASK_ZS 0x30 +#define PIPE_MASK_RGBAZS (PIPE_MASK_RGBA|PIPE_MASK_ZS) + #ifdef __cplusplus } #endif -- 2.7.4