From 9817f7d621c7e723def53258a2c60df2f3ea1f35 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Sun, 4 Jun 2023 17:12:10 +0800 Subject: [PATCH] util: Move pipe_swizzle from p_defines.h to u_formats.h MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit pipe_swizzle 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/broadcom/common/v3d_util.h | 3 ++- src/gallium/auxiliary/gallivm/lp_bld_swizzle.h | 1 + src/gallium/include/pipe/p_defines.h | 14 -------------- src/util/format/u_formats.h | 14 ++++++++++++++ 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/broadcom/common/v3d_util.h b/src/broadcom/common/v3d_util.h index eb802b7..a15e474 100644 --- a/src/broadcom/common/v3d_util.h +++ b/src/broadcom/common/v3d_util.h @@ -25,7 +25,8 @@ #define V3D_UTIL_H #include "common/v3d_device_info.h" -#include "pipe/p_defines.h" +#include "compiler/shader_enums.h" +#include "util/format/u_formats.h" uint32_t v3d_csd_choose_workgroups_per_supergroup(struct v3d_device_info *devinfo, diff --git a/src/gallium/auxiliary/gallivm/lp_bld_swizzle.h b/src/gallium/auxiliary/gallivm/lp_bld_swizzle.h index e5be83a..40edd33 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_swizzle.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_swizzle.h @@ -39,6 +39,7 @@ #include "gallivm/lp_bld.h" #include "pipe/p_defines.h" +#include "util/format/u_formats.h" struct lp_type; diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 7cc252c..2829880 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -581,20 +581,6 @@ enum pipe_sprite_coord_mode { }; /** - * Texture & format swizzles - */ -enum pipe_swizzle { - PIPE_SWIZZLE_X, - PIPE_SWIZZLE_Y, - PIPE_SWIZZLE_Z, - PIPE_SWIZZLE_W, - PIPE_SWIZZLE_0, - PIPE_SWIZZLE_1, - PIPE_SWIZZLE_NONE, - PIPE_SWIZZLE_MAX, /**< Number of enums counter (must be last) */ -}; - -/** * Viewport swizzles */ enum pipe_viewport_swizzle { diff --git a/src/util/format/u_formats.h b/src/util/format/u_formats.h index 35ad0b8..fb2defd 100644 --- a/src/util/format/u_formats.h +++ b/src/util/format/u_formats.h @@ -652,6 +652,20 @@ pipe_format_to_chroma_format(enum pipe_format format) } } +/** + * Texture & format swizzles + */ +enum pipe_swizzle { + PIPE_SWIZZLE_X, + PIPE_SWIZZLE_Y, + PIPE_SWIZZLE_Z, + PIPE_SWIZZLE_W, + PIPE_SWIZZLE_0, + PIPE_SWIZZLE_1, + PIPE_SWIZZLE_NONE, + PIPE_SWIZZLE_MAX, /**< Number of enums counter (must be last) */ +}; + #ifdef __cplusplus } #endif -- 2.7.4