svn merge ^/branches/released .

1 files changed, 220 insertions, 91 deletions

diff --git a/mesalib/src/mesa/main/texformat.c b/mesalib/src/mesa/main/texformat.c
index 7b0b17b25..325fb9ebc 100644
--- a/mesalib/src/mesa/main/texformat.c
+++ b/mesalib/src/mesa/main/texformat.c
@@ -34,9 +34,15 @@
 

 

 #include "context.h"

+#include "mfeatures.h"

+#include "mtypes.h"

 #include "texcompress.h"

 #include "texformat.h"

 

+#define RETURN_IF_SUPPORTED(f) do {		\

+   if (ctx->TextureFormatSupported[f])		\

+      return f;					\

+} while (0)

 

 /**

  * Choose an appropriate texture format given the format, type and

@@ -64,85 +70,132 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
       /* shallow RGBA formats */

       case 4:

       case GL_RGBA:

+	 if (type == GL_UNSIGNED_SHORT_4_4_4_4_REV) {

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444);

+	 } else if (type == GL_UNSIGNED_SHORT_1_5_5_5_REV) {

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB1555);

+	 }

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

+

       case GL_RGBA8:

-         return MESA_FORMAT_RGBA8888;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

       case GL_RGB5_A1:

-         return MESA_FORMAT_ARGB1555;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB1555);

+	 break;

       case GL_RGBA2:

-         return MESA_FORMAT_ARGB4444_REV; /* just to test another format*/

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444_REV); /* just to test another format*/

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444);

+	 break;

       case GL_RGBA4:

-         return MESA_FORMAT_ARGB4444;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444);

+	 break;

 

       /* deep RGBA formats */

       case GL_RGB10_A2:

-         return MESA_FORMAT_ARGB2101010;

-

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB2101010);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

       case GL_RGBA12:

       case GL_RGBA16:

-         return MESA_FORMAT_RGBA_16;

+	 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);

+	 break;

 

       /* shallow RGB formats */

       case 3:

       case GL_RGB:

       case GL_RGB8:

-         return MESA_FORMAT_RGB888;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

       case GL_R3_G3_B2:

-         return MESA_FORMAT_RGB332;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB332);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

       case GL_RGB4:

-         return MESA_FORMAT_RGB565_REV; /* just to test another format */

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565_REV); /* just to test another format */

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565);

+	 break;

       case GL_RGB5:

-         return MESA_FORMAT_RGB565;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565);

+	 break;

 

       /* deep RGB formats */

       case GL_RGB10:

       case GL_RGB12:

       case GL_RGB16:

-         return MESA_FORMAT_RGBA_16;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_16);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

 

       /* Alpha formats */

       case GL_ALPHA:

       case GL_ALPHA4:

       case GL_ALPHA8:

-         return MESA_FORMAT_A8;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_A8);

+	 break;

 

       case GL_ALPHA12:

       case GL_ALPHA16:

-         return MESA_FORMAT_A16;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_A16);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_A8);

+	 break;

 

       /* Luminance formats */

       case 1:

       case GL_LUMINANCE:

       case GL_LUMINANCE4:

       case GL_LUMINANCE8:

-         return MESA_FORMAT_L8;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_L8);

+	 break;

 

       case GL_LUMINANCE12:

       case GL_LUMINANCE16:

-         return MESA_FORMAT_L16;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_L16);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_L8);

+	 break;

 

       /* Luminance/Alpha formats */

       case GL_LUMINANCE4_ALPHA4:

-         return MESA_FORMAT_AL44;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL44);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);

+	 break;

 

       case 2:

       case GL_LUMINANCE_ALPHA:

       case GL_LUMINANCE6_ALPHA2:

       case GL_LUMINANCE8_ALPHA8:

-         return MESA_FORMAT_AL88;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);

+	 break;

 

       case GL_LUMINANCE12_ALPHA4:

       case GL_LUMINANCE12_ALPHA12:

       case GL_LUMINANCE16_ALPHA16:

-         return MESA_FORMAT_AL1616;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL1616);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);

+	 break;

 

       case GL_INTENSITY:

       case GL_INTENSITY4:

       case GL_INTENSITY8:

-         return MESA_FORMAT_I8;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_I8);

+	 break;

 

       case GL_INTENSITY12:

       case GL_INTENSITY16:

-         return MESA_FORMAT_I16;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_I16);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_I8);

+	 break;

 

       case GL_COLOR_INDEX:

       case GL_COLOR_INDEX1_EXT:

