From 10a0622a449c3501ef7c249e6e47914a182940f6 Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Thu, 5 Sep 2019 08:54:12 +0200 Subject: [PATCH] Gallium/format: Replace PIPE_FORMAT by using defined to VIRGL_FORMAT In order to keep the changes limited and not go out of sync with Gallium too much the old PIPE_FORMAT* are replaced with defines to their VIRGL_FORMAT* counterparts and pipe_format becomes a typedef of "enum virgl_formats". v2: Add 'src' to includes in meson.build Signed-off-by: Gert Wollny Reviewed-by: Gurchetan Singh --- src/gallium/Automake.inc | 1 + src/gallium/include/pipe/p_format.h | 725 ++++++++++++++-------------- src/gallium/meson.build | 4 +- 3 files changed, 366 insertions(+), 364 deletions(-) diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc index a027df3..9a5aef1 100644 --- a/src/gallium/Automake.inc +++ b/src/gallium/Automake.inc @@ -2,5 +2,6 @@ GALLIUM_CFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src/gallium/include \ -I$(top_srcdir)/src/gallium/auxiliary \ + -I$(top_srcdir)/src/ \ $(DEFINES) diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h index 6fb9122..f9b7c67 100644 --- a/src/gallium/include/pipe/p_format.h +++ b/src/gallium/include/pipe/p_format.h @@ -30,376 +30,377 @@ #define PIPE_FORMAT_H #include "p_config.h" +#include "virgl_hw.h" #ifdef __cplusplus extern "C" { #endif + +#define pipe_format virgl_formats /** * Formats for textures, surfaces and vertex data */ -enum pipe_format { - PIPE_FORMAT_NONE = 0, - PIPE_FORMAT_B8G8R8A8_UNORM = 1, - PIPE_FORMAT_B8G8R8X8_UNORM = 2, - PIPE_FORMAT_A8R8G8B8_UNORM = 3, - PIPE_FORMAT_X8R8G8B8_UNORM = 4, - PIPE_FORMAT_B5G5R5A1_UNORM = 5, - PIPE_FORMAT_B4G4R4A4_UNORM = 6, - PIPE_FORMAT_B5G6R5_UNORM = 7, - PIPE_FORMAT_R10G10B10A2_UNORM = 8, - PIPE_FORMAT_L8_UNORM = 9, /**< ubyte luminance */ - PIPE_FORMAT_A8_UNORM = 10, /**< ubyte alpha */ - PIPE_FORMAT_I8_UNORM = 11, /**< ubyte intensity */ - PIPE_FORMAT_L8A8_UNORM = 12, /**< ubyte alpha, luminance */ - PIPE_FORMAT_L16_UNORM = 13, /**< ushort luminance */ - PIPE_FORMAT_UYVY = 14, - PIPE_FORMAT_YUYV = 15, - PIPE_FORMAT_Z16_UNORM = 16, - PIPE_FORMAT_Z32_UNORM = 17, - PIPE_FORMAT_Z32_FLOAT = 18, - PIPE_FORMAT_Z24_UNORM_S8_UINT = 19, - PIPE_FORMAT_S8_UINT_Z24_UNORM = 20, - PIPE_FORMAT_Z24X8_UNORM = 21, - PIPE_FORMAT_X8Z24_UNORM = 22, - PIPE_FORMAT_S8_UINT = 23, /**< ubyte stencil */ - PIPE_FORMAT_R64_FLOAT = 24, - PIPE_FORMAT_R64G64_FLOAT = 25, - PIPE_FORMAT_R64G64B64_FLOAT = 26, - PIPE_FORMAT_R64G64B64A64_FLOAT = 27, - PIPE_FORMAT_R32_FLOAT = 28, - PIPE_FORMAT_R32G32_FLOAT = 29, - PIPE_FORMAT_R32G32B32_FLOAT = 30, - PIPE_FORMAT_R32G32B32A32_FLOAT = 31, - PIPE_FORMAT_R32_UNORM = 32, - PIPE_FORMAT_R32G32_UNORM = 33, - PIPE_FORMAT_R32G32B32_UNORM = 34, - PIPE_FORMAT_R32G32B32A32_UNORM = 35, - PIPE_FORMAT_R32_USCALED = 36, - PIPE_FORMAT_R32G32_USCALED = 37, - PIPE_FORMAT_R32G32B32_USCALED = 38, - PIPE_FORMAT_R32G32B32A32_USCALED = 39, - PIPE_FORMAT_R32_SNORM = 40, - PIPE_FORMAT_R32G32_SNORM = 41, - PIPE_FORMAT_R32G32B32_SNORM = 42, - PIPE_FORMAT_R32G32B32A32_SNORM = 43, - PIPE_FORMAT_R32_SSCALED = 44, - PIPE_FORMAT_R32G32_SSCALED = 45, - PIPE_FORMAT_R32G32B32_SSCALED = 46, - PIPE_FORMAT_R32G32B32A32_SSCALED = 47, - PIPE_FORMAT_R16_UNORM = 48, - PIPE_FORMAT_R16G16_UNORM = 49, - PIPE_FORMAT_R16G16B16_UNORM = 50, - PIPE_FORMAT_R16G16B16A16_UNORM = 51, - PIPE_FORMAT_R16_USCALED = 52, - PIPE_FORMAT_R16G16_USCALED = 53, - PIPE_FORMAT_R16G16B16_USCALED = 54, - PIPE_FORMAT_R16G16B16A16_USCALED = 55, - PIPE_FORMAT_R16_SNORM = 56, - PIPE_FORMAT_R16G16_SNORM = 57, - PIPE_FORMAT_R16G16B16_SNORM = 58, - PIPE_FORMAT_R16G16B16A16_SNORM = 59, - PIPE_FORMAT_R16_SSCALED = 60, - PIPE_FORMAT_R16G16_SSCALED = 61, - PIPE_FORMAT_R16G16B16_SSCALED = 62, - PIPE_FORMAT_R16G16B16A16_SSCALED = 63, - PIPE_FORMAT_R8_UNORM = 64, - PIPE_FORMAT_R8G8_UNORM = 65, - PIPE_FORMAT_R8G8B8_UNORM = 66, - PIPE_FORMAT_R8G8B8A8_UNORM = 67, - PIPE_FORMAT_X8B8G8R8_UNORM = 68, - PIPE_FORMAT_R8_USCALED = 69, - PIPE_FORMAT_R8G8_USCALED = 70, - PIPE_FORMAT_R8G8B8_USCALED = 71, - PIPE_FORMAT_R8G8B8A8_USCALED = 72, - PIPE_FORMAT_R8_SNORM = 74, - PIPE_FORMAT_R8G8_SNORM = 75, - PIPE_FORMAT_R8G8B8_SNORM = 76, - PIPE_FORMAT_R8G8B8A8_SNORM = 77, - PIPE_FORMAT_R8_SSCALED = 82, - PIPE_FORMAT_R8G8_SSCALED = 83, - PIPE_FORMAT_R8G8B8_SSCALED = 84, - PIPE_FORMAT_R8G8B8A8_SSCALED = 85, - PIPE_FORMAT_R32_FIXED = 87, - PIPE_FORMAT_R32G32_FIXED = 88, - PIPE_FORMAT_R32G32B32_FIXED = 89, - PIPE_FORMAT_R32G32B32A32_FIXED = 90, - PIPE_FORMAT_R16_FLOAT = 91, - PIPE_FORMAT_R16G16_FLOAT = 92, - PIPE_FORMAT_R16G16B16_FLOAT = 93, - PIPE_FORMAT_R16G16B16A16_FLOAT = 94, - - /* sRGB formats */ - PIPE_FORMAT_L8_SRGB = 95, - PIPE_FORMAT_L8A8_SRGB = 96, - PIPE_FORMAT_R8G8B8_SRGB = 97, - PIPE_FORMAT_A8B8G8R8_SRGB = 98, - PIPE_FORMAT_X8B8G8R8_SRGB = 99, - PIPE_FORMAT_B8G8R8A8_SRGB = 100, - PIPE_FORMAT_B8G8R8X8_SRGB = 101, - PIPE_FORMAT_A8R8G8B8_SRGB = 102, - PIPE_FORMAT_X8R8G8B8_SRGB = 103, - PIPE_FORMAT_R8G8B8A8_SRGB = 104, - - /* compressed formats */ - PIPE_FORMAT_DXT1_RGB = 105, - PIPE_FORMAT_DXT1_RGBA = 106, - PIPE_FORMAT_DXT3_RGBA = 107, - PIPE_FORMAT_DXT5_RGBA = 108, - - /* sRGB, compressed */ - PIPE_FORMAT_DXT1_SRGB = 109, - PIPE_FORMAT_DXT1_SRGBA = 110, - PIPE_FORMAT_DXT3_SRGBA = 111, - PIPE_FORMAT_DXT5_SRGBA = 112, - - /* rgtc compressed */ - PIPE_FORMAT_RGTC1_UNORM = 113, - PIPE_FORMAT_RGTC1_SNORM = 114, - PIPE_FORMAT_RGTC2_UNORM = 115, - PIPE_FORMAT_RGTC2_SNORM = 116, - - PIPE_FORMAT_R8G8_B8G8_UNORM = 117, - PIPE_FORMAT_G8R8_G8B8_UNORM = 118, - - /* mixed formats */ - PIPE_FORMAT_R8SG8SB8UX8U_NORM = 119, - PIPE_FORMAT_R5SG5SB6U_NORM = 120, - - /* TODO: re-order these */ - PIPE_FORMAT_A8B8G8R8_UNORM = 121, - PIPE_FORMAT_B5G5R5X1_UNORM = 122, - PIPE_FORMAT_R10G10B10A2_USCALED = 123, - PIPE_FORMAT_R11G11B10_FLOAT = 124, - PIPE_FORMAT_R9G9B9E5_FLOAT = 125, - PIPE_FORMAT_Z32_FLOAT_S8X24_UINT = 126, - PIPE_FORMAT_R1_UNORM = 127, - PIPE_FORMAT_R10G10B10X2_USCALED = 128, - PIPE_FORMAT_R10G10B10X2_SNORM = 129, - PIPE_FORMAT_L4A4_UNORM = 130, - PIPE_FORMAT_B10G10R10A2_UNORM = 131, - PIPE_FORMAT_R10SG10SB10SA2U_NORM = 132, - PIPE_FORMAT_R8G8Bx_SNORM = 133, - PIPE_FORMAT_R8G8B8X8_UNORM = 134, - PIPE_FORMAT_B4G4R4X4_UNORM = 135, - - /* some stencil samplers formats */ - PIPE_FORMAT_X24S8_UINT = 136, - PIPE_FORMAT_S8X24_UINT = 137, - PIPE_FORMAT_X32_S8X24_UINT = 138, - - PIPE_FORMAT_B2G3R3_UNORM = 139, - PIPE_FORMAT_L16A16_UNORM = 140, - PIPE_FORMAT_A16_UNORM = 141, - PIPE_FORMAT_I16_UNORM = 142, - - PIPE_FORMAT_LATC1_UNORM = 143, - PIPE_FORMAT_LATC1_SNORM = 144, - PIPE_FORMAT_LATC2_UNORM = 145, - PIPE_FORMAT_LATC2_SNORM = 146, - - PIPE_FORMAT_A8_SNORM = 147, - PIPE_FORMAT_L8_SNORM = 148, - PIPE_FORMAT_L8A8_SNORM = 149, - PIPE_FORMAT_I8_SNORM = 150, - PIPE_FORMAT_A16_SNORM = 151, - PIPE_FORMAT_L16_SNORM = 152, - PIPE_FORMAT_L16A16_SNORM = 153, - PIPE_FORMAT_I16_SNORM = 154, - - PIPE_FORMAT_A16_FLOAT = 155, - PIPE_FORMAT_L16_FLOAT = 156, - PIPE_FORMAT_L16A16_FLOAT = 157, - PIPE_FORMAT_I16_FLOAT = 158, - PIPE_FORMAT_A32_FLOAT = 159, - PIPE_FORMAT_L32_FLOAT = 160, - PIPE_FORMAT_L32A32_FLOAT = 161, - PIPE_FORMAT_I32_FLOAT = 162, - - PIPE_FORMAT_YV12 = 163, - PIPE_FORMAT_YV16 = 164, - PIPE_FORMAT_IYUV = 165, /**< aka I420 */ - PIPE_FORMAT_NV12 = 166, - PIPE_FORMAT_NV21 = 167, - - PIPE_FORMAT_A4R4_UNORM = 168, - PIPE_FORMAT_R4A4_UNORM = 169, - PIPE_FORMAT_R8A8_UNORM = 170, - PIPE_FORMAT_A8R8_UNORM = 171, - - PIPE_FORMAT_R10G10B10A2_SSCALED = 172, - PIPE_FORMAT_R10G10B10A2_SNORM = 173, - - PIPE_FORMAT_B10G10R10A2_USCALED = 174, - PIPE_FORMAT_B10G10R10A2_SSCALED = 175, - PIPE_FORMAT_B10G10R10A2_SNORM = 176, - - PIPE_FORMAT_R8_UINT = 177, - PIPE_FORMAT_R8G8_UINT = 178, - PIPE_FORMAT_R8G8B8_UINT = 179, - PIPE_FORMAT_R8G8B8A8_UINT = 180, - - PIPE_FORMAT_R8_SINT = 181, - PIPE_FORMAT_R8G8_SINT = 182, - PIPE_FORMAT_R8G8B8_SINT = 183, - PIPE_FORMAT_R8G8B8A8_SINT = 184, - - PIPE_FORMAT_R16_UINT = 185, - PIPE_FORMAT_R16G16_UINT = 186, - PIPE_FORMAT_R16G16B16_UINT = 187, - PIPE_FORMAT_R16G16B16A16_UINT = 188, - - PIPE_FORMAT_R16_SINT = 189, - PIPE_FORMAT_R16G16_SINT = 190, - PIPE_FORMAT_R16G16B16_SINT = 191, - PIPE_FORMAT_R16G16B16A16_SINT = 192, - - PIPE_FORMAT_R32_UINT = 193, - PIPE_FORMAT_R32G32_UINT = 194, - PIPE_FORMAT_R32G32B32_UINT = 195, - PIPE_FORMAT_R32G32B32A32_UINT = 196, - - PIPE_FORMAT_R32_SINT = 197, - PIPE_FORMAT_R32G32_SINT = 198, - PIPE_FORMAT_R32G32B32_SINT = 199, - PIPE_FORMAT_R32G32B32A32_SINT = 200, - - PIPE_FORMAT_A8_UINT = 201, - PIPE_FORMAT_I8_UINT = 202, - PIPE_FORMAT_L8_UINT = 203, - PIPE_FORMAT_L8A8_UINT = 204, - - PIPE_FORMAT_A8_SINT = 205, - PIPE_FORMAT_I8_SINT = 206, - PIPE_FORMAT_L8_SINT = 207, - PIPE_FORMAT_L8A8_SINT = 208, - - PIPE_FORMAT_A16_UINT = 209, - PIPE_FORMAT_I16_UINT = 210, - PIPE_FORMAT_L16_UINT = 211, - PIPE_FORMAT_L16A16_UINT = 212, - - PIPE_FORMAT_A16_SINT = 213, - PIPE_FORMAT_I16_SINT = 214, - PIPE_FORMAT_L16_SINT = 215, - PIPE_FORMAT_L16A16_SINT = 216, - - PIPE_FORMAT_A32_UINT = 217, - PIPE_FORMAT_I32_UINT = 218, - PIPE_FORMAT_L32_UINT = 219, - PIPE_FORMAT_L32A32_UINT = 220, - - PIPE_FORMAT_A32_SINT = 221, - PIPE_FORMAT_I32_SINT = 222, - PIPE_FORMAT_L32_SINT = 223, - PIPE_FORMAT_L32A32_SINT = 224, - - PIPE_FORMAT_B10G10R10A2_UINT = 225, - - PIPE_FORMAT_ETC1_RGB8 = 226, - - PIPE_FORMAT_R8G8_R8B8_UNORM = 227, - PIPE_FORMAT_G8R8_B8R8_UNORM = 228, - - PIPE_FORMAT_R8G8B8X8_SNORM = 229, - PIPE_FORMAT_R8G8B8X8_SRGB = 230, - PIPE_FORMAT_R8G8B8X8_UINT = 231, - PIPE_FORMAT_R8G8B8X8_SINT = 232, - PIPE_FORMAT_B10G10R10X2_UNORM = 233, - PIPE_FORMAT_R16G16B16X16_UNORM = 234, - PIPE_FORMAT_R16G16B16X16_SNORM = 235, - PIPE_FORMAT_R16G16B16X16_FLOAT = 236, - PIPE_FORMAT_R16G16B16X16_UINT = 237, - PIPE_FORMAT_R16G16B16X16_SINT = 238, - PIPE_FORMAT_R32G32B32X32_FLOAT = 239, - PIPE_FORMAT_R32G32B32X32_UINT = 240, - PIPE_FORMAT_R32G32B32X32_SINT = 241, - - PIPE_FORMAT_R8A8_SNORM = 242, - PIPE_FORMAT_R16A16_UNORM = 243, - PIPE_FORMAT_R16A16_SNORM = 244, - PIPE_FORMAT_R16A16_FLOAT = 245, - PIPE_FORMAT_R32A32_FLOAT = 246, - PIPE_FORMAT_R8A8_UINT = 247, - PIPE_FORMAT_R8A8_SINT = 248, - PIPE_FORMAT_R16A16_UINT = 249, - PIPE_FORMAT_R16A16_SINT = 250, - PIPE_FORMAT_R32A32_UINT = 251, - PIPE_FORMAT_R32A32_SINT = 252, - PIPE_FORMAT_R10G10B10A2_UINT = 253, - - PIPE_FORMAT_B5G6R5_SRGB = 254, - - PIPE_FORMAT_BPTC_RGBA_UNORM = 255, - PIPE_FORMAT_BPTC_SRGBA = 256, - PIPE_FORMAT_BPTC_RGB_FLOAT = 257, - PIPE_FORMAT_BPTC_RGB_UFLOAT = 258, - - PIPE_FORMAT_A8L8_UNORM = 259, - PIPE_FORMAT_A8L8_SNORM = 260, - PIPE_FORMAT_A8L8_SRGB = 261, - PIPE_FORMAT_A16L16_UNORM = 262, - - PIPE_FORMAT_G8R8_UNORM = 263, - PIPE_FORMAT_G8R8_SNORM = 264, - PIPE_FORMAT_G16R16_UNORM = 265, - PIPE_FORMAT_G16R16_SNORM = 266, - - PIPE_FORMAT_A8B8G8R8_SNORM = 267, - PIPE_FORMAT_X8B8G8R8_SNORM = 268, - - PIPE_FORMAT_ETC2_RGB8 = 269, - PIPE_FORMAT_ETC2_SRGB8 = 270, - PIPE_FORMAT_ETC2_RGB8A1 = 271, - PIPE_FORMAT_ETC2_SRGB8A1 = 272, - PIPE_FORMAT_ETC2_RGBA8 = 273, - PIPE_FORMAT_ETC2_SRGBA8 = 274, - PIPE_FORMAT_ETC2_R11_UNORM = 275, - PIPE_FORMAT_ETC2_R11_SNORM = 276, - PIPE_FORMAT_ETC2_RG11_UNORM = 277, - PIPE_FORMAT_ETC2_RG11_SNORM = 278, - - PIPE_FORMAT_ASTC_4x4 = 279, - PIPE_FORMAT_ASTC_5x4 = 280, - PIPE_FORMAT_ASTC_5x5 = 281, - PIPE_FORMAT_ASTC_6x5 = 282, - PIPE_FORMAT_ASTC_6x6 = 283, - PIPE_FORMAT_ASTC_8x5 = 284, - PIPE_FORMAT_ASTC_8x6 = 285, - PIPE_FORMAT_ASTC_8x8 = 286, - PIPE_FORMAT_ASTC_10x5 = 287, - PIPE_FORMAT_ASTC_10x6 = 288, - PIPE_FORMAT_ASTC_10x8 = 289, - PIPE_FORMAT_ASTC_10x10 = 290, - PIPE_FORMAT_ASTC_12x10 = 291, - PIPE_FORMAT_ASTC_12x12 = 292, - - PIPE_FORMAT_ASTC_4x4_SRGB = 293, - PIPE_FORMAT_ASTC_5x4_SRGB = 294, - PIPE_FORMAT_ASTC_5x5_SRGB = 295, - PIPE_FORMAT_ASTC_6x5_SRGB = 296, - PIPE_FORMAT_ASTC_6x6_SRGB = 297, - PIPE_FORMAT_ASTC_8x5_SRGB = 298, - PIPE_FORMAT_ASTC_8x6_SRGB = 299, - PIPE_FORMAT_ASTC_8x8_SRGB = 300, - PIPE_FORMAT_ASTC_10x5_SRGB = 301, - PIPE_FORMAT_ASTC_10x6_SRGB = 302, - PIPE_FORMAT_ASTC_10x8_SRGB = 303, - PIPE_FORMAT_ASTC_10x10_SRGB = 304, - PIPE_FORMAT_ASTC_12x10_SRGB = 305, - PIPE_FORMAT_ASTC_12x12_SRGB = 306, - - PIPE_FORMAT_P016 = 307, - - PIPE_FORMAT_R10G10B10X2_UNORM = 308, - PIPE_FORMAT_A1B5G5R5_UNORM = 309, - PIPE_FORMAT_X1B5G5R5_UNORM = 310, - PIPE_FORMAT_A4B4G4R4_UNORM = 311, - - PIPE_FORMAT_R8_SRGB = 312, - - PIPE_FORMAT_COUNT -}; +#define PIPE_FORMAT_NONE VIRGL_FORMAT_NONE +#define PIPE_FORMAT_B8G8R8A8_UNORM VIRGL_FORMAT_B8G8R8A8_UNORM +#define PIPE_FORMAT_B8G8R8X8_UNORM VIRGL_FORMAT_B8G8R8X8_UNORM +#define PIPE_FORMAT_A8R8G8B8_UNORM VIRGL_FORMAT_A8R8G8B8_UNORM +#define PIPE_FORMAT_X8R8G8B8_UNORM VIRGL_FORMAT_X8R8G8B8_UNORM +#define PIPE_FORMAT_B5G5R5A1_UNORM VIRGL_FORMAT_B5G5R5A1_UNORM +#define PIPE_FORMAT_B4G4R4A4_UNORM VIRGL_FORMAT_B4G4R4A4_UNORM +#define PIPE_FORMAT_B5G6R5_UNORM VIRGL_FORMAT_B5G6R5_UNORM +#define PIPE_FORMAT_R10G10B10A2_UNORM VIRGL_FORMAT_R10G10B10A2_UNORM +#define PIPE_FORMAT_L8_UNORM VIRGL_FORMAT_L8_UNORM /**< ubyte luminance */ +#define PIPE_FORMAT_A8_UNORM VIRGL_FORMAT_A8_UNORM /**< ubyte alpha */ +#define PIPE_FORMAT_I8_UNORM VIRGL_FORMAT_I8_UNORM /**< ubyte intensity */ +#define PIPE_FORMAT_L8A8_UNORM VIRGL_FORMAT_L8A8_UNORM /**< ubyte alpha, luminance */ +#define PIPE_FORMAT_L16_UNORM VIRGL_FORMAT_L16_UNORM /**< ushort luminance */ +#define PIPE_FORMAT_UYVY VIRGL_FORMAT_UYVY +#define PIPE_FORMAT_YUYV VIRGL_FORMAT_YUYV +#define PIPE_FORMAT_Z16_UNORM VIRGL_FORMAT_Z16_UNORM +#define PIPE_FORMAT_Z32_UNORM VIRGL_FORMAT_Z32_UNORM +#define PIPE_FORMAT_Z32_FLOAT VIRGL_FORMAT_Z32_FLOAT +#define PIPE_FORMAT_Z24_UNORM_S8_UINT VIRGL_FORMAT_Z24_UNORM_S8_UINT +#define PIPE_FORMAT_S8_UINT_Z24_UNORM VIRGL_FORMAT_S8_UINT_Z24_UNORM +#define PIPE_FORMAT_Z24X8_UNORM VIRGL_FORMAT_Z24X8_UNORM +#define PIPE_FORMAT_X8Z24_UNORM VIRGL_FORMAT_X8Z24_UNORM +#define PIPE_FORMAT_S8_UINT VIRGL_FORMAT_S8_UINT /**< ubyte stencil */ +#define PIPE_FORMAT_R64_FLOAT VIRGL_FORMAT_R64_FLOAT +#define PIPE_FORMAT_R64G64_FLOAT VIRGL_FORMAT_R64G64_FLOAT +#define PIPE_FORMAT_R64G64B64_FLOAT VIRGL_FORMAT_R64G64B64_FLOAT +#define PIPE_FORMAT_R64G64B64A64_FLOAT VIRGL_FORMAT_R64G64B64A64_FLOAT +#define PIPE_FORMAT_R32_FLOAT VIRGL_FORMAT_R32_FLOAT +#define PIPE_FORMAT_R32G32_FLOAT VIRGL_FORMAT_R32G32_FLOAT +#define PIPE_FORMAT_R32G32B32_FLOAT VIRGL_FORMAT_R32G32B32_FLOAT +#define PIPE_FORMAT_R32G32B32A32_FLOAT VIRGL_FORMAT_R32G32B32A32_FLOAT +#define PIPE_FORMAT_R32_UNORM VIRGL_FORMAT_R32_UNORM +#define PIPE_FORMAT_R32G32_UNORM VIRGL_FORMAT_R32G32_UNORM +#define PIPE_FORMAT_R32G32B32_UNORM VIRGL_FORMAT_R32G32B32_UNORM +#define PIPE_FORMAT_R32G32B32A32_UNORM VIRGL_FORMAT_R32G32B32A32_UNORM +#define PIPE_FORMAT_R32_USCALED VIRGL_FORMAT_R32_USCALED +#define PIPE_FORMAT_R32G32_USCALED VIRGL_FORMAT_R32G32_USCALED +#define PIPE_FORMAT_R32G32B32_USCALED VIRGL_FORMAT_R32G32B32_USCALED +#define PIPE_FORMAT_R32G32B32A32_USCALED VIRGL_FORMAT_R32G32B32A32_USCALED +#define PIPE_FORMAT_R32_SNORM VIRGL_FORMAT_R32_SNORM +#define PIPE_FORMAT_R32G32_SNORM VIRGL_FORMAT_R32G32_SNORM +#define PIPE_FORMAT_R32G32B32_SNORM VIRGL_FORMAT_R32G32B32_SNORM +#define PIPE_FORMAT_R32G32B32A32_SNORM VIRGL_FORMAT_R32G32B32A32_SNORM +#define PIPE_FORMAT_R32_SSCALED VIRGL_FORMAT_R32_SSCALED +#define PIPE_FORMAT_R32G32_SSCALED VIRGL_FORMAT_R32G32_SSCALED +#define PIPE_FORMAT_R32G32B32_SSCALED VIRGL_FORMAT_R32G32B32_SSCALED +#define PIPE_FORMAT_R32G32B32A32_SSCALED VIRGL_FORMAT_R32G32B32A32_SSCALED +#define PIPE_FORMAT_R16_UNORM VIRGL_FORMAT_R16_UNORM +#define PIPE_FORMAT_R16G16_UNORM VIRGL_FORMAT_R16G16_UNORM +#define PIPE_FORMAT_R16G16B16_UNORM VIRGL_FORMAT_R16G16B16_UNORM +#define PIPE_FORMAT_R16G16B16A16_UNORM VIRGL_FORMAT_R16G16B16A16_UNORM +#define PIPE_FORMAT_R16_USCALED VIRGL_FORMAT_R16_USCALED +#define PIPE_FORMAT_R16G16_USCALED VIRGL_FORMAT_R16G16_USCALED +#define PIPE_FORMAT_R16G16B16_USCALED VIRGL_FORMAT_R16G16B16_USCALED +#define PIPE_FORMAT_R16G16B16A16_USCALED VIRGL_FORMAT_R16G16B16A16_USCALED +#define PIPE_FORMAT_R16_SNORM VIRGL_FORMAT_R16_SNORM +#define PIPE_FORMAT_R16G16_SNORM VIRGL_FORMAT_R16G16_SNORM +#define PIPE_FORMAT_R16G16B16_SNORM VIRGL_FORMAT_R16G16B16_SNORM +#define PIPE_FORMAT_R16G16B16A16_SNORM VIRGL_FORMAT_R16G16B16A16_SNORM +#define PIPE_FORMAT_R16_SSCALED VIRGL_FORMAT_R16_SSCALED +#define PIPE_FORMAT_R16G16_SSCALED VIRGL_FORMAT_R16G16_SSCALED +#define PIPE_FORMAT_R16G16B16_SSCALED VIRGL_FORMAT_R16G16B16_SSCALED +#define PIPE_FORMAT_R16G16B16A16_SSCALED VIRGL_FORMAT_R16G16B16A16_SSCALED +#define PIPE_FORMAT_R8_UNORM VIRGL_FORMAT_R8_UNORM +#define PIPE_FORMAT_R8G8_UNORM VIRGL_FORMAT_R8G8_UNORM +#define PIPE_FORMAT_R8G8B8_UNORM VIRGL_FORMAT_R8G8B8_UNORM +#define PIPE_FORMAT_R8G8B8A8_UNORM VIRGL_FORMAT_R8G8B8A8_UNORM +#define PIPE_FORMAT_X8B8G8R8_UNORM VIRGL_FORMAT_X8B8G8R8_UNORM +#define PIPE_FORMAT_R8_USCALED VIRGL_FORMAT_R8_USCALED +#define PIPE_FORMAT_R8G8_USCALED VIRGL_FORMAT_R8G8_USCALED +#define PIPE_FORMAT_R8G8B8_USCALED VIRGL_FORMAT_R8G8B8_USCALED +#define PIPE_FORMAT_R8G8B8A8_USCALED VIRGL_FORMAT_R8G8B8A8_USCALED +#define PIPE_FORMAT_R8_SNORM VIRGL_FORMAT_R8_SNORM +#define PIPE_FORMAT_R8G8_SNORM VIRGL_FORMAT_R8G8_SNORM +#define PIPE_FORMAT_R8G8B8_SNORM VIRGL_FORMAT_R8G8B8_SNORM +#define PIPE_FORMAT_R8G8B8A8_SNORM VIRGL_FORMAT_R8G8B8A8_SNORM +#define PIPE_FORMAT_R8_SSCALED VIRGL_FORMAT_R8_SSCALED +#define PIPE_FORMAT_R8G8_SSCALED VIRGL_FORMAT_R8G8_SSCALED +#define PIPE_FORMAT_R8G8B8_SSCALED VIRGL_FORMAT_R8G8B8_SSCALED +#define PIPE_FORMAT_R8G8B8A8_SSCALED VIRGL_FORMAT_R8G8B8A8_SSCALED +#define PIPE_FORMAT_R32_FIXED VIRGL_FORMAT_R32_FIXED +#define PIPE_FORMAT_R32G32_FIXED VIRGL_FORMAT_R32G32_FIXED +#define PIPE_FORMAT_R32G32B32_FIXED VIRGL_FORMAT_R32G32B32_FIXED +#define PIPE_FORMAT_R32G32B32A32_FIXED VIRGL_FORMAT_R32G32B32A32_FIXED +#define PIPE_FORMAT_R16_FLOAT VIRGL_FORMAT_R16_FLOAT +#define PIPE_FORMAT_R16G16_FLOAT VIRGL_FORMAT_R16G16_FLOAT +#define PIPE_FORMAT_R16G16B16_FLOAT VIRGL_FORMAT_R16G16B16_FLOAT +#define PIPE_FORMAT_R16G16B16A16_FLOAT VIRGL_FORMAT_R16G16B16A16_FLOAT + +/* sRGB formats */ +#define PIPE_FORMAT_L8_SRGB VIRGL_FORMAT_L8_SRGB +#define PIPE_FORMAT_L8A8_SRGB VIRGL_FORMAT_L8A8_SRGB +#define PIPE_FORMAT_R8G8B8_SRGB VIRGL_FORMAT_R8G8B8_SRGB +#define PIPE_FORMAT_A8B8G8R8_SRGB VIRGL_FORMAT_A8B8G8R8_SRGB +#define PIPE_FORMAT_X8B8G8R8_SRGB VIRGL_FORMAT_X8B8G8R8_SRGB +#define PIPE_FORMAT_B8G8R8A8_SRGB VIRGL_FORMAT_B8G8R8A8_SRGB +#define PIPE_FORMAT_B8G8R8X8_SRGB VIRGL_FORMAT_B8G8R8X8_SRGB +#define PIPE_FORMAT_A8R8G8B8_SRGB VIRGL_FORMAT_A8R8G8B8_SRGB +#define PIPE_FORMAT_X8R8G8B8_SRGB VIRGL_FORMAT_X8R8G8B8_SRGB +#define PIPE_FORMAT_R8G8B8A8_SRGB VIRGL_FORMAT_R8G8B8A8_SRGB + +/* compressed formats */ +#define PIPE_FORMAT_DXT1_RGB VIRGL_FORMAT_DXT1_RGB +#define PIPE_FORMAT_DXT1_RGBA VIRGL_FORMAT_DXT1_RGBA +#define PIPE_FORMAT_DXT3_RGBA VIRGL_FORMAT_DXT3_RGBA +#define PIPE_FORMAT_DXT5_RGBA VIRGL_FORMAT_DXT5_RGBA + +/* sRGB, compressed */ +#define PIPE_FORMAT_DXT1_SRGB VIRGL_FORMAT_DXT1_SRGB +#define PIPE_FORMAT_DXT1_SRGBA VIRGL_FORMAT_DXT1_SRGBA +#define PIPE_FORMAT_DXT3_SRGBA VIRGL_FORMAT_DXT3_SRGBA +#define PIPE_FORMAT_DXT5_SRGBA VIRGL_FORMAT_DXT5_SRGBA + +/* rgtc compressed */ +#define PIPE_FORMAT_RGTC1_UNORM VIRGL_FORMAT_RGTC1_UNORM +#define PIPE_FORMAT_RGTC1_SNORM VIRGL_FORMAT_RGTC1_SNORM +#define PIPE_FORMAT_RGTC2_UNORM VIRGL_FORMAT_RGTC2_UNORM +#define PIPE_FORMAT_RGTC2_SNORM VIRGL_FORMAT_RGTC2_SNORM + +#define PIPE_FORMAT_R8G8_B8G8_UNORM VIRGL_FORMAT_R8G8_B8G8_UNORM +#define PIPE_FORMAT_G8R8_G8B8_UNORM VIRGL_FORMAT_G8R8_G8B8_UNORM + +/* mixed formats */ +#define PIPE_FORMAT_R8SG8SB8UX8U_NORM VIRGL_FORMAT_R8SG8SB8UX8U_NORM +#define PIPE_FORMAT_R5SG5SB6U_NORM VIRGL_FORMAT_R5SG5SB6U_NORM + +/* TODO: re-order these */ +#define PIPE_FORMAT_A8B8G8R8_UNORM VIRGL_FORMAT_A8B8G8R8_UNORM +#define PIPE_FORMAT_B5G5R5X1_UNORM VIRGL_FORMAT_B5G5R5X1_UNORM +#define PIPE_FORMAT_R10G10B10A2_USCALED VIRGL_FORMAT_R10G10B10A2_USCALED +#define PIPE_FORMAT_R11G11B10_FLOAT VIRGL_FORMAT_R11G11B10_FLOAT +#define PIPE_FORMAT_R9G9B9E5_FLOAT VIRGL_FORMAT_R9G9B9E5_FLOAT +#define PIPE_FORMAT_Z32_FLOAT_S8X24_UINT VIRGL_FORMAT_Z32_FLOAT_S8X24_UINT +#define PIPE_FORMAT_R1_UNORM VIRGL_FORMAT_R1_UNORM +#define PIPE_FORMAT_R10G10B10X2_USCALED VIRGL_FORMAT_R10G10B10X2_USCALED +#define PIPE_FORMAT_R10G10B10X2_SNORM VIRGL_FORMAT_R10G10B10X2_SNORM +#define PIPE_FORMAT_L4A4_UNORM VIRGL_FORMAT_L4A4_UNORM +#define PIPE_FORMAT_B10G10R10A2_UNORM VIRGL_FORMAT_B10G10R10A2_UNORM +#define PIPE_FORMAT_R10SG10SB10SA2U_NORM VIRGL_FORMAT_R10SG10SB10SA2U_NORM +#define PIPE_FORMAT_R8G8Bx_SNORM VIRGL_FORMAT_R8G8Bx_SNORM +#define PIPE_FORMAT_R8G8B8X8_UNORM VIRGL_FORMAT_R8G8B8X8_UNORM +#define PIPE_FORMAT_B4G4R4X4_UNORM VIRGL_FORMAT_B4G4R4X4_UNORM + +/* some stencil samplers formats */ +#define PIPE_FORMAT_X24S8_UINT VIRGL_FORMAT_X24S8_UINT +#define PIPE_FORMAT_S8X24_UINT VIRGL_FORMAT_S8X24_UINT +#define PIPE_FORMAT_X32_S8X24_UINT VIRGL_FORMAT_X32_S8X24_UINT + +#define PIPE_FORMAT_B2G3R3_UNORM VIRGL_FORMAT_B2G3R3_UNORM +#define PIPE_FORMAT_L16A16_UNORM VIRGL_FORMAT_L16A16_UNORM +#define PIPE_FORMAT_A16_UNORM VIRGL_FORMAT_A16_UNORM +#define PIPE_FORMAT_I16_UNORM VIRGL_FORMAT_I16_UNORM + +#define PIPE_FORMAT_LATC1_UNORM VIRGL_FORMAT_LATC1_UNORM +#define PIPE_FORMAT_LATC1_SNORM VIRGL_FORMAT_LATC1_SNORM +#define PIPE_FORMAT_LATC2_UNORM VIRGL_FORMAT_LATC2_UNORM +#define PIPE_FORMAT_LATC2_SNORM VIRGL_FORMAT_LATC2_SNORM + +#define PIPE_FORMAT_A8_SNORM VIRGL_FORMAT_A8_SNORM +#define PIPE_FORMAT_L8_SNORM VIRGL_FORMAT_L8_SNORM +#define PIPE_FORMAT_L8A8_SNORM VIRGL_FORMAT_L8A8_SNORM +#define PIPE_FORMAT_I8_SNORM VIRGL_FORMAT_I8_SNORM +#define PIPE_FORMAT_A16_SNORM VIRGL_FORMAT_A16_SNORM +#define PIPE_FORMAT_L16_SNORM VIRGL_FORMAT_L16_SNORM +#define PIPE_FORMAT_L16A16_SNORM VIRGL_FORMAT_L16A16_SNORM +#define PIPE_FORMAT_I16_SNORM VIRGL_FORMAT_I16_SNORM + +#define PIPE_FORMAT_A16_FLOAT VIRGL_FORMAT_A16_FLOAT +#define PIPE_FORMAT_L16_FLOAT VIRGL_FORMAT_L16_FLOAT +#define PIPE_FORMAT_L16A16_FLOAT VIRGL_FORMAT_L16A16_FLOAT +#define PIPE_FORMAT_I16_FLOAT VIRGL_FORMAT_I16_FLOAT +#define PIPE_FORMAT_A32_FLOAT VIRGL_FORMAT_A32_FLOAT +#define PIPE_FORMAT_L32_FLOAT VIRGL_FORMAT_L32_FLOAT +#define PIPE_FORMAT_L32A32_FLOAT VIRGL_FORMAT_L32A32_FLOAT +#define PIPE_FORMAT_I32_FLOAT VIRGL_FORMAT_I32_FLOAT + +#define PIPE_FORMAT_YV12 VIRGL_FORMAT_YV12 +#define PIPE_FORMAT_YV16 VIRGL_FORMAT_YV16 +#define PIPE_FORMAT_IYUV VIRGL_FORMAT_IYUV /**< aka I420 */ +#define PIPE_FORMAT_NV12 VIRGL_FORMAT_NV12 +#define PIPE_FORMAT_NV21 VIRGL_FORMAT_NV21 + +#define PIPE_FORMAT_A4R4_UNORM VIRGL_FORMAT_A4R4_UNORM +#define PIPE_FORMAT_R4A4_UNORM VIRGL_FORMAT_R4A4_UNORM +#define PIPE_FORMAT_R8A8_UNORM VIRGL_FORMAT_R8A8_UNORM +#define PIPE_FORMAT_A8R8_UNORM VIRGL_FORMAT_A8R8_UNORM + +#define PIPE_FORMAT_R10G10B10A2_SSCALED VIRGL_FORMAT_R10G10B10A2_SSCALED +#define PIPE_FORMAT_R10G10B10A2_SNORM VIRGL_FORMAT_R10G10B10A2_SNORM + +#define PIPE_FORMAT_B10G10R10A2_USCALED VIRGL_FORMAT_B10G10R10A2_USCALED +#define PIPE_FORMAT_B10G10R10A2_SSCALED VIRGL_FORMAT_B10G10R10A2_SSCALED +#define PIPE_FORMAT_B10G10R10A2_SNORM VIRGL_FORMAT_B10G10R10A2_SNORM + +#define PIPE_FORMAT_R8_UINT VIRGL_FORMAT_R8_UINT +#define PIPE_FORMAT_R8G8_UINT VIRGL_FORMAT_R8G8_UINT +#define PIPE_FORMAT_R8G8B8_UINT VIRGL_FORMAT_R8G8B8_UINT +#define PIPE_FORMAT_R8G8B8A8_UINT VIRGL_FORMAT_R8G8B8A8_UINT + +#define PIPE_FORMAT_R8_SINT VIRGL_FORMAT_R8_SINT +#define PIPE_FORMAT_R8G8_SINT VIRGL_FORMAT_R8G8_SINT +#define PIPE_FORMAT_R8G8B8_SINT VIRGL_FORMAT_R8G8B8_SINT +#define PIPE_FORMAT_R8G8B8A8_SINT VIRGL_FORMAT_R8G8B8A8_SINT + +#define PIPE_FORMAT_R16_UINT VIRGL_FORMAT_R16_UINT +#define PIPE_FORMAT_R16G16_UINT VIRGL_FORMAT_R16G16_UINT +#define PIPE_FORMAT_R16G16B16_UINT VIRGL_FORMAT_R16G16B16_UINT +#define PIPE_FORMAT_R16G16B16A16_UINT VIRGL_FORMAT_R16G16B16A16_UINT + +#define PIPE_FORMAT_R16_SINT VIRGL_FORMAT_R16_SINT +#define PIPE_FORMAT_R16G16_SINT VIRGL_FORMAT_R16G16_SINT +#define PIPE_FORMAT_R16G16B16_SINT VIRGL_FORMAT_R16G16B16_SINT +#define PIPE_FORMAT_R16G16B16A16_SINT VIRGL_FORMAT_R16G16B16A16_SINT + +#define PIPE_FORMAT_R32_UINT VIRGL_FORMAT_R32_UINT +#define PIPE_FORMAT_R32G32_UINT VIRGL_FORMAT_R32G32_UINT +#define PIPE_FORMAT_R32G32B32_UINT VIRGL_FORMAT_R32G32B32_UINT +#define PIPE_FORMAT_R32G32B32A32_UINT VIRGL_FORMAT_R32G32B32A32_UINT + +#define PIPE_FORMAT_R32_SINT VIRGL_FORMAT_R32_SINT +#define PIPE_FORMAT_R32G32_SINT VIRGL_FORMAT_R32G32_SINT +#define PIPE_FORMAT_R32G32B32_SINT VIRGL_FORMAT_R32G32B32_SINT +#define PIPE_FORMAT_R32G32B32A32_SINT VIRGL_FORMAT_R32G32B32A32_SINT + +#define PIPE_FORMAT_A8_UINT VIRGL_FORMAT_A8_UINT +#define PIPE_FORMAT_I8_UINT VIRGL_FORMAT_I8_UINT +#define PIPE_FORMAT_L8_UINT VIRGL_FORMAT_L8_UINT +#define PIPE_FORMAT_L8A8_UINT VIRGL_FORMAT_L8A8_UINT + +#define PIPE_FORMAT_A8_SINT VIRGL_FORMAT_A8_SINT +#define PIPE_FORMAT_I8_SINT VIRGL_FORMAT_I8_SINT +#define PIPE_FORMAT_L8_SINT VIRGL_FORMAT_L8_SINT +#define PIPE_FORMAT_L8A8_SINT VIRGL_FORMAT_L8A8_SINT + +#define PIPE_FORMAT_A16_UINT VIRGL_FORMAT_A16_UINT +#define PIPE_FORMAT_I16_UINT VIRGL_FORMAT_I16_UINT +#define PIPE_FORMAT_L16_UINT VIRGL_FORMAT_L16_UINT +#define PIPE_FORMAT_L16A16_UINT VIRGL_FORMAT_L16A16_UINT + +#define PIPE_FORMAT_A16_SINT VIRGL_FORMAT_A16_SINT +#define PIPE_FORMAT_I16_SINT VIRGL_FORMAT_I16_SINT +#define PIPE_FORMAT_L16_SINT VIRGL_FORMAT_L16_SINT +#define PIPE_FORMAT_L16A16_SINT VIRGL_FORMAT_L16A16_SINT + +#define PIPE_FORMAT_A32_UINT VIRGL_FORMAT_A32_UINT +#define PIPE_FORMAT_I32_UINT VIRGL_FORMAT_I32_UINT +#define PIPE_FORMAT_L32_UINT VIRGL_FORMAT_L32_UINT +#define PIPE_FORMAT_L32A32_UINT VIRGL_FORMAT_L32A32_UINT + +#define PIPE_FORMAT_A32_SINT VIRGL_FORMAT_A32_SINT +#define PIPE_FORMAT_I32_SINT VIRGL_FORMAT_I32_SINT +#define PIPE_FORMAT_L32_SINT VIRGL_FORMAT_L32_SINT +#define PIPE_FORMAT_L32A32_SINT VIRGL_FORMAT_L32A32_SINT + +#define PIPE_FORMAT_B10G10R10A2_UINT VIRGL_FORMAT_B10G10R10A2_UINT + +#define PIPE_FORMAT_ETC1_RGB8 VIRGL_FORMAT_ETC1_RGB8 + +#define PIPE_FORMAT_R8G8_R8B8_UNORM VIRGL_FORMAT_R8G8_R8B8_UNORM +#define PIPE_FORMAT_G8R8_B8R8_UNORM VIRGL_FORMAT_G8R8_B8R8_UNORM + +#define PIPE_FORMAT_R8G8B8X8_SNORM VIRGL_FORMAT_R8G8B8X8_SNORM +#define PIPE_FORMAT_R8G8B8X8_SRGB VIRGL_FORMAT_R8G8B8X8_SRGB +#define PIPE_FORMAT_R8G8B8X8_UINT VIRGL_FORMAT_R8G8B8X8_UINT +#define PIPE_FORMAT_R8G8B8X8_SINT VIRGL_FORMAT_R8G8B8X8_SINT +#define PIPE_FORMAT_B10G10R10X2_UNORM VIRGL_FORMAT_B10G10R10X2_UNORM +#define PIPE_FORMAT_R16G16B16X16_UNORM VIRGL_FORMAT_R16G16B16X16_UNORM +#define PIPE_FORMAT_R16G16B16X16_SNORM VIRGL_FORMAT_R16G16B16X16_SNORM +#define PIPE_FORMAT_R16G16B16X16_FLOAT VIRGL_FORMAT_R16G16B16X16_FLOAT +#define PIPE_FORMAT_R16G16B16X16_UINT VIRGL_FORMAT_R16G16B16X16_UINT +#define PIPE_FORMAT_R16G16B16X16_SINT VIRGL_FORMAT_R16G16B16X16_SINT +#define PIPE_FORMAT_R32G32B32X32_FLOAT VIRGL_FORMAT_R32G32B32X32_FLOAT +#define PIPE_FORMAT_R32G32B32X32_UINT VIRGL_FORMAT_R32G32B32X32_UINT +#define PIPE_FORMAT_R32G32B32X32_SINT VIRGL_FORMAT_R32G32B32X32_SINT + +#define PIPE_FORMAT_R8A8_SNORM VIRGL_FORMAT_R8A8_SNORM +#define PIPE_FORMAT_R16A16_UNORM VIRGL_FORMAT_R16A16_UNORM +#define PIPE_FORMAT_R16A16_SNORM VIRGL_FORMAT_R16A16_SNORM +#define PIPE_FORMAT_R16A16_FLOAT VIRGL_FORMAT_R16A16_FLOAT +#define PIPE_FORMAT_R32A32_FLOAT VIRGL_FORMAT_R32A32_FLOAT +#define PIPE_FORMAT_R8A8_UINT VIRGL_FORMAT_R8A8_UINT +#define PIPE_FORMAT_R8A8_SINT VIRGL_FORMAT_R8A8_SINT +#define PIPE_FORMAT_R16A16_UINT VIRGL_FORMAT_R16A16_UINT +#define PIPE_FORMAT_R16A16_SINT VIRGL_FORMAT_R16A16_SINT +#define PIPE_FORMAT_R32A32_UINT VIRGL_FORMAT_R32A32_UINT +#define PIPE_FORMAT_R32A32_SINT VIRGL_FORMAT_R32A32_SINT +#define PIPE_FORMAT_R10G10B10A2_UINT VIRGL_FORMAT_R10G10B10A2_UINT + +#define PIPE_FORMAT_B5G6R5_SRGB VIRGL_FORMAT_B5G6R5_SRGB + +#define PIPE_FORMAT_BPTC_RGBA_UNORM VIRGL_FORMAT_BPTC_RGBA_UNORM +#define PIPE_FORMAT_BPTC_SRGBA VIRGL_FORMAT_BPTC_SRGBA +#define PIPE_FORMAT_BPTC_RGB_FLOAT VIRGL_FORMAT_BPTC_RGB_FLOAT +#define PIPE_FORMAT_BPTC_RGB_UFLOAT VIRGL_FORMAT_BPTC_RGB_UFLOAT + +#define PIPE_FORMAT_A8L8_UNORM VIRGL_FORMAT_A8L8_UNORM +#define PIPE_FORMAT_A8L8_SNORM VIRGL_FORMAT_A8L8_SNORM +#define PIPE_FORMAT_A8L8_SRGB VIRGL_FORMAT_A8L8_SRGB +#define PIPE_FORMAT_A16L16_UNORM VIRGL_FORMAT_A16L16_UNORM + +#define PIPE_FORMAT_G8R8_UNORM VIRGL_FORMAT_G8R8_UNORM +#define PIPE_FORMAT_G8R8_SNORM VIRGL_FORMAT_G8R8_SNORM +#define PIPE_FORMAT_G16R16_UNORM VIRGL_FORMAT_G16R16_UNORM +#define PIPE_FORMAT_G16R16_SNORM VIRGL_FORMAT_G16R16_SNORM + +#define PIPE_FORMAT_A8B8G8R8_SNORM VIRGL_FORMAT_A8B8G8R8_SNORM +#define PIPE_FORMAT_X8B8G8R8_SNORM VIRGL_FORMAT_X8B8G8R8_SNORM + +#define PIPE_FORMAT_ETC2_RGB8 VIRGL_FORMAT_ETC2_RGB8 +#define PIPE_FORMAT_ETC2_SRGB8 VIRGL_FORMAT_ETC2_SRGB8 +#define PIPE_FORMAT_ETC2_RGB8A1 VIRGL_FORMAT_ETC2_RGB8A1 +#define PIPE_FORMAT_ETC2_SRGB8A1 VIRGL_FORMAT_ETC2_SRGB8A1 +#define PIPE_FORMAT_ETC2_RGBA8 VIRGL_FORMAT_ETC2_RGBA8 +#define PIPE_FORMAT_ETC2_SRGBA8 VIRGL_FORMAT_ETC2_SRGBA8 +#define PIPE_FORMAT_ETC2_R11_UNORM VIRGL_FORMAT_ETC2_R11_UNORM +#define PIPE_FORMAT_ETC2_R11_SNORM VIRGL_FORMAT_ETC2_R11_SNORM +#define PIPE_FORMAT_ETC2_RG11_UNORM VIRGL_FORMAT_ETC2_RG11_UNORM +#define PIPE_FORMAT_ETC2_RG11_SNORM VIRGL_FORMAT_ETC2_RG11_SNORM + +#define PIPE_FORMAT_ASTC_4x4 VIRGL_FORMAT_ASTC_4x4 +#define PIPE_FORMAT_ASTC_5x4 VIRGL_FORMAT_ASTC_5x4 +#define PIPE_FORMAT_ASTC_5x5 VIRGL_FORMAT_ASTC_5x5 +#define PIPE_FORMAT_ASTC_6x5 VIRGL_FORMAT_ASTC_6x5 +#define PIPE_FORMAT_ASTC_6x6 VIRGL_FORMAT_ASTC_6x6 +#define PIPE_FORMAT_ASTC_8x5 VIRGL_FORMAT_ASTC_8x5 +#define PIPE_FORMAT_ASTC_8x6 VIRGL_FORMAT_ASTC_8x6 +#define PIPE_FORMAT_ASTC_8x8 VIRGL_FORMAT_ASTC_8x8 +#define PIPE_FORMAT_ASTC_10x5 VIRGL_FORMAT_ASTC_10x5 +#define PIPE_FORMAT_ASTC_10x6 VIRGL_FORMAT_ASTC_10x6 +#define PIPE_FORMAT_ASTC_10x8 VIRGL_FORMAT_ASTC_10x8 +#define PIPE_FORMAT_ASTC_10x10 VIRGL_FORMAT_ASTC_10x10 +#define PIPE_FORMAT_ASTC_12x10 VIRGL_FORMAT_ASTC_12x10 +#define PIPE_FORMAT_ASTC_12x12 VIRGL_FORMAT_ASTC_12x12 + +#define PIPE_FORMAT_ASTC_4x4_SRGB VIRGL_FORMAT_ASTC_4x4_SRGB +#define PIPE_FORMAT_ASTC_5x4_SRGB VIRGL_FORMAT_ASTC_5x4_SRGB +#define PIPE_FORMAT_ASTC_5x5_SRGB VIRGL_FORMAT_ASTC_5x5_SRGB +#define PIPE_FORMAT_ASTC_6x5_SRGB VIRGL_FORMAT_ASTC_6x5_SRGB +#define PIPE_FORMAT_ASTC_6x6_SRGB VIRGL_FORMAT_ASTC_6x6_SRGB +#define PIPE_FORMAT_ASTC_8x5_SRGB VIRGL_FORMAT_ASTC_8x5_SRGB +#define PIPE_FORMAT_ASTC_8x6_SRGB VIRGL_FORMAT_ASTC_8x6_SRGB +#define PIPE_FORMAT_ASTC_8x8_SRGB VIRGL_FORMAT_ASTC_8x8_SRGB +#define PIPE_FORMAT_ASTC_10x5_SRGB VIRGL_FORMAT_ASTC_10x5_SRGB +#define PIPE_FORMAT_ASTC_10x6_SRGB VIRGL_FORMAT_ASTC_10x6_SRGB +#define PIPE_FORMAT_ASTC_10x8_SRGB VIRGL_FORMAT_ASTC_10x8_SRGB +#define PIPE_FORMAT_ASTC_10x10_SRGB VIRGL_FORMAT_ASTC_10x10_SRGB +#define PIPE_FORMAT_ASTC_12x10_SRGB VIRGL_FORMAT_ASTC_12x10_SRGB +#define PIPE_FORMAT_ASTC_12x12_SRGB VIRGL_FORMAT_ASTC_12x12_SRGB + +#define PIPE_FORMAT_P016 VIRGL_FORMAT_P016 + +#define PIPE_FORMAT_R10G10B10X2_UNORM VIRGL_FORMAT_R10G10B10X2_UNORM +#define PIPE_FORMAT_A1B5G5R5_UNORM VIRGL_FORMAT_A1B5G5R5_UNORM +#define PIPE_FORMAT_X1B5G5R5_UNORM VIRGL_FORMAT_X1B5G5R5_UNORM +#define PIPE_FORMAT_A4B4G4R4_UNORM VIRGL_FORMAT_A4B4G4R4_UNORM + +#define PIPE_FORMAT_R8_SRGB VIRGL_FORMAT_R8_SRGB + +#define PIPE_FORMAT_COUNT VIRGL_FORMAT_MAX #if defined(PIPE_ARCH_LITTLE_ENDIAN) #define PIPE_FORMAT_RGBA8888_UNORM PIPE_FORMAT_R8G8B8A8_UNORM diff --git a/src/gallium/meson.build b/src/gallium/meson.build index d99728f..d3ae7d3 100644 --- a/src/gallium/meson.build +++ b/src/gallium/meson.build @@ -108,7 +108,7 @@ sources_libgallium = [ 'auxiliary/os/os_misc.c', ] -inc_gallium = include_directories('include', 'auxiliary', 'auxiliary/util') +inc_gallium = include_directories('include', 'auxiliary', 'auxiliary/util', ) u_format_table_c = custom_target( 'u_format_table.c', @@ -123,7 +123,7 @@ libgallium = static_library( 'gallium', [sources_libgallium, u_format_table_c], include_directories : [ - inc_gallium + inc_gallium, '..' ], )