From: Yonggang Luo <luoyonggang@gmail.com>
Date: Sun, 4 Jun 2023 09:25:36 +0000 (+0800)
Subject: util: Move pipe_color_union from p_defines.h into u_formats.h
X-Git-Tag: upstream/23.3.3~4819
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=52b92a7166e6a03665a6cd34bc521ce1c87b64d5;p=platform%2Fupstream%2Fmesa.git

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 <luoyonggang@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19522>
---

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