mesa: Rename 4 color component unsigned byte MESA_FORMATs

[mesa.git] / src / mesa / state_tracker / st_format.c

diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index bd4b96d0d2023adad9955c240dc9deb855e367e1..059a103db8dab3c521e4cedb3c68d394bba3d667 100644 (file)
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -57,21 +57,21 @@ enum pipe_format
 st_mesa_format_to_pipe_format(mesa_format mesaFormat)
 {
    switch (mesaFormat) {
-   case MESA_FORMAT_RGBA8888:
+   case MESA_FORMAT_A8B8G8R8_UNORM:
       return PIPE_FORMAT_ABGR8888_UNORM;
-   case MESA_FORMAT_RGBA8888_REV:
+   case MESA_FORMAT_R8G8B8A8_UNORM:
       return PIPE_FORMAT_RGBA8888_UNORM;
-   case MESA_FORMAT_ARGB8888:
+   case MESA_FORMAT_B8G8R8A8_UNORM:
       return PIPE_FORMAT_BGRA8888_UNORM;
-   case MESA_FORMAT_ARGB8888_REV:
+   case MESA_FORMAT_A8R8G8B8_UNORM:
       return PIPE_FORMAT_ARGB8888_UNORM;
-   case MESA_FORMAT_RGBX8888:
+   case MESA_FORMAT_X8B8G8R8_UNORM:
       return PIPE_FORMAT_XBGR8888_UNORM;
-   case MESA_FORMAT_RGBX8888_REV:
+   case MESA_FORMAT_R8G8B8X8_UNORM:
       return PIPE_FORMAT_RGBX8888_UNORM;
-   case MESA_FORMAT_XRGB8888:
+   case MESA_FORMAT_B8G8R8X8_UNORM:
       return PIPE_FORMAT_BGRX8888_UNORM;
-   case MESA_FORMAT_XRGB8888_REV:
+   case MESA_FORMAT_X8R8G8B8_UNORM:
       return PIPE_FORMAT_XRGB8888_UNORM;
    case MESA_FORMAT_ARGB1555:
       return PIPE_FORMAT_B5G5R5A1_UNORM;
@@ -407,21 +407,21 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
 {
    switch (format) {
    case PIPE_FORMAT_ABGR8888_UNORM:
-      return MESA_FORMAT_RGBA8888;
+      return MESA_FORMAT_A8B8G8R8_UNORM;
    case PIPE_FORMAT_RGBA8888_UNORM:
-      return MESA_FORMAT_RGBA8888_REV;
+      return MESA_FORMAT_R8G8B8A8_UNORM;
    case PIPE_FORMAT_BGRA8888_UNORM:
-      return MESA_FORMAT_ARGB8888;
+      return MESA_FORMAT_B8G8R8A8_UNORM;
    case PIPE_FORMAT_ARGB8888_UNORM:
-      return MESA_FORMAT_ARGB8888_REV;
+      return MESA_FORMAT_A8R8G8B8_UNORM;
    case PIPE_FORMAT_XBGR8888_UNORM:
-      return MESA_FORMAT_RGBX8888;
+      return MESA_FORMAT_X8B8G8R8_UNORM;
    case PIPE_FORMAT_RGBX8888_UNORM:
-      return MESA_FORMAT_RGBX8888_REV;
+      return MESA_FORMAT_R8G8B8X8_UNORM;
    case PIPE_FORMAT_BGRX8888_UNORM:
-      return MESA_FORMAT_XRGB8888;
+      return MESA_FORMAT_B8G8R8X8_UNORM;
    case PIPE_FORMAT_XRGB8888_UNORM:
-      return MESA_FORMAT_XRGB8888_REV;
+      return MESA_FORMAT_X8R8G8B8_UNORM;
    case PIPE_FORMAT_B5G5R5A1_UNORM:
       return MESA_FORMAT_ARGB1555;
    case PIPE_FORMAT_B4G4R4A4_UNORM: