[Mesa-dev] [V3 PATCH 7/8] mesa: Rename XBGR MESA_FORMATs

Mark Mueller markkmueller at gmail.com
Fri Jan 17 03:53:11 PST 2014


Remove/update related comments and rename MESA_FORMAT_XBGR A Type formats
to match naming spec as follows:
 s/\bMESA_FORMAT_XBGR8888_SNORM\b/MESA_FORMAT_RGBX_SNORM8/g
 s/\bMESA_FORMAT_XBGR8888_SRGB\b/MESA_FORMAT_SRGBX_UNORM8/g
 s/\bMESA_FORMAT_XBGR8888_UINT\b/MESA_FORMAT_RGBX_UINT8/g
 s/\bMESA_FORMAT_XBGR8888_SINT\b/MESA_FORMAT_RGBX_SINT8/g
 s/\bMESA_FORMAT_XBGR16161616_UNORM\b/MESA_FORMAT_RGBX_UNORM16/g
 s/\bMESA_FORMAT_XBGR16161616_SNORM\b/MESA_FORMAT_RGBX_SNORM16/g
 s/\bMESA_FORMAT_XBGR16161616_FLOAT\b/MESA_FORMAT_RGBX_FLOAT16/g
 s/\bMESA_FORMAT_XBGR16161616_UINT\b/MESA_FORMAT_RGBX_UINT16/g
 s/\bMESA_FORMAT_XBGR16161616_SINT\b/MESA_FORMAT_RGBX_SINT16/g
 s/\bMESA_FORMAT_XBGR32323232_UNORM\b/MESA_FORMAT_RGBX_UNORM32/g
 s/\bMESA_FORMAT_XBGR32323232_SNORM\b/MESA_FORMAT_RGBX_SNORM32/g
 s/\bMESA_FORMAT_XBGR32323232_FLOAT\b/MESA_FORMAT_RGBX_FLOAT32/g
 s/\bMESA_FORMAT_XBGR32323232_UINT\b/MESA_FORMAT_RGBX_UINT32/g
 s/\bMESA_FORMAT_XBGR32323232_SINT\b/MESA_FORMAT_RGBX_SINT32/g

Signed-off-by: Mark Mueller <MarkKMueller at gmail.com>
---
 src/mesa/drivers/dri/i965/brw_surface_formats.c |  24 +++---
 src/mesa/main/format_pack.c                     |  60 +++++++-------
 src/mesa/main/format_unpack.c                   |  36 ++++-----
 src/mesa/main/formats.c                         | 100 ++++++++++++------------
 src/mesa/main/formats.h                         |  24 +++---
 src/mesa/main/texformat.c                       |  20 ++---
 src/mesa/main/texstore.c                        |  70 ++++++++---------
 src/mesa/state_tracker/st_format.c              |  48 ++++++------
 src/mesa/swrast/s_texfetch.c                    |  24 +++---
 9 files changed, 203 insertions(+), 203 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_surface_formats.c b/src/mesa/drivers/dri/i965/brw_surface_formats.c
index 2620131..f7afce2 100644
--- a/src/mesa/drivers/dri/i965/brw_surface_formats.c
+++ b/src/mesa/drivers/dri/i965/brw_surface_formats.c
@@ -507,19 +507,19 @@ brw_format_for_mesa_format(mesa_format mesa_format)
 
       [MESA_FORMAT_B4G4R4X4_UNORM] = 0,
       [MESA_FORMAT_B5G5R5X1_UNORM] = BRW_SURFACEFORMAT_B5G5R5X1_UNORM,
-      [MESA_FORMAT_XBGR8888_SNORM] = 0,
-      [MESA_FORMAT_XBGR8888_SRGB] = 0,
-      [MESA_FORMAT_XBGR8888_UINT] = 0,
-      [MESA_FORMAT_XBGR8888_SINT] = 0,
+      [MESA_FORMAT_RGBX_SNORM8] = 0,
+      [MESA_FORMAT_SRGBX_UNORM8] = 0,
+      [MESA_FORMAT_RGBX_UINT8] = 0,
+      [MESA_FORMAT_RGBX_SINT8] = 0,
       [MESA_FORMAT_B10G10R10X2_UNORM] = BRW_SURFACEFORMAT_B10G10R10X2_UNORM,
-      [MESA_FORMAT_XBGR16161616_UNORM] = BRW_SURFACEFORMAT_R16G16B16X16_UNORM,
-      [MESA_FORMAT_XBGR16161616_SNORM] = 0,
-      [MESA_FORMAT_XBGR16161616_FLOAT] = BRW_SURFACEFORMAT_R16G16B16X16_FLOAT,
-      [MESA_FORMAT_XBGR16161616_UINT] = 0,
-      [MESA_FORMAT_XBGR16161616_SINT] = 0,
-      [MESA_FORMAT_XBGR32323232_FLOAT] = BRW_SURFACEFORMAT_R32G32B32X32_FLOAT,
-      [MESA_FORMAT_XBGR32323232_UINT] = 0,
-      [MESA_FORMAT_XBGR32323232_SINT] = 0,
+      [MESA_FORMAT_RGBX_UNORM16] = BRW_SURFACEFORMAT_R16G16B16X16_UNORM,
+      [MESA_FORMAT_RGBX_SNORM16] = 0,
+      [MESA_FORMAT_RGBX_FLOAT16] = BRW_SURFACEFORMAT_R16G16B16X16_FLOAT,
+      [MESA_FORMAT_RGBX_UINT16] = 0,
+      [MESA_FORMAT_RGBX_SINT16] = 0,
+      [MESA_FORMAT_RGBX_FLOAT32] = BRW_SURFACEFORMAT_R32G32B32X32_FLOAT,
+      [MESA_FORMAT_RGBX_UINT32] = 0,
+      [MESA_FORMAT_RGBX_SINT32] = 0,
    };
    assert(mesa_format < MESA_FORMAT_COUNT);
    return table[mesa_format];
diff --git a/src/mesa/main/format_pack.c b/src/mesa/main/format_pack.c
index d80e25c..e604cd3 100644
--- a/src/mesa/main/format_pack.c
+++ b/src/mesa/main/format_pack.c
@@ -1711,7 +1711,7 @@ pack_float_XRGB1555_UNORM(const GLfloat src[4], void *dst)
 
 
 /*
- * MESA_FORMAT_XBGR8888_SNORM
+ * MESA_FORMAT_RGBX_SNORM8
  */
 
 static void
@@ -1726,7 +1726,7 @@ pack_float_XBGR8888_SNORM(const GLfloat src[4], void *dst)
 
 
 /*
- * MESA_FORMAT_XBGR8888_SRGB
+ * MESA_FORMAT_SRGBX_UNORM8
  */
 
 static void
@@ -1764,7 +1764,7 @@ pack_float_XRGB2101010_UNORM(const GLfloat src[4], void *dst)
 }
 
 
-/* MESA_FORMAT_XBGR16161616_UNORM */
+/* MESA_FORMAT_RGBX_UNORM16 */
 
 static void
 pack_ubyte_XBGR16161616_UNORM(const GLubyte src[4], void *dst)
