mesa: Rename 4 color component unsigned byte MESA_FORMATs

[mesa.git] / src / mesa / main / texformat.c

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 0a993ede89b364fa85457f5f68d43d39cca70e1b..93a6b6d742a716af133d9df9a03a83d44480a9de 100644 (file)
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -76,13 +76,13 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       } else if (type == GL_UNSIGNED_INT_2_10_10_10_REV) {
          RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB2101010);
       }
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8B8G8R8_UNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_UNORM);
       break;
 
    case GL_RGBA8:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8B8G8R8_UNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_UNORM);
       break;
    case GL_RGB5_A1:
       RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB1555);
@@ -98,14 +98,14 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
    /* deep RGBA formats */
    case GL_RGB10_A2:
       RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB2101010);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_UNORM);
       break;
    case GL_RGBA12:
    case GL_RGBA16:
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8B8G8R8_UNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_UNORM);
       break;
 
    /* shallow RGB formats */
@@ -117,16 +117,16 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       /* fallthrough */
    case GL_RGB8:
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGB888);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8X8_UNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_UNORM);
       break;
    case GL_R3_G3_B2:
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGB332);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565_REV);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGB888);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8X8_UNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_UNORM);
       break;
    case GL_RGB4:
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565_REV); /* just to test another format */
@@ -142,8 +142,8 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
    case GL_RGB16:
       RETURN_IF_SUPPORTED(MESA_FORMAT_XBGR16161616_UNORM);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8X8_UNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_UNORM);
       break;
 
    /* Alpha formats */
@@ -244,8 +244,8 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
          RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FXT1);
       }
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGB888);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8X8_UNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_UNORM);
       break;
    case GL_COMPRESSED_RGBA_ARB:
       /* We don't use texture compression for 1D and 1D array textures. */
@@ -254,8 +254,8 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
             RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3); /* Not rgba_dxt1, see spec */
          RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FXT1);
       }
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8B8G8R8_UNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_UNORM);
       break;
 
    case GL_RGB565:
@@ -809,7 +809,7 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       break;
 
    case GL_BGRA:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_UNORM);
       break;
    }