diff options
author | Marek Olšák <[email protected]> | 2013-01-24 21:06:50 +0100 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2013-02-06 14:51:31 +0100 |
commit | ebe86b80825404cec057fb7e7519864754e9481c (patch) | |
tree | d46ea2770e5d0d1276771e04167f932ed5a82c7c /src/mesa/swrast | |
parent | cf37aef4143d4a0a679830318217251d027bb193 (diff) |
mesa: fixup inconsistent naming of RG16 formats
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/swrast')
-rw-r--r-- | src/mesa/swrast/s_texfetch.c | 4 | ||||
-rw-r--r-- | src/mesa/swrast/s_texfetch_tmp.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c index 1f196417259..a3c2091c48a 100644 --- a/src/mesa/swrast/s_texfetch.c +++ b/src/mesa/swrast/s_texfetch.c @@ -352,13 +352,13 @@ texfetch_funcs[] = fetch_texel_3d_f_r16 }, { - MESA_FORMAT_RG1616, + MESA_FORMAT_GR1616, fetch_texel_1d_f_rg1616, fetch_texel_2d_f_rg1616, fetch_texel_3d_f_rg1616 }, { - MESA_FORMAT_RG1616_REV, + MESA_FORMAT_RG1616, fetch_texel_1d_f_rg1616_rev, fetch_texel_2d_f_rg1616_rev, fetch_texel_3d_f_rg1616_rev diff --git a/src/mesa/swrast/s_texfetch_tmp.h b/src/mesa/swrast/s_texfetch_tmp.h index b65d33f0410..2de1f1a9735 100644 --- a/src/mesa/swrast/s_texfetch_tmp.h +++ b/src/mesa/swrast/s_texfetch_tmp.h @@ -797,7 +797,7 @@ static void FETCH(f_al88_rev)( const struct swrast_texture_image *texImage, -/* MESA_FORMAT_RG1616 ********************************************************/ +/* MESA_FORMAT_GR1616 ********************************************************/ /* Fetch texel from 1D, 2D or 3D rg1616 texture, return 4 GLchans */ static void FETCH(f_rg1616)( const struct swrast_texture_image *texImage, @@ -813,7 +813,7 @@ static void FETCH(f_rg1616)( const struct swrast_texture_image *texImage, -/* MESA_FORMAT_RG1616_REV ****************************************************/ +/* MESA_FORMAT_RG1616 ****************************************************/ /* Fetch texel from 1D, 2D or 3D rg1616_rev texture, return 4 GLchans */ static void FETCH(f_rg1616_rev)( const struct swrast_texture_image *texImage, |