@@ -1787,7 +1787,7 @@ pack_float_XBGR16161616_UNORM(const GLfloat src[4], void *dst)
 }
 
 
-/* MESA_FORMAT_XBGR16161616_SNORM */
+/* MESA_FORMAT_RGBX_SNORM16 */
 
 static void
 pack_float_XBGR16161616_SNORM(const GLfloat src[4], void *dst)
@@ -1800,7 +1800,7 @@ pack_float_XBGR16161616_SNORM(const GLfloat src[4], void *dst)
 }
 
 
-/* MESA_FORMAT_XBGR16161616_FLOAT */
+/* MESA_FORMAT_RGBX_FLOAT16 */
 
 static void
 pack_float_XBGR16161616_FLOAT(const GLfloat src[4], void *dst)
@@ -1812,7 +1812,7 @@ pack_float_XBGR16161616_FLOAT(const GLfloat src[4], void *dst)
    d[3] = _mesa_float_to_half(1.0);
 }
 
-/* MESA_FORMAT_XBGR32323232_FLOAT */
+/* MESA_FORMAT_RGBX_FLOAT32 */
 
 static void
 pack_float_XBGR32323232_FLOAT(const GLfloat src[4], void *dst)
@@ -2014,19 +2014,19 @@ _mesa_get_pack_ubyte_rgba_function(mesa_format format)
 
       table[MESA_FORMAT_B4G4R4X4_UNORM] = pack_ubyte_XRGB4444_UNORM;
       table[MESA_FORMAT_B5G5R5X1_UNORM] = pack_ubyte_XRGB1555_UNORM;
-      table[MESA_FORMAT_XBGR8888_SNORM] = NULL;
-      table[MESA_FORMAT_XBGR8888_SRGB] = NULL;
-      table[MESA_FORMAT_XBGR8888_UINT] = NULL;
-      table[MESA_FORMAT_XBGR8888_SINT] = NULL;
+      table[MESA_FORMAT_RGBX_SNORM8] = NULL;
+      table[MESA_FORMAT_SRGBX_UNORM8] = NULL;
+      table[MESA_FORMAT_RGBX_UINT8] = NULL;
+      table[MESA_FORMAT_RGBX_SINT8] = NULL;
       table[MESA_FORMAT_B10G10R10X2_UNORM] = pack_ubyte_XRGB2101010_UNORM;
-      table[MESA_FORMAT_XBGR16161616_UNORM] = pack_ubyte_XBGR16161616_UNORM;
-      table[MESA_FORMAT_XBGR16161616_SNORM] = NULL;
-      table[MESA_FORMAT_XBGR16161616_FLOAT] = NULL;
-      table[MESA_FORMAT_XBGR16161616_UINT] = NULL;
-      table[MESA_FORMAT_XBGR16161616_SINT] = NULL;
-      table[MESA_FORMAT_XBGR32323232_FLOAT] = NULL;
-      table[MESA_FORMAT_XBGR32323232_UINT] = NULL;
-      table[MESA_FORMAT_XBGR32323232_SINT] = NULL;
+      table[MESA_FORMAT_RGBX_UNORM16] = pack_ubyte_XBGR16161616_UNORM;
+      table[MESA_FORMAT_RGBX_SNORM16] = NULL;
+      table[MESA_FORMAT_RGBX_FLOAT16] = NULL;
+      table[MESA_FORMAT_RGBX_UINT16] = NULL;
+      table[MESA_FORMAT_RGBX_SINT16] = NULL;
+      table[MESA_FORMAT_RGBX_FLOAT32] = NULL;
+      table[MESA_FORMAT_RGBX_UINT32] = NULL;
+      table[MESA_FORMAT_RGBX_SINT32] = NULL;
 
       table[MESA_FORMAT_ABGR2101010] = pack_ubyte_ABGR2101010;
 
@@ -2174,19 +2174,19 @@ _mesa_get_pack_float_rgba_function(mesa_format format)
 
       table[MESA_FORMAT_B4G4R4X4_UNORM] = pack_float_XRGB4444_UNORM;
       table[MESA_FORMAT_B5G5R5X1_UNORM] = pack_float_XRGB1555_UNORM;
-      table[MESA_FORMAT_XBGR8888_SNORM] = pack_float_XBGR8888_SNORM;
-      table[MESA_FORMAT_XBGR8888_SRGB] = pack_float_XBGR8888_SRGB;
-      table[MESA_FORMAT_XBGR8888_UINT] = NULL;
-      table[MESA_FORMAT_XBGR8888_SINT] = NULL;
+      table[MESA_FORMAT_RGBX_SNORM8] = pack_float_XBGR8888_SNORM;
+      table[MESA_FORMAT_SRGBX_UNORM8] = pack_float_XBGR8888_SRGB;
+      table[MESA_FORMAT_RGBX_UINT8] = NULL;
+      table[MESA_FORMAT_RGBX_SINT8] = NULL;
       table[MESA_FORMAT_B10G10R10X2_UNORM] = pack_float_XRGB2101010_UNORM;
-      table[MESA_FORMAT_XBGR16161616_UNORM] = pack_float_XBGR16161616_UNORM;
-      table[MESA_FORMAT_XBGR16161616_SNORM] = pack_float_XBGR16161616_SNORM;
-      table[MESA_FORMAT_XBGR16161616_FLOAT] = pack_float_XBGR16161616_FLOAT;
-      table[MESA_FORMAT_XBGR16161616_UINT] = NULL;
-      table[MESA_FORMAT_XBGR16161616_SINT] = NULL;
-      table[MESA_FORMAT_XBGR32323232_FLOAT] = pack_float_XBGR32323232_FLOAT;
-      table[MESA_FORMAT_XBGR32323232_UINT] = NULL;
-      table[MESA_FORMAT_XBGR32323232_SINT] = NULL;
+      table[MESA_FORMAT_RGBX_UNORM16] = pack_float_XBGR16161616_UNORM;
+      table[MESA_FORMAT_RGBX_SNORM16] = pack_float_XBGR16161616_SNORM;
+      table[MESA_FORMAT_RGBX_FLOAT16] = pack_float_XBGR16161616_FLOAT;
+      table[MESA_FORMAT_RGBX_UINT16] = NULL;
+      table[MESA_FORMAT_RGBX_SINT16] = NULL;
+      table[MESA_FORMAT_RGBX_FLOAT32] = pack_float_XBGR32323232_FLOAT;
+      table[MESA_FORMAT_RGBX_UINT32] = NULL;
+      table[MESA_FORMAT_RGBX_SINT32] = NULL;
 
       table[MESA_FORMAT_ABGR2101010] = pack_float_ABGR2101010;
 
diff --git a/src/mesa/main/format_unpack.c b/src/mesa/main/format_unpack.c
index 374f7fc..5721c21 100644
--- a/src/mesa/main/format_unpack.c
+++ b/src/mesa/main/format_unpack.c
@@ -2505,19 +2505,19 @@ get_unpack_rgba_function(mesa_format format)
 
       table[MESA_FORMAT_B4G4R4X4_UNORM] = unpack_XRGB4444_UNORM;
       table[MESA_FORMAT_B5G5R5X1_UNORM] = unpack_XRGB1555_UNORM;