@@ -151,7 +204,8 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
       case GL_COLOR_INDEX12_EXT:

       case GL_COLOR_INDEX16_EXT:

       case GL_COLOR_INDEX8_EXT:

-         return MESA_FORMAT_CI8;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_CI8);

+	 break;

 

       default:

          ; /* fallthrough */

@@ -162,9 +216,12 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
          case GL_DEPTH_COMPONENT:

          case GL_DEPTH_COMPONENT24:

          case GL_DEPTH_COMPONENT32:

-            return MESA_FORMAT_Z32;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_Z32);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);

+	    break;

          case GL_DEPTH_COMPONENT16:

-            return MESA_FORMAT_Z16;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_Z16);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);

          default:

             ; /* fallthrough */

       }

@@ -172,27 +229,36 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
 

    switch (internalFormat) {

       case GL_COMPRESSED_ALPHA_ARB:

-         return MESA_FORMAT_A8;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_A8);

+	 break;

       case GL_COMPRESSED_LUMINANCE_ARB:

-         return MESA_FORMAT_L8;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_L8);

+	 break;

       case GL_COMPRESSED_LUMINANCE_ALPHA_ARB:

-         return MESA_FORMAT_AL88;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);

+	 break;

       case GL_COMPRESSED_INTENSITY_ARB:

-         return MESA_FORMAT_I8;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_I8);

+	 break;

       case GL_COMPRESSED_RGB_ARB:

          if (ctx->Extensions.EXT_texture_compression_s3tc ||

              ctx->Extensions.S3_s3tc)

-            return MESA_FORMAT_RGB_DXT1;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1);

          if (ctx->Extensions.TDFX_texture_compression_FXT1)

-            return MESA_FORMAT_RGB_FXT1;

-         return MESA_FORMAT_RGB888;

+	    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:

          if (ctx->Extensions.EXT_texture_compression_s3tc ||

              ctx->Extensions.S3_s3tc)

-            return MESA_FORMAT_RGBA_DXT3; /* Not rgba_dxt1, see spec */

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3); /* Not rgba_dxt1, see spec */

          if (ctx->Extensions.TDFX_texture_compression_FXT1)

-            return MESA_FORMAT_RGBA_FXT1;

-         return MESA_FORMAT_RGBA8888;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FXT1);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);

+	 break;

       default:

          ; /* fallthrough */

    }

@@ -200,9 +266,9 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
    if (ctx->Extensions.MESA_ycbcr_texture) {

       if (internalFormat == GL_YCBCR_MESA) {

          if (type == GL_UNSIGNED_SHORT_8_8_MESA)

-            return MESA_FORMAT_YCBCR;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_YCBCR);

          else

-            return MESA_FORMAT_YCBCR_REV;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_YCBCR_REV);

       }

    }

 

@@ -210,9 +276,11 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
    if (ctx->Extensions.TDFX_texture_compression_FXT1) {

       switch (internalFormat) {

          case GL_COMPRESSED_RGB_FXT1_3DFX:

-            return MESA_FORMAT_RGB_FXT1;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FXT1);

+	 break;

          case GL_COMPRESSED_RGBA_FXT1_3DFX:

-            return MESA_FORMAT_RGBA_FXT1;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FXT1);

+	 break;

          default:

             ; /* fallthrough */

       }

@@ -223,13 +291,17 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
    if (ctx->Extensions.EXT_texture_compression_s3tc) {

       switch (internalFormat) {

          case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:

-            return MESA_FORMAT_RGB_DXT1;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1);

+	    break;

          case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:

-            return MESA_FORMAT_RGBA_DXT1;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT1);

+	    break;

          case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:

-            return MESA_FORMAT_RGBA_DXT3;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3);

+	    break;

          case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:

-            return MESA_FORMAT_RGBA_DXT5;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT5);

+	    break;

          default:

             ; /* fallthrough */

       }

@@ -239,10 +311,12 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
       switch (internalFormat) {

          case GL_RGB_S3TC:

          case GL_RGB4_S3TC:

-            return MESA_FORMAT_RGB_DXT1;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1);

+	    break;

          case GL_RGBA_S3TC:

          case GL_RGBA4_S3TC:

-            return MESA_FORMAT_RGBA_DXT3;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3);

+	    break;

          default:

             ; /* fallthrough */

       }

@@ -252,29 +326,41 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
    if (ctx->Extensions.ARB_texture_float) {

       switch (internalFormat) {

          case GL_ALPHA16F_ARB:

-            return MESA_FORMAT_ALPHA_FLOAT16;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT16);

+	    break;

          case GL_ALPHA32F_ARB:

-            return MESA_FORMAT_ALPHA_FLOAT32;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_ALPHA_FLOAT32);

