projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
mesa: Move declarations to to of block.
[mesa.git] / src / mesa / main / texformat.c
diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 7137c5fc9c5b2bdafdb124ad05b7299072ac712b..ec16af9d2a19a3c2f43fa5b1c70b52768ece9d8c 100644 (file)
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -76,11 +76,10 @@ _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_B10G10R10A2_UNORM);
       }
-      RETURN_IF_SUPPORTED(MESA_FORMAT_A8B8G8R8_UNORM);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_UNORM);
-      break;
+      /* fallthrough */
 
    case GL_RGBA8:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8B8A8_UNORM);
       RETURN_IF_SUPPORTED(MESA_FORMAT_A8B8G8R8_UNORM);
       RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_UNORM);
       break;
@@ -97,6 +96,7 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
 
    /* deep RGBA formats */
    case GL_RGB10_A2:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R10G10B10A2_UNORM);
       RETURN_IF_SUPPORTED(MESA_FORMAT_B10G10R10A2_UNORM);
       RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_UNORM);
       break;
@@ -116,6 +116,10 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       }
       /* fallthrough */
    case GL_RGB8:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_UNORM8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8B8X8_UNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8B8A8_UNORM);
+
       RETURN_IF_SUPPORTED(MESA_FORMAT_BGR_UNORM8);
       RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8X8_UNORM);
       RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_UNORM);
@@ -151,12 +155,14 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
    case GL_ALPHA4:
    case GL_ALPHA8:
       RETURN_IF_SUPPORTED(MESA_FORMAT_A_UNORM8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L8A8_UNORM);
       break;
 
    case GL_ALPHA12:
    case GL_ALPHA16:
       RETURN_IF_SUPPORTED(MESA_FORMAT_A_UNORM16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_A_UNORM8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L8A8_UNORM);
       break;
 
    /* Luminance formats */
@@ -209,17 +215,18 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
    case GL_DEPTH_COMPONENT24:
    case GL_DEPTH_COMPONENT32:
       RETURN_IF_SUPPORTED(MESA_FORMAT_Z_UNORM32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_UNORM_S8_UINT);
       RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_UNORM_X8_UINT);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_UNORM_S8_UINT);
       break;
    case GL_DEPTH_COMPONENT16:
       RETURN_IF_SUPPORTED(MESA_FORMAT_Z_UNORM16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_UNORM_S8_UINT);
       RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_UNORM_X8_UINT);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_UNORM_S8_UINT);
       break;
 
    case GL_COMPRESSED_ALPHA_ARB:
       RETURN_IF_SUPPORTED(MESA_FORMAT_A_UNORM8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L8A8_UNORM);
       break;
    case GL_COMPRESSED_LUMINANCE_ARB:
       RETURN_IF_SUPPORTED(MESA_FORMAT_L_UNORM8);
@@ -294,23 +301,23 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
    case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
       return MESA_FORMAT_RGBA_DXT5;
    case GL_COMPRESSED_RED_RGTC1:
-      return MESA_FORMAT_RED_RGTC1;
+      return MESA_FORMAT_R_RGTC1_UNORM;
    case GL_COMPRESSED_SIGNED_RED_RGTC1:
-      return MESA_FORMAT_SIGNED_RED_RGTC1;
+      return MESA_FORMAT_R_RGTC1_SNORM;
    case GL_COMPRESSED_RG_RGTC2:
-      return MESA_FORMAT_RG_RGTC2;
+      return MESA_FORMAT_RG_RGTC2_UNORM;
    case GL_COMPRESSED_SIGNED_RG_RGTC2:
-      return MESA_FORMAT_SIGNED_RG_RGTC2;
+      return MESA_FORMAT_RG_RGTC2_SNORM;
    case GL_COMPRESSED_LUMINANCE_LATC1_EXT:
-      return MESA_FORMAT_L_LATC1;
+      return MESA_FORMAT_L_LATC1_UNORM;
    case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT:
