mesa: Branch 'master'

[Brian Paul]

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

New commits:
diff-tree b61d74c57589cf22f003ac7f9db3aa47fd1b3cb2 (from 9f66025f54a3a9cc33cba56ec7c9f59721ddbec7)
Author: Brian <brian at yutani.localnet.net>
Date:   Wed Apr 11 09:04:18 2007 -0600

    as with prev commit, also fix color index mode zoomed depth copies (bug 10608)

diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c
index ae5bdab..dbbfc58 100644
--- a/src/mesa/swrast/s_copypix.c
+++ b/src/mesa/swrast/s_copypix.c
@@ -542,7 +542,7 @@ copy_depth_pixels( GLcontext *ctx, GLint
       }
       else {
          if (zoom)
-            _swrast_write_zoomed_index_span(ctx, destx, desty, &span);
+            _swrast_write_zoomed_depth_span(ctx, destx, desty, &span);
          else
             _swrast_write_index_span(ctx, &span);
       }