+	    break;

          case GL_LUMINANCE16F_ARB:

-            return MESA_FORMAT_LUMINANCE_FLOAT16;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT16);

+	    break;

          case GL_LUMINANCE32F_ARB:

-            return MESA_FORMAT_LUMINANCE_FLOAT32;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_FLOAT32);

+	    break;

          case GL_LUMINANCE_ALPHA16F_ARB:

-            return MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16);

+	    break;

          case GL_LUMINANCE_ALPHA32F_ARB:

-            return MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32);

+	    break;

          case GL_INTENSITY16F_ARB:

-            return MESA_FORMAT_INTENSITY_FLOAT16;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT16);

+	    break;

          case GL_INTENSITY32F_ARB:

-            return MESA_FORMAT_INTENSITY_FLOAT32;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_FLOAT32);

+	    break;

          case GL_RGB16F_ARB:

-            return MESA_FORMAT_RGB_FLOAT16;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FLOAT16);

+	    break;

          case GL_RGB32F_ARB:

-            return MESA_FORMAT_RGB_FLOAT32;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FLOAT32);

+	    break;

          case GL_RGBA16F_ARB:

-            return MESA_FORMAT_RGBA_FLOAT16;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT16);

+	    break;

          case GL_RGBA32F_ARB:

-            return MESA_FORMAT_RGBA_FLOAT32;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FLOAT32);

+	    break;

          default:

             ; /* fallthrough */

       }

@@ -284,7 +370,9 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
       switch (internalFormat) {

          case GL_DEPTH_STENCIL_EXT:

          case GL_DEPTH24_STENCIL8_EXT:

-            return MESA_FORMAT_Z24_S8;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_S8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);

+	    break;

          default:

             ; /* fallthrough */

       }

@@ -294,7 +382,8 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
       switch (internalFormat) {

          case GL_DUDV_ATI:

          case GL_DU8DV8_ATI:

-            return MESA_FORMAT_DUDV8;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_DUDV8);

+	    break;

          default:

             ; /* fallthrough */

       }

@@ -304,7 +393,9 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
       switch (internalFormat) {

          case GL_RGBA_SNORM:

          case GL_RGBA8_SNORM:

-            return MESA_FORMAT_SIGNED_RGBA8888;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);

+	    break;

          default:

             ; /* fallthrough */

       }

@@ -314,24 +405,32 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
       switch (internalFormat) {

          case GL_RED_SNORM:

          case GL_R8_SNORM:

-            return MESA_FORMAT_SIGNED_R8;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_R8);

+	    break;

          case GL_RG_SNORM:

          case GL_RG8_SNORM:

-            return MESA_FORMAT_SIGNED_RG88;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RG88);

+	    break;

          case GL_RGB_SNORM:

          case GL_RGB8_SNORM:

-            return MESA_FORMAT_SIGNED_RGBX8888;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBX8888);

+	    break;

          case GL_RGBA_SNORM:

          case GL_RGBA8_SNORM:

-            return MESA_FORMAT_SIGNED_RGBA8888;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);

+	    break;

          case GL_R16_SNORM:

-            return MESA_FORMAT_SIGNED_R_16;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_R_16);

+	    break;

          case GL_RG16_SNORM:

-            return MESA_FORMAT_SIGNED_RG_16;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RG_16);

+	    break;

          case GL_RGB16_SNORM:

-            return MESA_FORMAT_SIGNED_RGB_16;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGB_16);

+	    break;

          case GL_RGBA16_SNORM:

-            return MESA_FORMAT_SIGNED_RGBA_16;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA_16);

+	    break;

          default:

             ; /* fall-through */

       }

@@ -342,48 +441,68 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
       switch (internalFormat) {

          case GL_SRGB_EXT:

          case GL_SRGB8_EXT:

-            return MESA_FORMAT_SRGB8;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

          case GL_SRGB_ALPHA_EXT:

          case GL_SRGB8_ALPHA8_EXT:

-            return MESA_FORMAT_SRGBA8;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

          case GL_SLUMINANCE_EXT:

          case GL_SLUMINANCE8_EXT:

-            return MESA_FORMAT_SL8;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SL8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

          case GL_SLUMINANCE_ALPHA_EXT:

          case GL_SLUMINANCE8_ALPHA8_EXT:

-            return MESA_FORMAT_SLA8;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SLA8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

          case GL_COMPRESSED_SLUMINANCE_EXT:

-            return MESA_FORMAT_SL8;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SL8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

          case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:

-            return MESA_FORMAT_SLA8;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SLA8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

          case GL_COMPRESSED_SRGB_EXT:

 #if FEATURE_texture_s3tc

             if (ctx->Extensions.EXT_texture_compression_s3tc)

-               return MESA_FORMAT_SRGB_DXT1;

+	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB_DXT1);

 #endif