-      table[MESA_FORMAT_XBGR8888_SNORM] = unpack_XBGR8888_SNORM;
-      table[MESA_FORMAT_XBGR8888_SRGB] = unpack_XBGR8888_SRGB;
-      table[MESA_FORMAT_XBGR8888_UINT] = unpack_XBGR8888_UINT;
-      table[MESA_FORMAT_XBGR8888_SINT] = unpack_XBGR8888_SINT;
+      table[MESA_FORMAT_RGBX_SNORM8] = unpack_XBGR8888_SNORM;
+      table[MESA_FORMAT_SRGBX_UNORM8] = unpack_XBGR8888_SRGB;
+      table[MESA_FORMAT_RGBX_UINT8] = unpack_XBGR8888_UINT;
+      table[MESA_FORMAT_RGBX_SINT8] = unpack_XBGR8888_SINT;
       table[MESA_FORMAT_B10G10R10X2_UNORM] = unpack_XRGB2101010_UNORM;
-      table[MESA_FORMAT_XBGR16161616_UNORM] = unpack_XBGR16161616_UNORM;
-      table[MESA_FORMAT_XBGR16161616_SNORM] = unpack_XBGR16161616_SNORM;
-      table[MESA_FORMAT_XBGR16161616_FLOAT] = unpack_XBGR16161616_FLOAT;
-      table[MESA_FORMAT_XBGR16161616_UINT] = unpack_XBGR16161616_UINT;
-      table[MESA_FORMAT_XBGR16161616_SINT] = unpack_XBGR16161616_SINT;
-      table[MESA_FORMAT_XBGR32323232_FLOAT] = unpack_XBGR32323232_FLOAT;
-      table[MESA_FORMAT_XBGR32323232_UINT] = unpack_XBGR32323232_UINT;
-      table[MESA_FORMAT_XBGR32323232_SINT] = unpack_XBGR32323232_SINT;
+      table[MESA_FORMAT_RGBX_UNORM16] = unpack_XBGR16161616_UNORM;
+      table[MESA_FORMAT_RGBX_SNORM16] = unpack_XBGR16161616_SNORM;
+      table[MESA_FORMAT_RGBX_FLOAT16] = unpack_XBGR16161616_FLOAT;
+      table[MESA_FORMAT_RGBX_UINT16] = unpack_XBGR16161616_UINT;
+      table[MESA_FORMAT_RGBX_SINT16] = unpack_XBGR16161616_SINT;
+      table[MESA_FORMAT_RGBX_FLOAT32] = unpack_XBGR32323232_FLOAT;
+      table[MESA_FORMAT_RGBX_UINT32] = unpack_XBGR32323232_UINT;
+      table[MESA_FORMAT_RGBX_SINT32] = unpack_XBGR32323232_SINT;
 
       table[MESA_FORMAT_ABGR2101010] = unpack_ABGR2101010;
 
