mesa: Remove extension checking from ChooseTexFormat.

This should already be handled by _mesa_base_tex_format() calls in
TexImage*.

1 files changed, 533 insertions, 651 deletions

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 362e210954b..fda5d74c1fe 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -207,94 +207,72 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
 	 RETURN_IF_SUPPORTED(MESA_FORMAT_I8);
 	 break;
 
-      default:
-         ; /* fallthrough */
-   }
-
-   if (ctx->Extensions.ARB_depth_texture) {
-      switch (internalFormat) {
-         case GL_DEPTH_COMPONENT:
-         case GL_DEPTH_COMPONENT24:
-         case GL_DEPTH_COMPONENT32:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_Z32);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_X8_Z24);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);
-	    break;
-         case GL_DEPTH_COMPONENT16:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_Z16);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_X8_Z24);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   switch (internalFormat) {
-      case GL_COMPRESSED_ALPHA_ARB:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_A8);
-	 break;
-      case GL_COMPRESSED_LUMINANCE_ARB:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_L8);
-	 break;
-      case GL_COMPRESSED_LUMINANCE_ALPHA_ARB:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);
-	 break;
-      case GL_COMPRESSED_INTENSITY_ARB:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_I8);
-	 break;
-      case GL_COMPRESSED_RGB_ARB:
-         /* We don't use texture compression for 1D and 1D array textures.
-          * For 1D textures, compressions doesn't buy us much.
-          * For 1D ARRAY textures, there's complicated issues with updating
-          * sub-regions on non-block boundaries with glCopyTexSubImage, among
-          * other issues.  FWIW, the GL_EXT_texture_array extension prohibits
-          * 1D ARRAY textures in S3TC format.
-          */
-         if (target != GL_TEXTURE_1D && target != GL_TEXTURE_1D_ARRAY) {
-            if (ctx->Extensions.EXT_texture_compression_s3tc ||
-                ctx->Extensions.ANGLE_texture_compression_dxt)
-               RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1);
-            if (ctx->Extensions.TDFX_texture_compression_FXT1)
-               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);
-	 break;
-      case GL_COMPRESSED_RGBA_ARB:
-         /* We don't use texture compression for 1D and 1D array textures. */
-         if (target != GL_TEXTURE_1D && target != GL_TEXTURE_1D_ARRAY) {
-            if (ctx->Extensions.EXT_texture_compression_s3tc ||
-                ctx->Extensions.ANGLE_texture_compression_dxt)
-               RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3); /* Not rgba_dxt1, see spec */
-            if (ctx->Extensions.TDFX_texture_compression_FXT1)
-               RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FXT1);
-         }
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
-	 break;
-      default:
-         ; /* fallthrough */
-   }
-
-   if (ctx->Extensions.ARB_ES2_compatibility) {
-      switch (internalFormat) {
-         case GL_RGB565:
-            RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565);
-            break;
-         default:
-         ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.MESA_ycbcr_texture) {
-      if (internalFormat == GL_YCBCR_MESA) {
-         if (type == GL_UNSIGNED_SHORT_8_8_MESA)
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_YCBCR);
-         else
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_YCBCR_REV);
-      }
-   }
+   case GL_DEPTH_COMPONENT:
+   case GL_DEPTH_COMPONENT24:
+   case GL_DEPTH_COMPONENT32:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_Z32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_X8_Z24);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);
+      break;
+   case GL_DEPTH_COMPONENT16:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_Z16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_X8_Z24);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);
+
+ case GL_COMPRESSED_ALPHA_ARB:
+    RETURN_IF_SUPPORTED(MESA_FORMAT_A8);
+    break;
+ case GL_COMPRESSED_LUMINANCE_ARB:
+    RETURN_IF_SUPPORTED(MESA_FORMAT_L8);
+    break;
+ case GL_COMPRESSED_LUMINANCE_ALPHA_ARB:
+    RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);
+    break;
+ case GL_COMPRESSED_INTENSITY_ARB:
+    RETURN_IF_SUPPORTED(MESA_FORMAT_I8);
+    break;
+ case GL_COMPRESSED_RGB_ARB:
+    /* We don't use texture compression for 1D and 1D array textures.
+     * For 1D textures, compressions doesn't buy us much.
+     * For 1D ARRAY textures, there's complicated issues with updating
+     * sub-regions on non-block boundaries with glCopyTexSubImage, among
+     * other issues.  FWIW, the GL_EXT_texture_array extension prohibits
+     * 1D ARRAY textures in S3TC format.
+     */
+    if (target != GL_TEXTURE_1D && target != GL_TEXTURE_1D_ARRAY) {
+       if (ctx->Extensions.EXT_texture_compression_s3tc ||
+           ctx->Extensions.ANGLE_texture_compression_dxt)
+          RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1);
+       if (ctx->Extensions.TDFX_texture_compression_FXT1)
+          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);
+    break;
+ case GL_COMPRESSED_RGBA_ARB:
+    /* We don't use texture compression for 1D and 1D array textures. */
+    if (target != GL_TEXTURE_1D && target != GL_TEXTURE_1D_ARRAY) {
+       if (ctx->Extensions.EXT_texture_compression_s3tc ||
+           ctx->Extensions.ANGLE_texture_compression_dxt)
+          RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3); /* Not rgba_dxt1, see spec */
+       if (ctx->Extensions.TDFX_texture_compression_FXT1)
+          RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FXT1);
+    }
+    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);
+    RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
+    break;
+
+   case GL_RGB565:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565);
+      break;
+
+   case GL_YCBCR_MESA:
+      if (type == GL_UNSIGNED_SHORT_8_8_MESA)
+         RETURN_IF_SUPPORTED(MESA_FORMAT_YCBCR);
+      else
+         RETURN_IF_SUPPORTED(MESA_FORMAT_YCBCR_REV);
+      break;
 
    /* For non-generic compressed format we assert two things:
     *
@@ -304,7 +282,6 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
     * 2. The driver only enables the extension if it supports all of the
     *    formats that are part of that extension.
     */
