[Mesa-dev] [PATCH 2/2] mesa: rename MESA_FORMAT_RG88_REV to MESA_FORMAT_RG88
Brian Paul
brianp at vmware.com
Wed Nov 30 19:36:42 PST 2011
R is in the high byte, G in the low byte.
---
src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 2 +-
src/mesa/main/format_unpack.c | 4 ++--
src/mesa/main/formats.c | 8 ++++----
src/mesa/main/formats.h | 2 +-
src/mesa/main/texstore.c | 6 +++---
src/mesa/swrast/s_texfetch.c | 10 +++++-----
src/mesa/swrast/s_texfetch_tmp.h | 6 +++---
7 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index 378e083..f9b0b71 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -316,7 +316,7 @@ brw_format_for_mesa_format(gl_format mesa_format)
[MESA_FORMAT_YCBCR] = BRW_SURFACEFORMAT_YCRCB_SWAPUVY,
[MESA_FORMAT_R8] = BRW_SURFACEFORMAT_R8_UNORM,
[MESA_FORMAT_GR88] = BRW_SURFACEFORMAT_R8G8_UNORM,
- [MESA_FORMAT_RG88_REV] = 0,
+ [MESA_FORMAT_RG88] = 0,
[MESA_FORMAT_R16] = BRW_SURFACEFORMAT_R16_UNORM,
[MESA_FORMAT_RG1616] = BRW_SURFACEFORMAT_R16G16_UNORM,
[MESA_FORMAT_RG1616_REV] = 0,
diff --git a/src/mesa/main/format_unpack.c b/src/mesa/main/format_unpack.c
index a71fe61..5a95db1 100644
--- a/src/mesa/main/format_unpack.c
+++ b/src/mesa/main/format_unpack.c
@@ -517,7 +517,7 @@ unpack_GR88(const void *src, GLfloat dst[][4], GLuint n)
}
static void
-unpack_RG88_REV(const void *src, GLfloat dst[][4], GLuint n)
+unpack_RG88(const void *src, GLfloat dst[][4], GLuint n)
{
const GLushort *s = ((const GLushort *) src);
GLuint i;
@@ -1461,7 +1461,7 @@ get_unpack_rgba_function(gl_format format)
table[MESA_FORMAT_YCBCR_REV] = unpack_YCBCR_REV;
table[MESA_FORMAT_R8] = unpack_R8;
table[MESA_FORMAT_GR88] = unpack_GR88;
- table[MESA_FORMAT_RG88_REV] = unpack_RG88_REV;
+ table[MESA_FORMAT_RG88] = unpack_RG88;
table[MESA_FORMAT_R16] = unpack_R16;
table[MESA_FORMAT_RG1616] = unpack_RG1616;
table[MESA_FORMAT_RG1616_REV] = unpack_RG1616_REV;
diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index 9f3a056..fa9e682 100644
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -384,8 +384,8 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
1, 1, 2
},
{
- MESA_FORMAT_RG88_REV,
- "MESA_FORMAT_RG88_REV",
+ MESA_FORMAT_RG88,
+ "MESA_FORMAT_RG88",
GL_RG,
GL_UNSIGNED_NORMALIZED,
8, 8, 0, 0,
@@ -2065,7 +2065,7 @@ _mesa_format_to_type_and_comps(gl_format format,
case MESA_FORMAT_AL88:
case MESA_FORMAT_AL88_REV:
case MESA_FORMAT_GR88:
- case MESA_FORMAT_RG88_REV:
+ case MESA_FORMAT_RG88:
*datatype = GL_UNSIGNED_BYTE;
*comps = 2;
return;
@@ -2600,7 +2600,7 @@ _mesa_format_matches_format_and_type(gl_format gl_format,
return format == GL_RED && type == GL_UNSIGNED_BYTE;
case MESA_FORMAT_GR88:
return format == GL_RG && type == GL_UNSIGNED_BYTE && littleEndian;
- case MESA_FORMAT_RG88_REV:
+ case MESA_FORMAT_RG88:
return GL_FALSE;
case MESA_FORMAT_R16:
diff --git a/src/mesa/main/formats.h b/src/mesa/main/formats.h
index 2712c11..253af2d 100644
--- a/src/mesa/main/formats.h
+++ b/src/mesa/main/formats.h
@@ -92,7 +92,7 @@ typedef enum
MESA_FORMAT_YCBCR_REV, /* UorV UorV YYYY YYYY */
MESA_FORMAT_R8, /* RRRR RRRR */
MESA_FORMAT_GR88, /* GGGG GGGG RRRR RRRR */
- MESA_FORMAT_RG88_REV, /* RRRR RRRR GGGG GGGG */
+ MESA_FORMAT_RG88, /* RRRR RRRR GGGG GGGG */
MESA_FORMAT_R16, /* RRRR RRRR RRRR RRRR */
MESA_FORMAT_RG1616, /* GGGG GGGG GGGG GGGG RRRR RRRR RRRR RRRR */
MESA_FORMAT_RG1616_REV, /* RRRR RRRR RRRR RRRR GGGG GGGG GGGG GGGG */
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 78fc297..0bd6be4 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -2142,7 +2142,7 @@ _mesa_texstore_unorm88(TEXSTORE_PARAMS)
ASSERT(dstFormat == MESA_FORMAT_AL88 ||
dstFormat == MESA_FORMAT_AL88_REV ||
dstFormat == MESA_FORMAT_GR88 ||
- dstFormat == MESA_FORMAT_RG88_REV);
+ dstFormat == MESA_FORMAT_RG88);
ASSERT(texelBytes == 2);
if (!ctx->_ImageTransferState &&
@@ -2183,7 +2183,7 @@ _mesa_texstore_unorm88(TEXSTORE_PARAMS)
}
else {
if ((littleEndian && dstFormat == MESA_FORMAT_GR88) ||
- (!littleEndian && dstFormat == MESA_FORMAT_RG88_REV)) {
+ (!littleEndian && dstFormat == MESA_FORMAT_RG88)) {
dstmap[0] = 0;
dstmap[1] = 1;
}
@@ -4375,7 +4375,7 @@ _mesa_get_texstore_func(gl_format format)
table[MESA_FORMAT_YCBCR_REV] = _mesa_texstore_ycbcr;
table[MESA_FORMAT_R8] = _mesa_texstore_unorm8;
table[MESA_FORMAT_GR88] = _mesa_texstore_unorm88;
- table[MESA_FORMAT_RG88_REV] = _mesa_texstore_unorm88;
+ table[MESA_FORMAT_RG88] = _mesa_texstore_unorm88;
table[MESA_FORMAT_R16] = _mesa_texstore_unorm16;
table[MESA_FORMAT_RG1616] = _mesa_texstore_unorm1616;
table[MESA_FORMAT_RG1616_REV] = _mesa_texstore_unorm1616;
diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c
index 735f253..5a6d10b 100644
--- a/src/mesa/swrast/s_texfetch.c
+++ b/src/mesa/swrast/s_texfetch.c
@@ -368,11 +368,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 5a7c650..e9512b5 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;
--
1.7.3.4
More information about the mesa-dev
mailing list