@@ -3818,24 +3818,24 @@ _mesa_unpack_uint_rgba_row(mesa_format format, GLuint n,
       unpack_int_rgba_ARGB2101010(src, dst, n);
       break;
 
-   case MESA_FORMAT_XBGR8888_UINT:
+   case MESA_FORMAT_RGBX_UINT8:
       unpack_int_rgba_XBGR8888_UINT(src, dst, n);
       break;
 
-   case MESA_FORMAT_XBGR8888_SINT:
+   case MESA_FORMAT_RGBX_SINT8:
       unpack_int_rgba_XBGR8888_SINT(src, dst, n);
       break;
 
-   case MESA_FORMAT_XBGR16161616_UINT:
+   case MESA_FORMAT_RGBX_UINT16:
       unpack_int_rgba_XBGR16161616_UINT(src, dst, n);
       break;
 
-   case MESA_FORMAT_XBGR16161616_SINT:
+   case MESA_FORMAT_RGBX_SINT16:
       unpack_int_rgba_XBGR16161616_SINT(src, dst, n);
       break;
 
-   case MESA_FORMAT_XBGR32323232_UINT:
-   case MESA_FORMAT_XBGR32323232_SINT:
+   case MESA_FORMAT_RGBX_UINT32:
+   case MESA_FORMAT_RGBX_SINT32:
       unpack_int_rgba_XBGR32323232_UINT(src, dst, n);
       break;
 
diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index 5c23db7..9488d7b 100644
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -1647,8 +1647,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 2
    },
    {
-      MESA_FORMAT_XBGR8888_SNORM,
-      "MESA_FORMAT_XBGR8888_SNORM",
+      MESA_FORMAT_RGBX_SNORM8,
+      "MESA_FORMAT_RGBX_SNORM8",
       GL_RGB,
       GL_SIGNED_NORMALIZED,
       8, 8, 8, 0,
@@ -1656,8 +1656,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 4
    },
    {
-      MESA_FORMAT_XBGR8888_SRGB,
-      "MESA_FORMAT_XBGR8888_SRGB",
+      MESA_FORMAT_SRGBX_UNORM8,
+      "MESA_FORMAT_SRGBX_UNORM8",
       GL_RGB,
       GL_UNSIGNED_NORMALIZED,
       8, 8, 8, 0,
@@ -1665,8 +1665,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 4
    },
    {
-      MESA_FORMAT_XBGR8888_UINT,
-      "MESA_FORMAT_XBGR8888_UINT",
+      MESA_FORMAT_RGBX_UINT8,
+      "MESA_FORMAT_RGBX_UINT8",
       GL_RGB,
       GL_UNSIGNED_INT,
       8, 8, 8, 0,
@@ -1674,8 +1674,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 4
    },
    {
-      MESA_FORMAT_XBGR8888_SINT,
-      "MESA_FORMAT_XBGR8888_SINT",
+      MESA_FORMAT_RGBX_SINT8,
+      "MESA_FORMAT_RGBX_SINT8",
       GL_RGB,
       GL_INT,
       8, 8, 8, 0,
@@ -1692,8 +1692,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 4
    },
    {
-      MESA_FORMAT_XBGR16161616_UNORM,
-      "MESA_FORMAT_XBGR16161616_UNORM",
+      MESA_FORMAT_RGBX_UNORM16,
+      "MESA_FORMAT_RGBX_UNORM16",
       GL_RGB,
       GL_UNSIGNED_NORMALIZED,
       16, 16, 16, 0,
@@ -1701,8 +1701,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 8
    },
    {
-      MESA_FORMAT_XBGR16161616_SNORM,
-      "MESA_FORMAT_XBGR16161616_SNORM",
+      MESA_FORMAT_RGBX_SNORM16,
+      "MESA_FORMAT_RGBX_SNORM16",
       GL_RGB,
       GL_SIGNED_NORMALIZED,
       16, 16, 16, 0,
@@ -1710,8 +1710,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 8
    },
    {
-      MESA_FORMAT_XBGR16161616_FLOAT,
-      "MESA_FORMAT_XBGR16161616_FLOAT",
+      MESA_FORMAT_RGBX_FLOAT16,
+      "MESA_FORMAT_RGBX_FLOAT16",
       GL_RGB,
       GL_FLOAT,
       16, 16, 16, 0,
@@ -1719,8 +1719,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 8
    },
    {
-      MESA_FORMAT_XBGR16161616_UINT,
-      "MESA_FORMAT_XBGR16161616_UINT",
+      MESA_FORMAT_RGBX_UINT16,
+      "MESA_FORMAT_RGBX_UINT16",
       GL_RGB,
       GL_UNSIGNED_INT,
       16, 16, 16, 0,
@@ -1728,8 +1728,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 8
    },
    {
-      MESA_FORMAT_XBGR16161616_SINT,
-      "MESA_FORMAT_XBGR16161616_SINT",
+      MESA_FORMAT_RGBX_SINT16,
+      "MESA_FORMAT_RGBX_SINT16",
       GL_RGB,
       GL_INT,
       16, 16, 16, 0,
@@ -1737,8 +1737,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 8
    },
    {
-      MESA_FORMAT_XBGR32323232_FLOAT,
-      "MESA_FORMAT_XBGR32323232_FLOAT",
+      MESA_FORMAT_RGBX_FLOAT32,
+      "MESA_FORMAT_RGBX_FLOAT32",
       GL_RGB,
       GL_FLOAT,
       32, 32, 32, 0,
@@ -1746,8 +1746,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 16
    },
    {
-      MESA_FORMAT_XBGR32323232_UINT,
-      "MESA_FORMAT_XBGR32323232_UINT",
+      MESA_FORMAT_RGBX_UINT32,
+      "MESA_FORMAT_RGBX_UINT32",
       GL_RGB,
       GL_UNSIGNED_INT,
       32, 32, 32, 0,
@@ -1755,8 +1755,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 16
    },
    {
-      MESA_FORMAT_XBGR32323232_SINT,
-      "MESA_FORMAT_XBGR32323232_SINT",
+      MESA_FORMAT_RGBX_SINT32,
+      "MESA_FORMAT_RGBX_SINT32",
       GL_RGB,
       GL_INT,
       32, 32, 32, 0,
@@ -2031,7 +2031,7 @@ _mesa_get_format_color_encoding(mesa_format format)
    case MESA_FORMAT_SRGBA_DXT1:
    case MESA_FORMAT_SRGBA_DXT3:
    case MESA_FORMAT_SRGBA_DXT5:
-   case MESA_FORMAT_XBGR8888_SRGB:
+   case MESA_FORMAT_SRGBX_UNORM8:
       return GL_SRGB;
    default:
       return GL_LINEAR;
@@ -2074,7 +2074,7 @@ _mesa_get_srgb_format_linear(mesa_format format)
    case MESA_FORMAT_SRGBA_DXT5:
       format = MESA_FORMAT_RGBA_DXT5;
       break;
-   case MESA_FORMAT_XBGR8888_SRGB:
+   case MESA_FORMAT_SRGBX_UNORM8:
       format = MESA_FORMAT_RGBX_UNORM8;
       break;
    default:
@@ -2819,14 +2819,14 @@ _mesa_format_to_type_and_comps(mesa_format format,
       *comps = 4;
       return;
 
-   case MESA_FORMAT_XBGR8888_SRGB:
-   case MESA_FORMAT_XBGR8888_UINT:
+   case MESA_FORMAT_SRGBX_UNORM8:
+   case MESA_FORMAT_RGBX_UINT8:
       *datatype = GL_UNSIGNED_BYTE;
       *comps = 4;
       return;
 
-   case MESA_FORMAT_XBGR8888_SNORM:
-   case MESA_FORMAT_XBGR8888_SINT:
+   case MESA_FORMAT_RGBX_SNORM8:
+   case MESA_FORMAT_RGBX_SINT8:
       *datatype = GL_BYTE;
       *comps = 4;
       return;
@@ -2836,34 +2836,34 @@ _mesa_format_to_type_and_comps(mesa_format format,
       *comps = 4;
       return;
 
-   case MESA_FORMAT_XBGR16161616_UNORM:
-   case MESA_FORMAT_XBGR16161616_UINT:
+   case MESA_FORMAT_RGBX_UNORM16:
+   case MESA_FORMAT_RGBX_UINT16:
       *datatype = GL_UNSIGNED_SHORT;
       *comps = 4;
       return;
 
-   case MESA_FORMAT_XBGR16161616_SNORM:
-   case MESA_FORMAT_XBGR16161616_SINT:
+   case MESA_FORMAT_RGBX_SNORM16:
+   case MESA_FORMAT_RGBX_SINT16:
       *datatype = GL_SHORT;
       *comps = 4;
       return;
 
-   case MESA_FORMAT_XBGR16161616_FLOAT:
+   case MESA_FORMAT_RGBX_FLOAT16:
       *datatype = GL_HALF_FLOAT;
       *comps = 4;
       return;
 
-   case MESA_FORMAT_XBGR32323232_FLOAT:
+   case MESA_FORMAT_RGBX_FLOAT32:
       *datatype = GL_FLOAT;
       *comps = 4;
       return;
 
-   case MESA_FORMAT_XBGR32323232_UINT:
+   case MESA_FORMAT_RGBX_UINT32:
       *datatype = GL_UNSIGNED_INT;
       *comps = 4;
       return;
 
-   case MESA_FORMAT_XBGR32323232_SINT:
+   case MESA_FORMAT_RGBX_SINT32:
       *datatype = GL_INT;
       *comps = 4;
       return;
@@ -3410,19 +3410,19 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format,
 
    case MESA_FORMAT_B4G4R4X4_UNORM:
    case MESA_FORMAT_B5G5R5X1_UNORM:
-   case MESA_FORMAT_XBGR8888_SNORM:
-   case MESA_FORMAT_XBGR8888_SRGB:
-   case MESA_FORMAT_XBGR8888_UINT:
-   case MESA_FORMAT_XBGR8888_SINT:
+   case MESA_FORMAT_RGBX_SNORM8:
+   case MESA_FORMAT_SRGBX_UNORM8:
+   case MESA_FORMAT_RGBX_UINT8:
+   case MESA_FORMAT_RGBX_SINT8:
    case MESA_FORMAT_B10G10R10X2_UNORM:
-   case MESA_FORMAT_XBGR16161616_UNORM:
-   case MESA_FORMAT_XBGR16161616_SNORM:
-   case MESA_FORMAT_XBGR16161616_FLOAT:
-   case MESA_FORMAT_XBGR16161616_UINT:
-   case MESA_FORMAT_XBGR16161616_SINT:
-   case MESA_FORMAT_XBGR32323232_FLOAT:
-   case MESA_FORMAT_XBGR32323232_UINT:
-   case MESA_FORMAT_XBGR32323232_SINT:
+   case MESA_FORMAT_RGBX_UNORM16:
+   case MESA_FORMAT_RGBX_SNORM16:
+   case MESA_FORMAT_RGBX_FLOAT16:
+   case MESA_FORMAT_RGBX_UINT16:
+   case MESA_FORMAT_RGBX_SINT16:
+   case MESA_FORMAT_RGBX_FLOAT32:
+   case MESA_FORMAT_RGBX_UINT32:
+   case MESA_FORMAT_RGBX_SINT32:
       return GL_FALSE;
 
    case MESA_FORMAT_ABGR2101010:
diff --git a/src/mesa/main/formats.h b/src/mesa/main/formats.h
index e2dc18e..b349319 100644
--- a/src/mesa/main/formats.h
+++ b/src/mesa/main/formats.h
@@ -421,23 +421,23 @@ typedef enum
    MESA_FORMAT_B5G5R5X1_UNORM,    /* BBBB BGGG GGRR RRRx */
 
    /* Type A formats */
-   MESA_FORMAT_XBGR8888_SNORM,    /* xxxx xxxx BBBB BBBB GGGG GGGG RRRR RRRR */
-   MESA_FORMAT_XBGR8888_SRGB,     /* xxxx xxxx BBBB BBBB GGGG GGGG RRRR RRRR */
-   MESA_FORMAT_XBGR8888_UINT,     /* xxxx xxxx BBBB BBBB GGGG GGGG RRRR RRRR */
-   MESA_FORMAT_XBGR8888_SINT,     /* xxxx xxxx BBBB BBBB GGGG GGGG RRRR RRRR */
+   MESA_FORMAT_RGBX_SNORM8,
+   MESA_FORMAT_SRGBX_UNORM8,
+   MESA_FORMAT_RGBX_UINT8,
+   MESA_FORMAT_RGBX_SINT8,
 
    /* Type P format */
    MESA_FORMAT_B10G10R10X2_UNORM, /* BBBB BBBB BBGG GGGG GGGG RRRR RRRR RRxx */
 
    /* Type A formats */
-   MESA_FORMAT_XBGR16161616_UNORM,/* ushort[3]=x, [2]=B, [1]=G, [0]=R */
-   MESA_FORMAT_XBGR16161616_SNORM,/* ... */
-   MESA_FORMAT_XBGR16161616_FLOAT,/* ... */
-   MESA_FORMAT_XBGR16161616_UINT, /* ... */
-   MESA_FORMAT_XBGR16161616_SINT, /* ... */
-   MESA_FORMAT_XBGR32323232_FLOAT,/* float[3]=x, [2]=B, [1]=G, [0]=R */
-   MESA_FORMAT_XBGR32323232_UINT, /* ... */
-   MESA_FORMAT_XBGR32323232_SINT, /* ... */
+   MESA_FORMAT_RGBX_UNORM16, /* ushort[i * 4 + 0] = R, [i * 4 + 1] = G, [i * 4 + 2] = B, [i * 4 + 3] = x */
+   MESA_FORMAT_RGBX_SNORM16, /* ... */
+   MESA_FORMAT_RGBX_FLOAT16, /* ... */
+   MESA_FORMAT_RGBX_UINT16,  /* ... */
+   MESA_FORMAT_RGBX_SINT16,  /* ... */
+   MESA_FORMAT_RGBX_FLOAT32, /* float[i * 4 + 0] = R, [i * 4 + 1] = G, [i * 4 + 2] = B, [i * 4 + 3] = x */
+   MESA_FORMAT_RGBX_UINT32,  /* ... */
+   MESA_FORMAT_RGBX_SINT32,  /* ... */
 
    MESA_FORMAT_ABGR2101010,
 
diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index f335dfc..af40b85 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -140,7 +140,7 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
    case GL_RGB10:
    case GL_RGB12:
    case GL_RGB16:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_XBGR16161616_UNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBX_UNORM16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UNORM16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_BGRX_UNORM8);
       RETURN_IF_SUPPORTED(MESA_FORMAT_BGRA_UNORM8);
@@ -392,14 +392,14 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       break;
    case GL_RGB16F_ARB:
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FLOAT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_XBGR16161616_FLOAT);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBX_FLOAT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FLOAT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
       break;
    case GL_RGB32F_ARB:
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FLOAT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_XBGR32323232_FLOAT);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBX_FLOAT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FLOAT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
@@ -491,7 +491,7 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       break;
    case GL_RGB16_SNORM:
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_SNORM16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_XBGR16161616_SNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBX_SNORM16);
       /* FALLTHROUGH */
    case GL_RGBA16_SNORM:
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SNORM16);
@@ -660,32 +660,32 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
 
    case GL_RGB8UI_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_UINT8);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_XBGR8888_UINT);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBX_UINT8);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);
       break;
    case GL_RGB16UI_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_UINT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_XBGR16161616_UINT);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBX_UINT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16);
       break;
    case GL_RGB32UI_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_UINT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_XBGR32323232_UINT);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBX_UINT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
       break;
    case GL_RGB8I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_INT8);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_XBGR8888_SINT);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBX_SINT8);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
       break;
    case GL_RGB16I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_INT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_XBGR16161616_SINT);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBX_SINT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
       break;
    case GL_RGB32I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_INT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_XBGR32323232_SINT);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBX_SINT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
       break;
    case GL_RGBA8UI_EXT:
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index ed5892b..d511246 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -1823,7 +1823,7 @@ static GLboolean
 _mesa_texstore_rgba_16(TEXSTORE_PARAMS)
 {
    ASSERT(dstFormat == MESA_FORMAT_RGBA_UNORM16 ||
-          dstFormat == MESA_FORMAT_XBGR16161616_UNORM);
+          dstFormat == MESA_FORMAT_RGBX_UNORM16);
    ASSERT(_mesa_get_format_bytes(dstFormat) == 8);
 
    {
@@ -1876,7 +1876,7 @@ _mesa_texstore_signed_rgba_16(TEXSTORE_PARAMS)
 
    ASSERT(dstFormat == MESA_FORMAT_RGB_SNORM16 ||
           dstFormat == MESA_FORMAT_RGBA_SNORM16 ||
-          dstFormat == MESA_FORMAT_XBGR16161616_SNORM);
+          dstFormat == MESA_FORMAT_RGBX_SNORM16);
 
    {
       /* general path */
@@ -1913,7 +1913,7 @@ _mesa_texstore_signed_rgba_16(TEXSTORE_PARAMS)
                dstRow += dstRowStride;
                src += 4 * srcWidth;
             }
