i965: Clean up brw_prepare_vertices()

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

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index ab5e25dcded83f7f4309de0e0b6e5ee708a3789c..2542cea856b65154e1b15504bc523b1b65b2b7f0 100644 (file)
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -34,6 +34,8 @@
 
 
 #include "context.h"
+#include "mfeatures.h"
+#include "mtypes.h"
 #include "texcompress.h"
 #include "texformat.h"
 
@@ -68,14 +70,25 @@ _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_IF_SUPPORTED(MESA_FORMAT_RGBA8888);
+        RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
         break;
       case GL_RGB5_A1:
         RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB1555);
         break;
       case GL_RGBA2:
         RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444_REV); /* just to test another format*/
+        RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444);
         break;
       case GL_RGBA4:
         RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB4444);
@@ -84,10 +97,14 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
       /* deep RGBA formats */
       case GL_RGB10_A2:
         RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB2101010);
+        RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
         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);
         break;
 
       /* shallow RGB formats */
@@ -95,12 +112,18 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
       case GL_RGB:
       case GL_RGB8:
         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_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_IF_SUPPORTED(MESA_FORMAT_RGB565_REV); /* just to test another format */
+        RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565);
         break;
       case GL_RGB5:
         RETURN_IF_SUPPORTED(MESA_FORMAT_RGB565);
@@ -111,6 +134,8 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
       case GL_RGB12:
       case GL_RGB16:
         RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_16);
+        RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);
+        RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
         break;
 
       /* Alpha formats */
@@ -123,6 +148,7 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
       case GL_ALPHA12:
       case GL_ALPHA16:
         RETURN_IF_SUPPORTED(MESA_FORMAT_A16);
+        RETURN_IF_SUPPORTED(MESA_FORMAT_A8);
         break;
 
       /* Luminance formats */
@@ -136,11 +162,13 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
       case GL_LUMINANCE12:
       case GL_LUMINANCE16:
         RETURN_IF_SUPPORTED(MESA_FORMAT_L16);
+        RETURN_IF_SUPPORTED(MESA_FORMAT_L8);
         break;
 
       /* Luminance/Alpha formats */
       case GL_LUMINANCE4_ALPHA4:
         RETURN_IF_SUPPORTED(MESA_FORMAT_AL44);
+        RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);
         break;
 
       case 2:
@@ -154,6 +182,7 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
       case GL_LUMINANCE12_ALPHA12:
       case GL_LUMINANCE16_ALPHA16:
         RETURN_IF_SUPPORTED(MESA_FORMAT_AL1616);
+        RETURN_IF_SUPPORTED(MESA_FORMAT_AL88);
         break;
 
       case GL_INTENSITY:
@@ -165,6 +194,7 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
       case GL_INTENSITY12:
       case GL_INTENSITY16:
         RETURN_IF_SUPPORTED(MESA_FORMAT_I16);
+        RETURN_IF_SUPPORTED(MESA_FORMAT_I8);
         break;
 
       case GL_COLOR_INDEX:
@@ -187,10 +217,11 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
          case GL_DEPTH_COMPONENT24:
          case GL_DEPTH_COMPONENT32:
            RETURN_IF_SUPPORTED(MESA_FORMAT_Z32);
+           RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);
            break;
          case GL_DEPTH_COMPONENT16:
            RETURN_IF_SUPPORTED(MESA_FORMAT_Z16);
-           break;
+           RETURN_IF_SUPPORTED(MESA_FORMAT_S8_Z24);
          default:
             ; /* fallthrough */
       }
@@ -216,6 +247,8 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
          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:
          if (ctx->Extensions.EXT_texture_compression_s3tc ||
@@ -224,6 +257,7 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
          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 */
@@ -337,6 +371,7 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint 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 */
@@ -359,6 +394,7 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
          case GL_RGBA_SNORM:
          case GL_RGBA8_SNORM:
            RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888);
+           RETURN_IF_SUPPORTED(MESA_FORMAT_SIGNED_RGBA8888_REV);
            break;
          default:
             ; /* fallthrough */
@@ -406,24 +442,30 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint 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 FEATURE_texture_s3tc
@@ -431,6 +473,7 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
               RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB_DXT1);
 #endif
            RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB8);
+           RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
            break;
          case GL_COMPRESSED_SRGB_ALPHA_EXT:
 #if FEATURE_texture_s3tc
@@ -438,23 +481,28 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
               RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT3); /* Not srgba_dxt1, see spec */
 #endif
            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_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_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_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_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT5);
+           RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8);
             break;
 #endif
          default:
@@ -543,6 +591,17 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
       }
    }
 
+   if (ctx->Extensions.EXT_texture_format_BGRA8888) {
+      switch (internalFormat) {
+      case GL_BGRA:
+        RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
+        break;
+
+      default:
+         ; /* fallthrough */
+      }
+   }
+
    _mesa_problem(ctx, "unexpected format in _mesa_choose_tex_format()");
    return MESA_FORMAT_NONE;
 }