-   switch (internalFormat) {
    case GL_COMPRESSED_RGB_FXT1_3DFX:
       return MESA_FORMAT_RGB_FXT1;
    case GL_COMPRESSED_RGBA_FXT1_3DFX:
@@ -369,569 +346,474 @@ _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;
-   default:
-      ; /* fallthrough */
-   }
-
-   if (ctx->Extensions.ARB_texture_float) {
-      switch (internalFormat) {
-         case GL_ALPHA16F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT16);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_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_RGBA_FLOAT32);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_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_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_RGBA_FLOAT32);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_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_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_RGBA_FLOAT32);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_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_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_RGBA_FLOAT32);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT16);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
-	    break;
-         case GL_RGB16F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FLOAT16);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_XBGR16161616_FLOAT);
-	    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_RGBA_FLOAT32);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FLOAT16);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
-	    break;
-         case GL_RGBA16F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
-	    break;
-         case GL_RGBA32F_ARB:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
-	    break;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.EXT_texture_shared_exponent) {
-      switch (internalFormat) {
-         case GL_RGB9_E5:
-            ASSERT(ctx->TextureFormatSupported[MESA_FORMAT_RGB9_E5_FLOAT]);
-            return MESA_FORMAT_RGB9_E5_FLOAT;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.EXT_packed_float) {
-      switch (internalFormat) {
-         case GL_R11F_G11F_B10F:
-            ASSERT(ctx->TextureFormatSupported[MESA_FORMAT_R11_G11_B10_FLOAT]);
-            return MESA_FORMAT_R11_G11_B10_FLOAT;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.EXT_packed_depth_stencil) {
-      switch (internalFormat) {
-         case GL_DEPTH_STENCIL_EXT:
-         case GL_DEPTH24_STENCIL8_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_S8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);
-	    break;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.ARB_depth_buffer_float) {
-      switch (internalFormat) {
-         case GL_DEPTH_COMPONENT32F:
-            ASSERT(ctx->TextureFormatSupported[MESA_FORMAT_Z32_FLOAT]);
-            return MESA_FORMAT_Z32_FLOAT;
-         case GL_DEPTH32F_STENCIL8:
-            ASSERT(ctx->TextureFormatSupported[MESA_FORMAT_Z32_FLOAT_X24S8]);
-            return MESA_FORMAT_Z32_FLOAT_X24S8;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.ATI_envmap_bumpmap) {
-      switch (internalFormat) {
-         case GL_DUDV_ATI:
-         case GL_DU8DV8_ATI:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_DUDV8);
-	    break;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.EXT_texture_snorm) {
-      switch (internalFormat) {
-         case GL_RED_SNORM:
-         case GL_R8_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_R8);
-	    break;
-         case GL_RG_SNORM:
-         case GL_RG8_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RG88_REV);
-	    break;
-         case GL_RGB_SNORM:
-         case GL_RGB8_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBX8888);
-	    /* FALLTHROUGH */
-         case GL_RGBA_SNORM:
-         case GL_RGBA8_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);
-	    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);
-            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);
-            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);
-            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);
-            break;
-         case GL_R16_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_R16);
-	    break;
-         case GL_RG16_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_GR1616);
-	    break;
-         case GL_RGB16_SNORM:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGB_16);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_XBGR16161616_SNORM);
-	    /* 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);
-	    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);
-            break;
-         case GL_LUMINANCE16_SNORM:
-            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_L16);
-	    /* 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);
-            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);
-            break;
-         default:
-            ; /* fall-through */
-      }
-   }
-
-   if (ctx->Extensions.EXT_texture_sRGB) {
-      switch (internalFormat) {
-         case GL_SRGB_EXT:
-         case GL_SRGB8_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-         case GL_SRGB_ALPHA_EXT:
-         case GL_SRGB8_ALPHA8_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-         case GL_SLUMINANCE_EXT:
-         case GL_SLUMINANCE8_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SL8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-         case GL_SLUMINANCE_ALPHA_EXT:
-         case GL_SLUMINANCE8_ALPHA8_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SLA8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-         case GL_COMPRESSED_SLUMINANCE_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SL8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-         case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SLA8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-         case GL_COMPRESSED_SRGB_EXT:
-            if (ctx->Extensions.EXT_texture_compression_s3tc)
-	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB_DXT1);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-         case GL_COMPRESSED_SRGB_ALPHA_EXT:
-            if (ctx->Extensions.EXT_texture_compression_s3tc)
-	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT3); /* Not srgba_dxt1, see spec */
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA8);
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
-	    break;
-         default:
-            ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.EXT_texture_integer) {
-      switch (internalFormat) {
-      case GL_ALPHA8UI_EXT:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_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_RGBA_UINT16);
-         break;
-      case GL_ALPHA32UI_EXT:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_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);
-         break;
-      case GL_ALPHA16I_EXT:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_INT16);
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
-         break;
-      case GL_ALPHA32I_EXT:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_INT32);
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
-         break;
-      case GL_LUMINANCE8UI_EXT:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_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_RGBA_UINT16);
-         break;
-      case GL_LUMINANCE32UI_EXT:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_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);
-         break;
-      case GL_LUMINANCE16I_EXT:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_INT16);
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
-         break;
-      case GL_LUMINANCE32I_EXT:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_INT32);
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
-         break;
-      case GL_LUMINANCE_ALPHA8UI_EXT:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_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_RGBA_UINT16);
-         break;
-      case GL_LUMINANCE_ALPHA32UI_EXT:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_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);
-         break;
-      case GL_LUMINANCE_ALPHA16I_EXT:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_INT16);
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
-         break;
-      case GL_LUMINANCE_ALPHA32I_EXT:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_INT32);
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
-         break;
-      case GL_INTENSITY8UI_EXT:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_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_RGBA_UINT16);
-         break;
-      case GL_INTENSITY32UI_EXT:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_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);
-         break;
-      case GL_INTENSITY16I_EXT:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_INT16);
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
-         break;
-      case GL_INTENSITY32I_EXT:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_INT32);
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
-         break;
-      }
-   }
-
-   if (ctx->Version >= 30 ||
-       ctx->Extensions.EXT_texture_integer) {
-      switch (internalFormat) {
-      case GL_RGB8UI_EXT:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_UINT8);
-         RETURN_IF_SUPPORTED(MESA_FORMAT_XBGR8888_UINT);
-         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_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_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_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_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_RGBA_INT32);
-         break;
-      case GL_RGBA8UI_EXT:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);
-         break;
-      case GL_RGBA16UI_EXT:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16);
-         break;
-      case GL_RGBA32UI_EXT:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
-         break;
-      case GL_RGBA8I_EXT:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
-         break;
-      case GL_RGBA16I_EXT:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
-         break;
-      case GL_RGBA32I_EXT:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
-         break;
-      }
-   }
-
-   if (ctx->Extensions.ARB_texture_rg) {
-      switch (internalFormat) {
-      case GL_R8:
-      case GL_RED:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_R8);
-	 break;
-
-      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_R8);
-	 break;
-
-      case GL_R16:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_R16);
-	 break;
-
-      case GL_RG:
-      case GL_RG8:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_GR88);
-	 break;
-
-      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_GR88);
-	 break;
-
-      case GL_RG16:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_GR1616);
-	 break;
-
-      default:
-         ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Extensions.ARB_texture_rg && ctx->Extensions.ARB_texture_float) {
-      switch (internalFormat) {
-      case GL_R16F:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_R_FLOAT16);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RG_FLOAT16);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_R_FLOAT32);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RG_FLOAT32);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
-	 break;
-      case GL_R32F:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_R_FLOAT32);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RG_FLOAT32);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_R_FLOAT16);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RG_FLOAT16);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
-	 break;
-      case GL_RG16F:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RG_FLOAT16);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RG_FLOAT32);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
-	 break;
-      case GL_RG32F:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RG_FLOAT32);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RG_FLOAT16);
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
-	 break;
-
-      default:
-         ; /* fallthrough */
-      }
-   }
-
-   if (ctx->Version >= 30 ||
-       (ctx->Extensions.ARB_texture_rg &&
-        ctx->Extensions.EXT_texture_integer)) {
-      switch (internalFormat) {
-      case GL_R8UI:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_R_UINT8);
-         break;
-      case GL_RG8UI:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RG_UINT8);
-         break;
-      case GL_R16UI:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_R_UINT16);
-	 break;
-      case GL_RG16UI:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RG_UINT16);
-         break;
-      case GL_R32UI:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_R_UINT32);
-         break;
-      case GL_RG32UI:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RG_UINT32);
-         break;
-      case GL_R8I:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_R_INT8);
-         break;
-      case GL_RG8I:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RG_INT8);
-         break;
-      case GL_R16I:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_R_INT16);
-         break;
-      case GL_RG16I:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RG_INT16);
-         break;
-      case GL_R32I:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_R_INT32);
-         break;
-      case GL_RG32I:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RG_INT32);
-         break;
-      default:
-         break;
-      }
-   }
-
-   if (ctx->Extensions.ARB_texture_rgb10_a2ui) {
-      switch (internalFormat) {
-      case GL_RGB10_A2UI:
-         RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB2101010_UINT);
-         RETURN_IF_SUPPORTED(MESA_FORMAT_ABGR2101010_UINT);
-         break;
-      default:
-         break;
-      }
-   }
-   /* GL_BGRA can be an internal format *only* in OpenGL ES (1.x or 2.0).
-    */
-   if (_mesa_is_gles(ctx)) {
-      switch (internalFormat) {
-      case GL_BGRA:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
-	 break;
 
-      default:
-         ; /* fallthrough */
-      }
+   case GL_ALPHA16F_ARB:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_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_RGBA_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_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_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_RGBA_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_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_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_RGBA_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_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_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_RGBA_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
+      break;
+   case GL_RGB16F_ARB:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_XBGR16161616_FLOAT);
+      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_RGBA_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
+      break;
+   case GL_RGBA16F_ARB:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
+      break;
+   case GL_RGBA32F_ARB:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
+      break;
+
+   case GL_RGB9_E5:
+      /* GL_EXT_texture_shared_exponent -- just one format to support */
+      ASSERT(ctx->TextureFormatSupported[MESA_FORMAT_RGB9_E5_FLOAT]);
+      return MESA_FORMAT_RGB9_E5_FLOAT;
+
+   case GL_R11F_G11F_B10F:
+      /* GL_EXT_texture_packed_float -- just one format to support */
+      ASSERT(ctx->TextureFormatSupported[MESA_FORMAT_R11_G11_B10_FLOAT]);
+      return MESA_FORMAT_R11_G11_B10_FLOAT;
+
+   case GL_DEPTH_STENCIL_EXT:
+   case GL_DEPTH24_STENCIL8_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_S8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);
+      break;
+
+   case GL_DEPTH_COMPONENT32F:
+      ASSERT(ctx->TextureFormatSupported[MESA_FORMAT_Z32_FLOAT]);
+      return MESA_FORMAT_Z32_FLOAT;
+   case GL_DEPTH32F_STENCIL8:
+      ASSERT(ctx->TextureFormatSupported[MESA_FORMAT_Z32_FLOAT_X24S8]);
+      return MESA_FORMAT_Z32_FLOAT_X24S8;
+
+   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);
+      break;
+   case GL_RG_SNORM:
+   case GL_RG8_SNORM:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RG88_REV);
+      break;
+   case GL_RGB_SNORM:
+   case GL_RGB8_SNORM:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBX8888);
+      /* FALLTHROUGH */
+   case GL_RGBA_SNORM:
+   case GL_RGBA8_SNORM:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);
+      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);
+      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);
+      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);
+      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);
+      break;
+   case GL_R16_SNORM:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_R16);
+      break;
+   case GL_RG16_SNORM:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_GR1616);
+      break;
+   case GL_RGB16_SNORM:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGB_16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_XBGR16161616_SNORM);
+      /* 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);
+      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);
+      break;
+   case GL_LUMINANCE16_SNORM:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_L16);
+      /* 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);
+      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);
+      break;
+
+   case GL_SRGB_EXT:
+   case GL_SRGB8_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
+      break;
+   case GL_SRGB_ALPHA_EXT:
+   case GL_SRGB8_ALPHA8_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
+      break;
+   case GL_SLUMINANCE_EXT:
+   case GL_SLUMINANCE8_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SL8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
+      break;
+   case GL_SLUMINANCE_ALPHA_EXT:
+   case GL_SLUMINANCE8_ALPHA8_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SLA8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
+      break;
+   case GL_COMPRESSED_SLUMINANCE_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SL8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
+      break;
+   case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SLA8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
+      break;
+   case GL_COMPRESSED_SRGB_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB_DXT1);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
+      break;
+   case GL_COMPRESSED_SRGB_ALPHA_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT3); /* Not srgba_dxt1, see spec */
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
+      break;
+
+   case GL_ALPHA8UI_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_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_RGBA_UINT16);
+      break;
+   case GL_ALPHA32UI_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_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);
+      break;
+   case GL_ALPHA16I_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+      break;
+   case GL_ALPHA32I_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+      break;
+   case GL_LUMINANCE8UI_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_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_RGBA_UINT16);
+      break;
+   case GL_LUMINANCE32UI_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_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);
+      break;
+   case GL_LUMINANCE16I_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+      break;
+   case GL_LUMINANCE32I_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+      break;
+   case GL_LUMINANCE_ALPHA8UI_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_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_RGBA_UINT16);
+      break;
+   case GL_LUMINANCE_ALPHA32UI_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_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);
+      break;
+   case GL_LUMINANCE_ALPHA16I_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+      break;
+   case GL_LUMINANCE_ALPHA32I_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+      break;
+   case GL_INTENSITY8UI_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_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_RGBA_UINT16);
+      break;
+   case GL_INTENSITY32UI_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_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);
+      break;
+   case GL_INTENSITY16I_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+      break;
+   case GL_INTENSITY32I_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+      break;
+
+   case GL_RGB8UI_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_UINT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_XBGR8888_UINT);
+      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_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_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_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_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_RGBA_INT32);
+      break;
+   case GL_RGBA8UI_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);
+      break;
+   case GL_RGBA16UI_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16);
+      break;
+   case GL_RGBA32UI_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
+      break;
+   case GL_RGBA8I_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
+      break;
+   case GL_RGBA16I_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+      break;
+   case GL_RGBA32I_EXT:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+      break;
+
+   case GL_R8:
+   case GL_RED:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R8);
+      break;
+
+   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_R8);
+      break;
+
+   case GL_R16:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R16);
+      break;
+
+   case GL_RG:
+   case GL_RG8:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_GR88);
+      break;
+
+   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_GR88);
+      break;
+
+   case GL_RG16:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_GR1616);
+      break;
+
+   case GL_R16F:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
+      break;
+   case GL_R32F:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
+      break;
+   case GL_RG16F:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
+      break;
+   case GL_RG32F:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_FLOAT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);
+      break;
+
+   case GL_R8UI:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R_UINT8);
+      break;
+   case GL_RG8UI:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_UINT8);
+      break;
+   case GL_R16UI:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R_UINT16);
+      break;
+   case GL_RG16UI:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_UINT16);
+      break;
+   case GL_R32UI:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R_UINT32);
+      break;
+   case GL_RG32UI:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_UINT32);
+      break;
+   case GL_R8I:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R_INT8);
+      break;
+   case GL_RG8I:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_INT8);
+      break;
+   case GL_R16I:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R_INT16);
+      break;
+   case GL_RG16I:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_INT16);
+      break;
+   case GL_R32I:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R_INT32);
+      break;
+   case GL_RG32I:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_INT32);
+      break;
+
+   case GL_RGB10_A2UI:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB2101010_UINT);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_ABGR2101010_UINT);
+      break;
+
+   case GL_BGRA:
+      RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
+      break;
    }
 
    _mesa_problem(ctx, "unexpected format %s in _mesa_choose_tex_format()",