case GL_ALPHA4:
case GL_ALPHA8:
RETURN_IF_SUPPORTED(MESA_FORMAT_A_UNORM8);
- RETURN_IF_SUPPORTED(MESA_FORMAT_L8A8_UNORM);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_LA_UNORM8);
break;
case GL_ALPHA12:
case GL_ALPHA16:
RETURN_IF_SUPPORTED(MESA_FORMAT_A_UNORM16);
RETURN_IF_SUPPORTED(MESA_FORMAT_A_UNORM8);
- RETURN_IF_SUPPORTED(MESA_FORMAT_L8A8_UNORM);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_LA_UNORM8);
break;
/* Luminance formats */
/* Luminance/Alpha formats */
case GL_LUMINANCE4_ALPHA4:
RETURN_IF_SUPPORTED(MESA_FORMAT_L4A4_UNORM);
- RETURN_IF_SUPPORTED(MESA_FORMAT_L8A8_UNORM);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_LA_UNORM8);
break;
case 2:
case GL_LUMINANCE_ALPHA:
case GL_LUMINANCE6_ALPHA2:
case GL_LUMINANCE8_ALPHA8:
- RETURN_IF_SUPPORTED(MESA_FORMAT_L8A8_UNORM);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_LA_UNORM8);
break;
case GL_LUMINANCE12_ALPHA4:
case GL_LUMINANCE12_ALPHA12:
case GL_LUMINANCE16_ALPHA16:
RETURN_IF_SUPPORTED(MESA_FORMAT_LA_UNORM16);
- RETURN_IF_SUPPORTED(MESA_FORMAT_L8A8_UNORM);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_LA_UNORM8);
break;
case GL_INTENSITY:
case GL_COMPRESSED_ALPHA_ARB:
RETURN_IF_SUPPORTED(MESA_FORMAT_A_UNORM8);
- RETURN_IF_SUPPORTED(MESA_FORMAT_L8A8_UNORM);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_LA_UNORM8);
break;
case GL_COMPRESSED_LUMINANCE_ARB:
RETURN_IF_SUPPORTED(MESA_FORMAT_L_UNORM8);
break;
case GL_COMPRESSED_LUMINANCE_ALPHA_ARB:
- RETURN_IF_SUPPORTED(MESA_FORMAT_L8A8_UNORM);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_LA_UNORM8);
break;
case GL_COMPRESSED_INTENSITY_ARB:
RETURN_IF_SUPPORTED(MESA_FORMAT_I_UNORM8);
break;
case GL_RG_SNORM:
case GL_RG8_SNORM:
- RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8_SNORM);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RG_SNORM8);
break;
case GL_RGB_SNORM:
case GL_RGB8_SNORM:
break;
case GL_LUMINANCE_ALPHA_SNORM:
case GL_LUMINANCE8_ALPHA8_SNORM:
- RETURN_IF_SUPPORTED(MESA_FORMAT_L8A8_SNORM);
- RETURN_IF_SUPPORTED(MESA_FORMAT_A8L8_SNORM);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_LA_SNORM8);
RETURN_IF_SUPPORTED(MESA_FORMAT_A8B8G8R8_SNORM);
RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8B8A8_SNORM);
break;
RETURN_IF_SUPPORTED(MESA_FORMAT_R_SNORM16);
break;
case GL_RG16_SNORM:
- RETURN_IF_SUPPORTED(MESA_FORMAT_R16G16_SNORM);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RG_SNORM16);
break;
case GL_RGB16_SNORM:
RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_SNORM16);
break;
case GL_SLUMINANCE_ALPHA_EXT:
case GL_SLUMINANCE8_ALPHA8_EXT:
- RETURN_IF_SUPPORTED(MESA_FORMAT_L8A8_SRGB);
- RETURN_IF_SUPPORTED(MESA_FORMAT_A8L8_SRGB);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_LA_SRGB8);
RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_SRGB);
RETURN_IF_SUPPORTED(MESA_FORMAT_A8R8G8B8_SRGB);
break;
RETURN_IF_SUPPORTED(MESA_FORMAT_A8R8G8B8_SRGB);
break;
case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:
- RETURN_IF_SUPPORTED(MESA_FORMAT_L8A8_SRGB);
- RETURN_IF_SUPPORTED(MESA_FORMAT_A8L8_SRGB);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_LA_SRGB8);
RETURN_IF_SUPPORTED(MESA_FORMAT_B8G8R8A8_SRGB);
RETURN_IF_SUPPORTED(MESA_FORMAT_A8R8G8B8_SRGB);
break;
case GL_RG:
case GL_RG8:
- RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8_UNORM);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RG_UNORM8);
break;
case GL_COMPRESSED_RG:
if (target != GL_TEXTURE_1D && target != GL_TEXTURE_1D_ARRAY)
RETURN_IF_SUPPORTED(MESA_FORMAT_RG_RGTC2_UNORM);
- RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8_UNORM);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RG_UNORM8);
break;
case GL_RG16:
- RETURN_IF_SUPPORTED(MESA_FORMAT_R16G16_UNORM);
+ RETURN_IF_SUPPORTED(MESA_FORMAT_RG_UNORM16);
break;
case GL_R16F: