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 | 0a3c895f341ae458b09dcdc9cbd674600366a925 (patch) | |
| tree | 10bc6be40cbc50f70af760d78e65f92a502996ee /src/mesa/main/texstore.c | |
| parent | 0be753a14333b1298649da1d889fe1fc7d3e9f43 (diff) | |
mesa: rename MESA_FORMAT_RG88 to MESA_FORMAT_GR88
To better reflect the component ordering and be consistent with other
format names.
Diffstat (limited to 'src/mesa/main/texstore.c')
| -rw-r--r-- | src/mesa/main/texstore.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index 1e1c749679d..5f62cf864be 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_RG88 || + dstFormat == MESA_FORMAT_GR88 || dstFormat == MESA_FORMAT_RG88_REV); ASSERT(texelBytes == 2); @@ -2151,7 +2151,7 @@ _mesa_texstore_unorm88(TEXSTORE_PARAMS) ((dstFormat == MESA_FORMAT_AL88 && baseInternalFormat == GL_LUMINANCE_ALPHA && srcFormat == GL_LUMINANCE_ALPHA) || - (dstFormat == MESA_FORMAT_RG88 && + (dstFormat == MESA_FORMAT_GR88 && baseInternalFormat == srcFormat)) && srcType == GL_UNSIGNED_BYTE && littleEndian) { @@ -2183,7 +2183,7 @@ _mesa_texstore_unorm88(TEXSTORE_PARAMS) } } else { - if ((littleEndian && dstFormat == MESA_FORMAT_RG88) || + if ((littleEndian && dstFormat == MESA_FORMAT_GR88) || (!littleEndian && dstFormat == MESA_FORMAT_RG88_REV)) { dstmap[0] = 0; dstmap[1] = 1; @@ -2225,7 +2225,7 @@ _mesa_texstore_unorm88(TEXSTORE_PARAMS) for (row = 0; row < srcHeight; row++) { GLushort *dstUS = (GLushort *) dstRow; if (dstFormat == MESA_FORMAT_AL88 || - dstFormat == MESA_FORMAT_RG88) { + dstFormat == MESA_FORMAT_GR88) { for (col = 0; col < srcWidth; col++) { /* src[0] is luminance (or R), src[1] is alpha (or G) */ dstUS[col] = PACK_COLOR_88( src[1], @@ -4375,7 +4375,7 @@ _mesa_get_texstore_func(gl_format format) table[MESA_FORMAT_YCBCR] = _mesa_texstore_ycbcr; table[MESA_FORMAT_YCBCR_REV] = _mesa_texstore_ycbcr; table[MESA_FORMAT_R8] = _mesa_texstore_unorm8; - table[MESA_FORMAT_RG88] = _mesa_texstore_unorm88; + table[MESA_FORMAT_GR88] = _mesa_texstore_unorm88; table[MESA_FORMAT_RG88_REV] = _mesa_texstore_unorm88; table[MESA_FORMAT_R16] = _mesa_texstore_unorm16; table[MESA_FORMAT_RG1616] = _mesa_texstore_unorm1616; |