-      return MESA_FORMAT_SIGNED_L_LATC1;
+      return MESA_FORMAT_L_LATC1_SNORM;
    case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:
-      return MESA_FORMAT_LA_LATC2;
+      return MESA_FORMAT_LA_LATC2_UNORM;
    case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:
-      return MESA_FORMAT_SIGNED_LA_LATC2;
+      return MESA_FORMAT_LA_LATC2_SNORM;
    case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:
-      return MESA_FORMAT_LA_LATC2;
+      return MESA_FORMAT_LA_LATC2_UNORM;
    case GL_ETC1_RGB8_OES:
       return MESA_FORMAT_ETC1_RGB8;
    case GL_COMPRESSED_RGB8_ETC2:
@@ -341,53 +348,61 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       return MESA_FORMAT_SRGBA_DXT3;
    case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
       return MESA_FORMAT_SRGBA_DXT5;
+   case GL_COMPRESSED_RGBA_BPTC_UNORM:
+      return MESA_FORMAT_BPTC_RGBA_UNORM;
+   case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM:
+      return MESA_FORMAT_BPTC_SRGB_ALPHA_UNORM;
+   case GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT:
+      return MESA_FORMAT_BPTC_RGB_SIGNED_FLOAT;
+   case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT:
+      return MESA_FORMAT_BPTC_RGB_UNSIGNED_FLOAT;
 
    case GL_ALPHA16F_ARB:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A_FLOAT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
       break;
    case GL_ALPHA32F_ARB:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A_FLOAT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A_FLOAT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
       break;
    case GL_LUMINANCE16F_ARB:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L_FLOAT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
       break;
    case GL_LUMINANCE32F_ARB:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L_FLOAT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L_FLOAT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
       break;
    case GL_LUMINANCE_ALPHA16F_ARB:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LA_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LA_FLOAT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
       break;
    case GL_LUMINANCE_ALPHA32F_ARB:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LA_FLOAT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LA_FLOAT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
       break;
    case GL_INTENSITY16F_ARB:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_I_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_I_FLOAT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
       break;
    case GL_INTENSITY32F_ARB:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_I_FLOAT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_I_FLOAT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
       break;
    case GL_RGB16F_ARB:
@@ -426,7 +441,7 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
    case GL_DEPTH_STENCIL_EXT:
    case GL_DEPTH24_STENCIL8_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_S8_UINT_Z24_UNORM);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_UNORM_X8_UINT);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_UNORM_S8_UINT);
       break;
 
    case GL_DEPTH_COMPONENT32F:
@@ -436,226 +451,244 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       ASSERT(ctx->TextureFormatSupported[MESA_FORMAT_Z32_FLOAT_S8X24_UINT]);
       return MESA_FORMAT_Z32_FLOAT_S8X24_UINT;
 
-   case GL_DUDV_ATI:
-   case GL_DU8DV8_ATI:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_DUDV8);
-      break;
-
    case GL_RED_SNORM:
    case GL_R8_SNORM:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_R8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R_SNORM8);
       break;
    case GL_RG_SNORM:
    case GL_RG8_SNORM:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RG88_REV);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8_SNORM);
       break;
    case GL_RGB_SNORM:
    case GL_RGB8_SNORM:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBX8888);