-            else if (dstFormat == MESA_FORMAT_XBGR16161616_SNORM) {
+            else if (dstFormat == MESA_FORMAT_RGBX_SNORM16) {
                for (col = 0; col < srcWidth; col++) {
                   GLuint c;
 
@@ -2346,7 +2346,7 @@ _mesa_texstore_snorm1616(TEXSTORE_PARAMS)
 
 /**
  * Store a texture in MESA_FORMAT_XBGR_SNORM8 or
- * MESA_FORMAT_XBGR8888_SNORM.
+ * MESA_FORMAT_RGBX_SNORM8.
  */
 static GLboolean
 _mesa_texstore_signed_rgbx8888(TEXSTORE_PARAMS)
@@ -2354,7 +2354,7 @@ _mesa_texstore_signed_rgbx8888(TEXSTORE_PARAMS)
    const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
 
    ASSERT(dstFormat == MESA_FORMAT_XBGR_SNORM8 ||
-          dstFormat == MESA_FORMAT_XBGR8888_SNORM);
+          dstFormat == MESA_FORMAT_RGBX_SNORM8);
    ASSERT(_mesa_get_format_bytes(dstFormat) == 4);
 
    {
@@ -2694,7 +2694,7 @@ _mesa_texstore_rgba_float32(TEXSTORE_PARAMS)
    GLint components = _mesa_components_in_format(baseFormat);
 
    /* this forces alpha to 1 in _mesa_make_temp_float_image */
-   if (dstFormat == MESA_FORMAT_XBGR32323232_FLOAT) {
+   if (dstFormat == MESA_FORMAT_RGBX_FLOAT32) {
       baseFormat = GL_RGBA;
       components = 4;
    }
@@ -2707,7 +2707,7 @@ _mesa_texstore_rgba_float32(TEXSTORE_PARAMS)
           dstFormat == MESA_FORMAT_I_FLOAT32 ||
           dstFormat == MESA_FORMAT_R_FLOAT32 ||
           dstFormat == MESA_FORMAT_RG_FLOAT32 ||
-          dstFormat == MESA_FORMAT_XBGR32323232_FLOAT);
+          dstFormat == MESA_FORMAT_RGBX_FLOAT32);
    ASSERT(baseInternalFormat == GL_RGBA ||
           baseInternalFormat == GL_RGB ||
           baseInternalFormat == GL_ALPHA ||
@@ -2759,7 +2759,7 @@ _mesa_texstore_rgba_float16(TEXSTORE_PARAMS)
    GLint components = _mesa_components_in_format(baseFormat);
 
    /* this forces alpha to 1 in _mesa_make_temp_float_image */
-   if (dstFormat == MESA_FORMAT_XBGR16161616_FLOAT) {
+   if (dstFormat == MESA_FORMAT_RGBX_FLOAT16) {
       baseFormat = GL_RGBA;
       components = 4;
    }
@@ -2772,7 +2772,7 @@ _mesa_texstore_rgba_float16(TEXSTORE_PARAMS)
           dstFormat == MESA_FORMAT_I_FLOAT16 ||
           dstFormat == MESA_FORMAT_R_FLOAT16 ||
           dstFormat == MESA_FORMAT_RG_FLOAT16 ||
-          dstFormat == MESA_FORMAT_XBGR16161616_FLOAT);
+          dstFormat == MESA_FORMAT_RGBX_FLOAT16);
    ASSERT(baseInternalFormat == GL_RGBA ||
           baseInternalFormat == GL_RGB ||
           baseInternalFormat == GL_ALPHA ||
@@ -2823,7 +2823,7 @@ _mesa_texstore_rgba_int8(TEXSTORE_PARAMS)
    GLint components = _mesa_components_in_format(baseFormat);
 
    /* this forces alpha to 1 in make_temp_uint_image */
-   if (dstFormat == MESA_FORMAT_XBGR8888_SINT) {
+   if (dstFormat == MESA_FORMAT_RGBX_SINT8) {
       baseFormat = GL_RGBA;
       components = 4;
    }
@@ -2836,7 +2836,7 @@ _mesa_texstore_rgba_int8(TEXSTORE_PARAMS)
           dstFormat == MESA_FORMAT_I_INT8 ||
           dstFormat == MESA_FORMAT_L_INT8 ||
           dstFormat == MESA_FORMAT_LA_INT8 ||
-          dstFormat == MESA_FORMAT_XBGR8888_SINT);
+          dstFormat == MESA_FORMAT_RGBX_SINT8);
    ASSERT(baseInternalFormat == GL_RGBA ||
           baseInternalFormat == GL_RGB ||
           baseInternalFormat == GL_RG ||
@@ -2894,7 +2894,7 @@ _mesa_texstore_rgba_int16(TEXSTORE_PARAMS)
    GLint components = _mesa_components_in_format(baseFormat);
 
    /* this forces alpha to 1 in make_temp_uint_image */
-   if (dstFormat == MESA_FORMAT_XBGR16161616_SINT) {
+   if (dstFormat == MESA_FORMAT_RGBX_SINT16) {
       baseFormat = GL_RGBA;
       components = 4;
    }
@@ -2907,7 +2907,7 @@ _mesa_texstore_rgba_int16(TEXSTORE_PARAMS)
           dstFormat == MESA_FORMAT_L_INT16 ||
           dstFormat == MESA_FORMAT_I_INT16 ||
           dstFormat == MESA_FORMAT_LA_INT16 ||
-          dstFormat == MESA_FORMAT_XBGR16161616_SINT);
+          dstFormat == MESA_FORMAT_RGBX_SINT16);
    ASSERT(baseInternalFormat == GL_RGBA ||
           baseInternalFormat == GL_RGB ||
           baseInternalFormat == GL_RG ||
@@ -2965,7 +2965,7 @@ _mesa_texstore_rgba_int32(TEXSTORE_PARAMS)
    GLint components = _mesa_components_in_format(baseFormat);
 
    /* this forces alpha to 1 in make_temp_uint_image */
-   if (dstFormat == MESA_FORMAT_XBGR32323232_SINT) {
+   if (dstFormat == MESA_FORMAT_RGBX_SINT32) {
       baseFormat = GL_RGBA;
       components = 4;
    }
@@ -2978,7 +2978,7 @@ _mesa_texstore_rgba_int32(TEXSTORE_PARAMS)
           dstFormat == MESA_FORMAT_I_INT32 ||
           dstFormat == MESA_FORMAT_L_INT32 ||
           dstFormat == MESA_FORMAT_LA_INT32 ||
-          dstFormat == MESA_FORMAT_XBGR32323232_SINT);
+          dstFormat == MESA_FORMAT_RGBX_SINT32);
    ASSERT(baseInternalFormat == GL_RGBA ||
           baseInternalFormat == GL_RGB ||
           baseInternalFormat == GL_RG ||
@@ -3036,7 +3036,7 @@ _mesa_texstore_rgba_uint8(TEXSTORE_PARAMS)
    GLint components = _mesa_components_in_format(baseFormat);
 
    /* this forces alpha to 1 in make_temp_uint_image */
-   if (dstFormat == MESA_FORMAT_XBGR8888_UINT) {
+   if (dstFormat == MESA_FORMAT_RGBX_UINT8) {
       baseFormat = GL_RGBA;
       components = 4;
    }
@@ -3049,7 +3049,7 @@ _mesa_texstore_rgba_uint8(TEXSTORE_PARAMS)
           dstFormat == MESA_FORMAT_I_UINT8 ||
           dstFormat == MESA_FORMAT_L_UINT8 ||
           dstFormat == MESA_FORMAT_LA_UINT8 ||
-          dstFormat == MESA_FORMAT_XBGR8888_UINT);
+          dstFormat == MESA_FORMAT_RGBX_UINT8);
    ASSERT(baseInternalFormat == GL_RGBA ||
           baseInternalFormat == GL_RGB ||
           baseInternalFormat == GL_RG ||
@@ -3104,7 +3104,7 @@ _mesa_texstore_rgba_uint16(TEXSTORE_PARAMS)
    GLint components = _mesa_components_in_format(baseFormat);
 
    /* this forces alpha to 1 in make_temp_uint_image */
-   if (dstFormat == MESA_FORMAT_XBGR16161616_UINT) {
+   if (dstFormat == MESA_FORMAT_RGBX_UINT16) {
       baseFormat = GL_RGBA;
       components = 4;
    }
@@ -3117,7 +3117,7 @@ _mesa_texstore_rgba_uint16(TEXSTORE_PARAMS)
           dstFormat == MESA_FORMAT_I_UINT16 ||
           dstFormat == MESA_FORMAT_L_UINT16 ||
           dstFormat == MESA_FORMAT_LA_UINT16 ||
-          dstFormat == MESA_FORMAT_XBGR16161616_UINT);
+          dstFormat == MESA_FORMAT_RGBX_UINT16);
    ASSERT(baseInternalFormat == GL_RGBA ||
           baseInternalFormat == GL_RGB ||
           baseInternalFormat == GL_RG ||
@@ -3172,7 +3172,7 @@ _mesa_texstore_rgba_uint32(TEXSTORE_PARAMS)
    GLint components = _mesa_components_in_format(baseFormat);
 
    /* this forces alpha to 1 in make_temp_uint_image */
-   if (dstFormat == MESA_FORMAT_XBGR32323232_UINT) {
+   if (dstFormat == MESA_FORMAT_RGBX_UINT32) {
       baseFormat = GL_RGBA;
       components = 4;
    }
@@ -3185,7 +3185,7 @@ _mesa_texstore_rgba_uint32(TEXSTORE_PARAMS)
           dstFormat == MESA_FORMAT_I_UINT32 ||
           dstFormat == MESA_FORMAT_L_UINT32 ||
           dstFormat == MESA_FORMAT_LA_UINT32 ||
-          dstFormat == MESA_FORMAT_XBGR32323232_UINT);
+          dstFormat == MESA_FORMAT_RGBX_UINT32);
    ASSERT(baseInternalFormat == GL_RGBA ||
           baseInternalFormat == GL_RGB ||
           baseInternalFormat == GL_RG ||
@@ -3260,13 +3260,13 @@ _mesa_texstore_srgba8(TEXSTORE_PARAMS)
    GLboolean k;
 
    ASSERT(dstFormat == MESA_FORMAT_SABGR_UNORM8 ||
-          dstFormat == MESA_FORMAT_XBGR8888_SRGB);
+          dstFormat == MESA_FORMAT_SRGBX_UNORM8);
 
    /* reuse normal rgba texstore code */
    if (dstFormat == MESA_FORMAT_SABGR_UNORM8) {
       newDstFormat = MESA_FORMAT_ABGR_UNORM8;
    }
-   else if (dstFormat == MESA_FORMAT_XBGR8888_SRGB) {
+   else if (dstFormat == MESA_FORMAT_SRGBX_UNORM8) {
       newDstFormat = MESA_FORMAT_RGBX_UNORM8;
    }
    else {
@@ -3840,19 +3840,19 @@ _mesa_get_texstore_func(mesa_format format)
 
       table[MESA_FORMAT_B4G4R4X4_UNORM] = store_ubyte_texture;
       table[MESA_FORMAT_B5G5R5X1_UNORM] = store_ubyte_texture;
-      table[MESA_FORMAT_XBGR8888_SNORM] = _mesa_texstore_signed_rgbx8888;
-      table[MESA_FORMAT_XBGR8888_SRGB] = _mesa_texstore_srgba8;
-      table[MESA_FORMAT_XBGR8888_UINT] = _mesa_texstore_rgba_uint8;
-      table[MESA_FORMAT_XBGR8888_SINT] = _mesa_texstore_rgba_int8;
+      table[MESA_FORMAT_RGBX_SNORM8] = _mesa_texstore_signed_rgbx8888;
+      table[MESA_FORMAT_SRGBX_UNORM8] = _mesa_texstore_srgba8;
+      table[MESA_FORMAT_RGBX_UINT8] = _mesa_texstore_rgba_uint8;
+      table[MESA_FORMAT_RGBX_SINT8] = _mesa_texstore_rgba_int8;
       table[MESA_FORMAT_B10G10R10X2_UNORM] = _mesa_texstore_argb2101010;
-      table[MESA_FORMAT_XBGR16161616_UNORM] = _mesa_texstore_rgba_16;
-      table[MESA_FORMAT_XBGR16161616_SNORM] = _mesa_texstore_signed_rgba_16;
-      table[MESA_FORMAT_XBGR16161616_FLOAT] = _mesa_texstore_rgba_float16;
-      table[MESA_FORMAT_XBGR16161616_UINT] = _mesa_texstore_rgba_uint16;
-      table[MESA_FORMAT_XBGR16161616_SINT] = _mesa_texstore_rgba_int16;
-      table[MESA_FORMAT_XBGR32323232_FLOAT] = _mesa_texstore_rgba_float32;
-      table[MESA_FORMAT_XBGR32323232_UINT] = _mesa_texstore_rgba_uint32;
-      table[MESA_FORMAT_XBGR32323232_SINT] = _mesa_texstore_rgba_int32;
+      table[MESA_FORMAT_RGBX_UNORM16] = _mesa_texstore_rgba_16;
+      table[MESA_FORMAT_RGBX_SNORM16] = _mesa_texstore_signed_rgba_16;
+      table[MESA_FORMAT_RGBX_FLOAT16] = _mesa_texstore_rgba_float16;
+      table[MESA_FORMAT_RGBX_UINT16] = _mesa_texstore_rgba_uint16;
+      table[MESA_FORMAT_RGBX_SINT16] = _mesa_texstore_rgba_int16;
+      table[MESA_FORMAT_RGBX_FLOAT32] = _mesa_texstore_rgba_float32;
+      table[MESA_FORMAT_RGBX_UINT32] = _mesa_texstore_rgba_uint32;
+      table[MESA_FORMAT_RGBX_SINT32] = _mesa_texstore_rgba_int32;
 
       table[MESA_FORMAT_ABGR2101010] = _mesa_texstore_abgr2101010;
 
diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index a4eef23..95a952f 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -364,31 +364,31 @@ st_mesa_format_to_pipe_format(mesa_format mesaFormat)
       return PIPE_FORMAT_B4G4R4X4_UNORM;
    case MESA_FORMAT_B5G5R5X1_UNORM:
       return PIPE_FORMAT_B5G5R5X1_UNORM;
-   case MESA_FORMAT_XBGR8888_SNORM:
+   case MESA_FORMAT_RGBX_SNORM8:
       return PIPE_FORMAT_R8G8B8X8_SNORM;
-   case MESA_FORMAT_XBGR8888_SRGB:
+   case MESA_FORMAT_SRGBX_UNORM8:
       return PIPE_FORMAT_R8G8B8X8_SRGB;
-   case MESA_FORMAT_XBGR8888_UINT:
+   case MESA_FORMAT_RGBX_UINT8:
       return PIPE_FORMAT_R8G8B8X8_UINT;
-   case MESA_FORMAT_XBGR8888_SINT:
+   case MESA_FORMAT_RGBX_SINT8:
       return PIPE_FORMAT_R8G8B8X8_SINT;
    case MESA_FORMAT_B10G10R10X2_UNORM:
       return PIPE_FORMAT_B10G10R10X2_UNORM;
-   case MESA_FORMAT_XBGR16161616_UNORM:
+   case MESA_FORMAT_RGBX_UNORM16:
       return PIPE_FORMAT_R16G16B16X16_UNORM;
-   case MESA_FORMAT_XBGR16161616_SNORM:
+   case MESA_FORMAT_RGBX_SNORM16:
       return PIPE_FORMAT_R16G16B16X16_SNORM;
-   case MESA_FORMAT_XBGR16161616_FLOAT:
+   case MESA_FORMAT_RGBX_FLOAT16:
       return PIPE_FORMAT_R16G16B16X16_FLOAT;
-   case MESA_FORMAT_XBGR16161616_UINT:
+   case MESA_FORMAT_RGBX_UINT16:
       return PIPE_FORMAT_R16G16B16X16_UINT;
-   case MESA_FORMAT_XBGR16161616_SINT:
+   case MESA_FORMAT_RGBX_SINT16:
       return PIPE_FORMAT_R16G16B16X16_SINT;
-   case MESA_FORMAT_XBGR32323232_FLOAT:
+   case MESA_FORMAT_RGBX_FLOAT32:
       return PIPE_FORMAT_R32G32B32X32_FLOAT;
-   case MESA_FORMAT_XBGR32323232_UINT:
+   case MESA_FORMAT_RGBX_UINT32:
       return PIPE_FORMAT_R32G32B32X32_UINT;
-   case MESA_FORMAT_XBGR32323232_SINT:
+   case MESA_FORMAT_RGBX_SINT32:
       return PIPE_FORMAT_R32G32B32X32_SINT;
 
    default:
@@ -718,31 +718,31 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
    case PIPE_FORMAT_B5G5R5X1_UNORM:
       return MESA_FORMAT_B5G5R5X1_UNORM;
    case PIPE_FORMAT_R8G8B8X8_SNORM:
-      return MESA_FORMAT_XBGR8888_SNORM;
+      return MESA_FORMAT_RGBX_SNORM8;
    case PIPE_FORMAT_R8G8B8X8_SRGB:
-      return MESA_FORMAT_XBGR8888_SRGB;
+      return MESA_FORMAT_SRGBX_UNORM8;
    case PIPE_FORMAT_R8G8B8X8_UINT:
-      return MESA_FORMAT_XBGR8888_UINT;
+      return MESA_FORMAT_RGBX_UINT8;
    case PIPE_FORMAT_R8G8B8X8_SINT:
-      return MESA_FORMAT_XBGR8888_SINT;
+      return MESA_FORMAT_RGBX_SINT8;
    case PIPE_FORMAT_B10G10R10X2_UNORM:
       return MESA_FORMAT_B10G10R10X2_UNORM;
    case PIPE_FORMAT_R16G16B16X16_UNORM:
-      return MESA_FORMAT_XBGR16161616_UNORM;
+      return MESA_FORMAT_RGBX_UNORM16;
    case PIPE_FORMAT_R16G16B16X16_SNORM:
-      return MESA_FORMAT_XBGR16161616_SNORM;
+      return MESA_FORMAT_RGBX_SNORM16;
    case PIPE_FORMAT_R16G16B16X16_FLOAT:
-      return MESA_FORMAT_XBGR16161616_FLOAT;
+      return MESA_FORMAT_RGBX_FLOAT16;
    case PIPE_FORMAT_R16G16B16X16_UINT:
-      return MESA_FORMAT_XBGR16161616_UINT;
+      return MESA_FORMAT_RGBX_UINT16;
    case PIPE_FORMAT_R16G16B16X16_SINT:
-      return MESA_FORMAT_XBGR16161616_SINT;
+      return MESA_FORMAT_RGBX_SINT16;
    case PIPE_FORMAT_R32G32B32X32_FLOAT:
-      return MESA_FORMAT_XBGR32323232_FLOAT;
+      return MESA_FORMAT_RGBX_FLOAT32;
    case PIPE_FORMAT_R32G32B32X32_UINT:
-      return MESA_FORMAT_XBGR32323232_UINT;
+      return MESA_FORMAT_RGBX_UINT32;
    case PIPE_FORMAT_R32G32B32X32_SINT:
-      return MESA_FORMAT_XBGR32323232_SINT;
+      return MESA_FORMAT_RGBX_SINT32;
 
    default:
       assert(0);
diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c
index 5cb0b14..227b79c 100644
--- a/src/mesa/swrast/s_texfetch.c
+++ b/src/mesa/swrast/s_texfetch.c
@@ -1209,25 +1209,25 @@ texfetch_funcs[] =
       NULL
    },
    {
-      MESA_FORMAT_XBGR8888_SNORM,
+      MESA_FORMAT_RGBX_SNORM8,
       NULL,
       NULL,
       NULL
    },
    {
-      MESA_FORMAT_XBGR8888_SRGB,
+      MESA_FORMAT_SRGBX_UNORM8,
       NULL,
       NULL,
       NULL
    },
    {
-      MESA_FORMAT_XBGR8888_UINT,
+      MESA_FORMAT_RGBX_UINT8,
       NULL,
       NULL,
       NULL
    },
    {
-      MESA_FORMAT_XBGR8888_SINT,
+      MESA_FORMAT_RGBX_SINT8,
       NULL,
       NULL,
       NULL
@@ -1239,49 +1239,49 @@ texfetch_funcs[] =
       NULL
    },
    {
-      MESA_FORMAT_XBGR16161616_UNORM,
+      MESA_FORMAT_RGBX_UNORM16,
       fetch_texel_1d_xbgr16161616_unorm,
       fetch_texel_2d_xbgr16161616_unorm,
       fetch_texel_3d_xbgr16161616_unorm
    },
    {
-      MESA_FORMAT_XBGR16161616_SNORM,
+      MESA_FORMAT_RGBX_SNORM16,
       NULL,
       NULL,
       NULL
    },
    {
-      MESA_FORMAT_XBGR16161616_FLOAT,
+      MESA_FORMAT_RGBX_FLOAT16,
       fetch_texel_1d_xbgr16161616_float,
       fetch_texel_2d_xbgr16161616_float,
       fetch_texel_3d_xbgr16161616_float
    },
    {
-      MESA_FORMAT_XBGR16161616_UINT,
+      MESA_FORMAT_RGBX_UINT16,
       NULL,
       NULL,
       NULL
    },
    {
-      MESA_FORMAT_XBGR16161616_SINT,
+      MESA_FORMAT_RGBX_SINT16,
       NULL,
       NULL,
       NULL
    },
    {
-      MESA_FORMAT_XBGR32323232_FLOAT,
+      MESA_FORMAT_RGBX_FLOAT32,
       fetch_texel_1d_xbgr32323232_float,
       fetch_texel_2d_xbgr32323232_float,
       fetch_texel_3d_xbgr32323232_float
    },
    {
-      MESA_FORMAT_XBGR32323232_UINT,
+      MESA_FORMAT_RGBX_UINT32,
       NULL,
       NULL,
       NULL
    },
    {
-      MESA_FORMAT_XBGR32323232_SINT,
+      MESA_FORMAT_RGBX_SINT32,
       NULL,
       NULL,
       NULL
-- 
1.8.3.1



More information about the mesa-dev mailing list