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 <gert.wollny@collabora.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>

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)
 

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

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, '..'
    ],
 )