diff options
| author | Brian Paul <[email protected]> | 2011-11-30 20:35:02 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2011-12-02 07:22:39 -0700 |
| commit | b4aecc4e1861e60e40e14868719219084967e46d (patch) | |
| tree | fcc638fea88750bbd5e1e1eb36de13fd0e5ea980 /src/mesa/swrast | |
| parent | 0a3c895f341ae458b09dcdc9cbd674600366a925 (diff) | |
mesa: rename MESA_FORMAT_RG88_REV to MESA_FORMAT_RG88
R is in the high byte, G in the low byte.
Diffstat (limited to 'src/mesa/swrast')
| -rw-r--r-- | src/mesa/swrast/s_texfetch.c | 10 | ||||
| -rw-r--r-- | src/mesa/swrast/s_texfetch_tmp.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c index 6a80a4fd522..7cb6e68b1c7 100644 --- a/src/mesa/swrast/s_texfetch.c +++ b/src/mesa/swrast/s_texfetch.c @@ -369,11 +369,11 @@ texfetch_funcs[MESA_FORMAT_COUNT] = store_texel_gr88, }, { - MESA_FORMAT_RG88_REV, - fetch_texel_1d_f_rg88_rev, - fetch_texel_2d_f_rg88_rev, - fetch_texel_3d_f_rg88_rev, - store_texel_rg88_rev, + MESA_FORMAT_RG88, + fetch_texel_1d_f_rg88, + fetch_texel_2d_f_rg88, + fetch_texel_3d_f_rg88, + store_texel_rg88, }, { MESA_FORMAT_R16, diff --git a/src/mesa/swrast/s_texfetch_tmp.h b/src/mesa/swrast/s_texfetch_tmp.h index 5a7c6508804..e9512b561a9 100644 --- a/src/mesa/swrast/s_texfetch_tmp.h +++ b/src/mesa/swrast/s_texfetch_tmp.h @@ -1033,10 +1033,10 @@ static void store_texel_gr88(struct swrast_texture_image *texImage, #endif -/* MESA_FORMAT_RG88_REV ******************************************************/ +/* MESA_FORMAT_RG88 ******************************************************/ /* Fetch texel from 1D, 2D or 3D rg88_rev texture, return 4 GLchans */ -static void FETCH(f_rg88_rev)( const struct swrast_texture_image *texImage, +static void FETCH(f_rg88)( const struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel ) { const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1); @@ -1047,7 +1047,7 @@ static void FETCH(f_rg88_rev)( const struct swrast_texture_image *texImage, } #if DIM == 3 -static void store_texel_rg88_rev(struct swrast_texture_image *texImage, +static void store_texel_rg88(struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, const void *texel) { const GLubyte *rgba = (const GLubyte *) texel; |