diff options
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/format_unpack.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/formats.c | 8 | ||||
| -rw-r--r-- | src/mesa/main/formats.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/texstore.c | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/mesa/main/format_unpack.c b/src/mesa/main/format_unpack.c index 47bc06fc6a2..565a8d05989 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; @@ -1467,7 +1467,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 0d4af7c169c..595da773ba5 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, @@ -2077,7 +2077,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; @@ -2613,7 +2613,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 2744d1e43fc..3960f028e4a 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 5f62cf864be..a2a49ce0c71 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -2143,7 +2143,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 && @@ -2184,7 +2184,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; } @@ -4376,7 +4376,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; |