-            return MESA_FORMAT_SRGB8;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

          case GL_COMPRESSED_SRGB_ALPHA_EXT:

 #if FEATURE_texture_s3tc

             if (ctx->Extensions.EXT_texture_compression_s3tc)

-               return MESA_FORMAT_SRGBA_DXT3; /* Not srgba_dxt1, see spec */

+	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT3); /* Not srgba_dxt1, see spec */

 #endif

-            return MESA_FORMAT_SRGBA8;

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA8);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

+	    break;

 #if FEATURE_texture_s3tc

          case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:

             if (ctx->Extensions.EXT_texture_compression_s3tc)

-               return MESA_FORMAT_SRGB_DXT1;

+	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB_DXT1);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

             break;

          case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:

             if (ctx->Extensions.EXT_texture_compression_s3tc)

-               return MESA_FORMAT_SRGBA_DXT1;

+	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT1);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

             break;

          case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:

             if (ctx->Extensions.EXT_texture_compression_s3tc)

-               return MESA_FORMAT_SRGBA_DXT3;

+	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT3);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

             break;

          case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:

             if (ctx->Extensions.EXT_texture_compression_s3tc)

-               return MESA_FORMAT_SRGBA_DXT5;

+	       RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT5);

+	    RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);

             break;

 #endif

          default:

@@ -400,42 +519,48 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
       case GL_INTENSITY32UI_EXT:

       case GL_LUMINANCE32UI_EXT:

       case GL_LUMINANCE_ALPHA32UI_EXT:

-         return MESA_FORMAT_RGBA_UINT32;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);

+	 break;

       case GL_RGBA16UI_EXT:

       case GL_RGB16UI_EXT:

       case GL_ALPHA16UI_EXT:

       case GL_INTENSITY16UI_EXT:

       case GL_LUMINANCE16UI_EXT:

       case GL_LUMINANCE_ALPHA16UI_EXT:

-         return MESA_FORMAT_RGBA_UINT16;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT16);

+	 break;

       case GL_RGBA8UI_EXT:

       case GL_RGB8UI_EXT:

       case GL_ALPHA8UI_EXT:

       case GL_INTENSITY8UI_EXT:

       case GL_LUMINANCE8UI_EXT:

       case GL_LUMINANCE_ALPHA8UI_EXT:

-         return MESA_FORMAT_RGBA_UINT8;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);

+	 break;

       case GL_RGBA32I_EXT:

       case GL_RGB32I_EXT:

       case GL_ALPHA32I_EXT:

       case GL_INTENSITY32I_EXT:

       case GL_LUMINANCE32I_EXT:

       case GL_LUMINANCE_ALPHA32I_EXT:

-         return MESA_FORMAT_RGBA_INT32;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);

+	 break;

       case GL_RGBA16I_EXT:

       case GL_RGB16I_EXT:

       case GL_ALPHA16I_EXT:

       case GL_INTENSITY16I_EXT:

       case GL_LUMINANCE16I_EXT:

       case GL_LUMINANCE_ALPHA16I_EXT:

-         return MESA_FORMAT_RGBA_INT16;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);

+	 break;

       case GL_RGBA8I_EXT:

       case GL_RGB8I_EXT:

       case GL_ALPHA8I_EXT:

       case GL_INTENSITY8I_EXT:

       case GL_LUMINANCE8I_EXT:

       case GL_LUMINANCE_ALPHA8I_EXT:

-         return MESA_FORMAT_RGBA_INT8;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);

+	 break;

       }

    }

 

@@ -444,18 +569,22 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
       case GL_R8:

       case GL_RED:

       case GL_COMPRESSED_RED:

-	 return MESA_FORMAT_R8;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_R8);

+	 break;

 

       case GL_R16:

-         return MESA_FORMAT_R16;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_R16);

+	 break;

 

       case GL_RG:

       case GL_RG8:

       case GL_COMPRESSED_RG:

-	 return MESA_FORMAT_RG88;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RG88);

+	 break;

 

       case GL_RG16:

-	 return MESA_FORMAT_RG1616;

+	 RETURN_IF_SUPPORTED(MESA_FORMAT_RG1616);

+	 break;

 

       default:

          ; /* fallthrough */