From b7e3e0d64ea53b58ffa4cfdb4d100aaea5656df0 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 15 Mar 2006 01:36:52 +0000
Subject: s/GLuint/GLushort/ in read_depth_stencil_image()

---
 src/mesa/swrast/s_texstore.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/swrast/s_texstore.c b/src/mesa/swrast/s_texstore.c
index a3e6955..d6b98ac 100644
--- a/src/mesa/swrast/s_texstore.c
+++ b/src/mesa/swrast/s_texstore.c
@@ -148,11 +148,12 @@ read_depth_stencil_image(GLcontext *ctx, GLint x, GLint y,
       }
    }
    else {
-      GLuint z16[MAX_WIDTH];
+      GLushort z16[MAX_WIDTH];
       ASSERT(depthRb->DataType == GL_UNSIGNED_SHORT);
       for (i = 0; i < height; i++) {
          GLint j;
          _swrast_get_row(ctx, depthRb, width, x, y + i, z16, sizeof(GLushort));
+         /* convert GLushorts to GLuints */
          for (j = 0; j < width; j++) {
             dst[j] = z16[j];
          }
-- 
cgit v1.1