diff options
| author | Brian Paul <brianp@vmware.com> | 2010-05-09 18:31:05 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-05-09 21:19:42 -0600 |
| commit | 969103124b95ed44082f2b4dd3c34fd2074e1532 (patch) | |
| tree | 869e1054998df58736d767ab5d63eab79ab82467 | |
| parent | 17e96718946486ef77927fcf3bb299d8bff32b98 (diff) | |
mesa: fix typos, comment in signed 16-bit tex fetch code
| -rw-r--r-- | src/mesa/main/texfetch_tmp.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/texfetch_tmp.h b/src/mesa/main/texfetch_tmp.h index 280c8d9400..e51fe3a577 100644 --- a/src/mesa/main/texfetch_tmp.h +++ b/src/mesa/main/texfetch_tmp.h @@ -1383,7 +1383,7 @@ FETCH(signed_rgb_16)(const struct gl_texture_image *texImage, const GLshort *s = TEXEL_ADDR(GLshort, texImage, i, j, k, 3); texel[RCOMP] = SHORT_TO_FLOAT_TEX( s[0] ); texel[GCOMP] = SHORT_TO_FLOAT_TEX( s[1] ); - texel[BCOMP] = SHORT_TO_FLOAT_TEX( s[3] ); + texel[BCOMP] = SHORT_TO_FLOAT_TEX( s[2] ); texel[ACOMP] = 1.0F; } @@ -1401,7 +1401,7 @@ store_texel_signed_rgb_16(struct gl_texture_image *texImage, #endif -/* MESA_FORMAT_SIGNED_RGB_16 ***********************************************/ +/* MESA_FORMAT_SIGNED_RGBA_16 ***********************************************/ static void FETCH(signed_rgba_16)(const struct gl_texture_image *texImage, @@ -1410,8 +1410,8 @@ FETCH(signed_rgba_16)(const struct gl_texture_image *texImage, const GLshort *s = TEXEL_ADDR(GLshort, texImage, i, j, k, 4); texel[RCOMP] = SHORT_TO_FLOAT_TEX( s[0] ); texel[GCOMP] = SHORT_TO_FLOAT_TEX( s[1] ); - texel[BCOMP] = SHORT_TO_FLOAT_TEX( s[3] ); - texel[ACOMP] = SHORT_TO_FLOAT_TEX( s[4] ); + texel[BCOMP] = SHORT_TO_FLOAT_TEX( s[2] ); + texel[ACOMP] = SHORT_TO_FLOAT_TEX( s[3] ); } #if DIM == 3 |