Module: Mesa Branch: main Commit: 52b92a7166e6a03665a6cd34bc521ce1c87b64d5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=52b92a7166e6a03665a6cd34bc521ce1c87b64d5
Author: Yonggang Luo <[email protected]> Date: Sun Jun 4 17:25:36 2023 +0800 util: Move pipe_color_union from p_defines.h into u_formats.h As pipe_color_union is used in vulkan drivers, so decouple it from gallium by this move Signed-off-by: Yonggang Luo <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19522> --- src/gallium/include/pipe/p_defines.h | 7 ------- src/util/format/u_formats.h | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index f5e9768024f..3b9a6a9e646 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -1214,13 +1214,6 @@ enum pipe_query_flags PIPE_QUERY_PARTIAL = (1 << 1), }; -union pipe_color_union -{ - float f[4]; - int i[4]; - unsigned int ui[4]; -}; - enum pipe_driver_query_type { PIPE_DRIVER_QUERY_TYPE_UINT64, diff --git a/src/util/format/u_formats.h b/src/util/format/u_formats.h index 6ca3f5efabc..935e8bc2bbc 100644 --- a/src/util/format/u_formats.h +++ b/src/util/format/u_formats.h @@ -676,6 +676,13 @@ enum pipe_swizzle { #define PIPE_MASK_ZS 0x30 #define PIPE_MASK_RGBAZS (PIPE_MASK_RGBA|PIPE_MASK_ZS) +union pipe_color_union +{ + float f[4]; + int i[4]; + unsigned int ui[4]; +}; + #ifdef __cplusplus } #endif