-      /* FALLTHROUGH */
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8B8X8_SNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8B8A8_SNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_X8B8G8R8_SNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8B8G8R8_SNORM);
+      break;
    case GL_RGBA_SNORM:
    case GL_RGBA8_SNORM:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8B8A8_SNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8B8G8R8_SNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8B8A8_SNORM);
       break;
    case GL_ALPHA_SNORM:
    case GL_ALPHA8_SNORM:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_A8);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A_SNORM8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8B8G8R8_SNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8B8A8_SNORM);
       break;
    case GL_LUMINANCE_SNORM:
    case GL_LUMINANCE8_SNORM:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_L8);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBX8888);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L_SNORM8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_X8B8G8R8_SNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8B8G8R8_SNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8B8A8_SNORM);
       break;
    case GL_LUMINANCE_ALPHA_SNORM:
    case GL_LUMINANCE8_ALPHA8_SNORM:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_AL88);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L8A8_SNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8L8_SNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8B8G8R8_SNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8B8A8_SNORM);
       break;
    case GL_INTENSITY_SNORM:
    case GL_INTENSITY8_SNORM:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_I8);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_I_SNORM8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8B8G8R8_SNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8B8A8_SNORM);
       break;
    case GL_R16_SNORM:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_R16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R_SNORM16);
       break;
    case GL_RG16_SNORM:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_GR1616);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R16G16_SNORM);
       break;
    case GL_RGB16_SNORM:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGB_16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_SNORM16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBX_SNORM16);
       /* FALLTHROUGH */
    case GL_RGBA16_SNORM:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA_16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SNORM16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8B8G8R8_SNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8B8A8_SNORM);
       break;
    case GL_ALPHA16_SNORM:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_A16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA_16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A_SNORM16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SNORM16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8B8G8R8_SNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8B8A8_SNORM);
       break;
    case GL_LUMINANCE16_SNORM:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_L16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L_SNORM16);
       /* FALLTHROUGH */
    case GL_LUMINANCE16_ALPHA16_SNORM:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_AL1616);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA_16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LA_SNORM16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SNORM16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8B8G8R8_SNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8B8A8_SNORM);
       break;
    case GL_INTENSITY16_SNORM:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_I16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA_16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_I_SNORM16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SNORM16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8B8G8R8_SNORM);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8B8A8_SNORM);
       break;
 
    case GL_SRGB_EXT:
    case GL_SRGB8_EXT:
+      /* there is no MESA_FORMAT_RGB_SRGB8 */
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8B8X8_SRGB);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8B8A8_SRGB);
+
       RETURN_IF_SUPPORTED(MESA_FORMAT_BGR_SRGB8);
       RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_SRGB);
+
+      RETURN_IF_SUPPORTED(MESA_FORMAT_X8B8G8R8_SRGB);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8R8G8B8_SRGB);
       break;
    case GL_SRGB_ALPHA_EXT:
    case GL_SRGB8_ALPHA8_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8B8A8_SRGB);
