mesa: for ARB_fbo, lift restriction that all FBO attachments are same size and color...

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

diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index 0a92c9268361cd15654716910836c6a5d91f5d86..3ff633acd2bd1d0a03c2c1eb2d49c2e83ee97ff9 100644 (file)
--- a/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.1
+ * Version:  6.5.1
  *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -34,20 +34,26 @@
 #include "colormac.h"
 #include "context.h"
 #include "image.h"
+#include "mipmap.h"
 #include "texcompress.h"
 #include "texformat.h"
 #include "texstore.h"
 
+
 /**
- * Get the list of supported internal compression formats.
+ * Return list of (and count of) all specific texture compression
+ * formats that are supported.
  *
- * \param ctx GL context.
- * \param formats the resulting format list (may be NULL).
+ * \param ctx  the GL context
+ * \param formats  the resulting format list (may be NULL).
+ * \param all  if true return all formats, even those with  some kind
+ *             of restrictions/limitations (See GL_ARB_texture_compression
+ *             spec for more info).
  *
  * \return number of formats.
  */
 GLuint
-_mesa_get_compressed_formats( GLcontext *ctx, GLint *formats )
+_mesa_get_compressed_formats(GLcontext *ctx, GLint *formats, GLboolean all)
 {
    GLuint n = 0;
    if (ctx->Extensions.ARB_texture_compression) {
@@ -63,16 +69,20 @@ _mesa_get_compressed_formats( GLcontext *ctx, GLint *formats )
       if (ctx->Extensions.EXT_texture_compression_s3tc) {
          if (formats) {
             formats[n++] = GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
-            /* Skip this one because it has a restriction (all transparent
-             * pixels become black).  See the texture compressions spec for
-             * a detailed explanation.  This is what NVIDIA does.
-            formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
-            */
+            /* This format has some restrictions/limitations and so should
+             * not be returned via the GL_COMPRESSED_TEXTURE_FORMATS query.
+             * Specifically, all transparent pixels become black.  NVIDIA
+             * omits this format too.
+             */
+            if (all)
+               formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
             formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
             formats[n++] = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
          }
          else {
             n += 3;
+            if (all)
+               n += 1;
          }
       }
       if (ctx->Extensions.S3_s3tc) {
@@ -86,6 +96,19 @@ _mesa_get_compressed_formats( GLcontext *ctx, GLint *formats )
             n += 4;
          }
       }
+#if FEATURE_EXT_texture_sRGB
+      if (ctx->Extensions.EXT_texture_sRGB) {
+         if (formats) {
+            formats[n++] = GL_COMPRESSED_SRGB_S3TC_DXT1_EXT;
+            formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT;
+            formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT;
+            formats[n++] = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT;
+         }
+         else {
+            n += 4;
+         }
+      }
+#endif /* FEATURE_EXT_texture_sRGB */
    }
    return n;
 }
@@ -126,8 +149,6 @@ _mesa_compressed_texture_size( GLcontext *ctx,
       /* Textures smaller than 8x4 will effectively be made into 8x4 and
        * take 16 bytes.
        */
-      if (size < 16)
-         size = 16;
       return size;
    case MESA_FORMAT_RGB_DXT1:
    case MESA_FORMAT_RGBA_DXT1:
@@ -139,8 +160,6 @@ _mesa_compressed_texture_size( GLcontext *ctx,
       /* Textures smaller than 4x4 will effectively be made into 4x4 and
        * take 8 bytes.
        */
-      if (size < 8)
-         size = 8;
       return size;
    case MESA_FORMAT_RGBA_DXT3:
    case MESA_FORMAT_RGBA_DXT5:
@@ -152,8 +171,6 @@ _mesa_compressed_texture_size( GLcontext *ctx,
       /* Textures smaller than 4x4 will effectively be made into 4x4 and
        * take 16 bytes.
        */
-      if (size < 16)
-         size = 16;
       return size;
    default:
       _mesa_problem(ctx, "bad mesaFormat in _mesa_compressed_texture_size");