Mesa (master): swrast: fix more store_texel() bugs

[Brian Paul]

Module: Mesa
Branch: master
Commit: 63b59027563be933f86635489e70520b566360eb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=63b59027563be933f86635489e70520b566360eb

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Sep 13 13:30:17 2011 -0600

swrast: fix more store_texel() bugs

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=40412 on swrast.

---

 src/mesa/swrast/s_texfetch_tmp.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mesa/swrast/s_texfetch_tmp.h b/src/mesa/swrast/s_texfetch_tmp.h
index 0a06dcb..3eebd13 100644
--- a/src/mesa/swrast/s_texfetch_tmp.h
+++ b/src/mesa/swrast/s_texfetch_tmp.h
@@ -1343,9 +1343,9 @@ static void FETCH(f_l16)( const struct swrast_texture_image *texImage,
 static void store_texel_l16(struct swrast_texture_image *texImage,
                             GLint i, GLint j, GLint k, const void *texel)
 {
-   const GLushort *rgba = (const GLushort *) texel;
+   const GLchan *rgba = (const GLchan *) texel;
    GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   *dst = rgba[RCOMP];
+   *dst = CHAN_TO_USHORT(rgba[RCOMP]);
 }
 #endif
 
@@ -1391,9 +1391,9 @@ static void FETCH(f_i16)( const struct swrast_texture_image *texImage,
 static void store_texel_i16(struct swrast_texture_image *texImage,
                             GLint i, GLint j, GLint k, const void *texel)
 {
-   const GLushort *rgba = (const GLushort *) texel;
+   const GLchan *rgba = (const GLchan *) texel;
    GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   *dst = rgba[RCOMP];
+   *dst = CHAN_TO_USHORT(rgba[RCOMP]);
 }
 #endif