From 52b92a7166e6a03665a6cd34bc521ce1c87b64d5 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Sun, 4 Jun 2023 17:25:36 +0800 Subject: [PATCH] util: Move pipe_color_union from p_defines.h into u_formats.h MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit As pipe_color_union is used in vulkan drivers, so decouple it from gallium by this move Signed-off-by: Yonggang Luo Reviewed-by: Marek Olšák Part-of: --- 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 f5e9768..3b9a6a9 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 6ca3f5e..935e8bc 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 -- 2.7.4