fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 00:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

util: Move pipe_color_union from p_defines.h into u_formats.h

Browse source 
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>
This commit is contained in:
Yonggang Luo 2023-06-04 17:25:36 +08:00 • committed by Marge Bot
parent ed1281a170
commit 52b92a7166
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gallium/include/pipe/p_defines.h
View file

@ -1214,13 +1214,6 @@ enum pipe_query_flags
PIPE_QUERY_PARTIAL = (1 << 1), PIPE_QUERY_PARTIAL = (1 << 1),
}; };
union pipe_color_union
{
float f[4];
int i[4];
unsigned int ui[4];
};
enum pipe_driver_query_type enum pipe_driver_query_type
{ {
PIPE_DRIVER_QUERY_TYPE_UINT64, PIPE_DRIVER_QUERY_TYPE_UINT64,

7
src/util/format/u_formats.h
View file

@ -676,6 +676,13 @@ enum pipe_swizzle {
#define PIPE_MASK_ZS 0x30 #define PIPE_MASK_ZS 0x30
#define PIPE_MASK_RGBAZS (PIPE_MASK_RGBA|PIPE_MASK_ZS) #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 #ifdef __cplusplus
} }
#endif #endif