+
       RETURN_IF_SUPPORTED(MESA_FORMAT_A8B8G8R8_SRGB);
       RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_SRGB);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8R8G8B8_SRGB);
       break;
    case GL_SLUMINANCE_EXT:
    case GL_SLUMINANCE8_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_L_SRGB8);
       RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_SRGB);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8R8G8B8_SRGB);
       break;
    case GL_SLUMINANCE_ALPHA_EXT:
    case GL_SLUMINANCE8_ALPHA8_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_L8A8_SRGB);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8L8_SRGB);
       RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_SRGB);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8R8G8B8_SRGB);
       break;
    case GL_COMPRESSED_SLUMINANCE_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_L_SRGB8);
       RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_SRGB);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8R8G8B8_SRGB);
       break;
    case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_L8A8_SRGB);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8L8_SRGB);
       RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_SRGB);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8R8G8B8_SRGB);
       break;
    case GL_COMPRESSED_SRGB_EXT:
       if (ctx->Mesa_DXTn)
          RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB_DXT1);
       RETURN_IF_SUPPORTED(MESA_FORMAT_BGR_SRGB8);
       RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_SRGB);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8R8G8B8_SRGB);
       break;
    case GL_COMPRESSED_SRGB_ALPHA_EXT:
       if (ctx->Mesa_DXTn)
          RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT3); /* Not srgba_dxt1, see spec */
       RETURN_IF_SUPPORTED(MESA_FORMAT_A8B8G8R8_SRGB);
       RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_SRGB);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A8R8G8B8_SRGB);
       break;
 
    case GL_ALPHA8UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_UINT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A_UINT8);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);
       break;
    case GL_ALPHA16UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_UINT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A_UINT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16);
       break;
    case GL_ALPHA32UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_UINT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A_UINT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
       break;
    case GL_ALPHA8I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_INT8);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A_SINT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT8);
       break;
    case GL_ALPHA16I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_INT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A_SINT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT16);
       break;
    case GL_ALPHA32I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_INT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_A_SINT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT32);
       break;
    case GL_LUMINANCE8UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_UINT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L_UINT8);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);
       break;
    case GL_LUMINANCE16UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_UINT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L_UINT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16);
       break;
    case GL_LUMINANCE32UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_UINT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L_UINT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
       break;
    case GL_LUMINANCE8I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_INT8);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L_SINT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT8);
       break;
    case GL_LUMINANCE16I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_INT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L_SINT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT16);
       break;
    case GL_LUMINANCE32I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_INT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_L_SINT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT32);
       break;
    case GL_LUMINANCE_ALPHA8UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_UINT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LA_UINT8);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);
       break;
    case GL_LUMINANCE_ALPHA16UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_UINT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LA_UINT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16);
       break;
    case GL_LUMINANCE_ALPHA32UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_UINT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LA_UINT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
       break;
    case GL_LUMINANCE_ALPHA8I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_INT8);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LA_SINT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT8);
       break;
    case GL_LUMINANCE_ALPHA16I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_INT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LA_SINT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT16);
       break;
    case GL_LUMINANCE_ALPHA32I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_INT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LA_SINT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT32);
       break;
    case GL_INTENSITY8UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_UINT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_I_UINT8);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);
       break;
    case GL_INTENSITY16UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_UINT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_I_UINT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16);
       break;
    case GL_INTENSITY32UI_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_UINT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_I_UINT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
       break;
    case GL_INTENSITY8I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_INT8);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_I_SINT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT8);
       break;
    case GL_INTENSITY16I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_INT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_I_SINT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT16);
       break;
    case GL_INTENSITY32I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_INT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_I_SINT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT32);
       break;
 
    case GL_RGB8UI_EXT:
@@ -674,19 +707,19 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
       break;
    case GL_RGB8I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_SINT8);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBX_SINT8);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT8);
       break;
    case GL_RGB16I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_SINT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBX_SINT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT16);
       break;
    case GL_RGB32I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_SINT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBX_SINT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT32);
       break;
    case GL_RGBA8UI_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);
@@ -698,13 +731,13 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
       break;
    case GL_RGBA8I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT8);
       break;
    case GL_RGBA16I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT16);
       break;
    case GL_RGBA32I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT32);
       break;
 
    case GL_R8:
@@ -714,7 +747,7 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
 
    case GL_COMPRESSED_RED:
       if (target != GL_TEXTURE_1D && target != GL_TEXTURE_1D_ARRAY)
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RED_RGTC1);
+         RETURN_IF_SUPPORTED(MESA_FORMAT_R_RGTC1_UNORM);
       RETURN_IF_SUPPORTED(MESA_FORMAT_R_UNORM8);
       break;
 
@@ -729,7 +762,7 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
 
    case GL_COMPRESSED_RG:
       if (target != GL_TEXTURE_1D && target != GL_TEXTURE_1D_ARRAY)
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RG_RGTC2);
+         RETURN_IF_SUPPORTED(MESA_FORMAT_RG_RGTC2_UNORM);
       RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8_UNORM);
       break;
 
@@ -785,22 +818,22 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       RETURN_IF_SUPPORTED(MESA_FORMAT_RG_UINT32);
       break;
    case GL_R8I:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_R_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R_SINT8);
       break;
    case GL_RG8I:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_SINT8);
       break;
    case GL_R16I:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_R_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R_SINT16);
       break;
    case GL_RG16I:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_SINT16);
       break;
    case GL_R32I:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_R_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R_SINT32);
       break;
    case GL_RG32I:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_SINT32);
       break;
 
    case GL_RGB10_A2UI: