mesa: Branch 'master'

[Brian Paul]

 src/mesa/swrast/s_readpix.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 441f038748975d4e14ca3da7098045dd1013e531 (from dd868b4100f748e5187c58138d1b55fe8e8eddef)
Author: Nicolai Haehnle <nhaehnle at gmail.com>
Date:   Sun Mar 18 11:02:35 2007 -0600

    fix assertion in read_depth_pixels()

diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c
index 15dc810..c5524c0 100644
--- a/src/mesa/swrast/s_readpix.c
+++ b/src/mesa/swrast/s_readpix.c
@@ -119,7 +119,7 @@ read_depth_pixels( GLcontext *ctx,
             && !biasOrScale && !packing->SwapBytes) {
       /* Special case: directly read 24-bit unsigned depth values. */
       GLint j;
-      ASSERT(rb->InternalFormat == GL_DEPTH_COMPONENT32);
+      ASSERT(rb->InternalFormat == GL_DEPTH_COMPONENT24);
       ASSERT(rb->DataType == GL_UNSIGNED_INT);
       for (j = 0; j < height; j++, y++) {
          GLuint *dest = (GLuint *)