dri: Drop _dri_texformats that just obfuscate MESA_FORMAT names.

The remaining _dri_texformats are the ones that are variable depending
on the endianness of the system.
This commit is contained in:
Eric Anholt
2011-10-14 11:17:39 -07:00
parent 8d9c5167ac
commit a34c28f1aa
3 changed files with 3 additions and 10 deletions
-3
View File
@@ -1309,9 +1309,6 @@ gl_format _dri_texformat_rgb565 = MESA_FORMAT_NONE;
gl_format _dri_texformat_argb4444 = MESA_FORMAT_NONE;
gl_format _dri_texformat_argb1555 = MESA_FORMAT_NONE;
gl_format _dri_texformat_al88 = MESA_FORMAT_NONE;
gl_format _dri_texformat_a8 = MESA_FORMAT_A8;
gl_format _dri_texformat_i8 = MESA_FORMAT_I8;
gl_format _dri_texformat_l8 = MESA_FORMAT_L8;
/*@}*/
-4
View File
@@ -324,10 +324,6 @@ extern gl_format _dri_texformat_rgb565;
extern gl_format _dri_texformat_argb4444;
extern gl_format _dri_texformat_argb1555;
extern gl_format _dri_texformat_al88;
extern gl_format _dri_texformat_a8;
extern gl_format _dri_texformat_ci8;
extern gl_format _dri_texformat_i8;
extern gl_format _dri_texformat_l8;
extern void driInitTextureFormats( void );
+3 -3
View File
@@ -501,7 +501,7 @@ gl_format radeonChooseTextureFormat(struct gl_context * ctx,
if (IS_R200_CLASS(rmesa->radeonScreen))
return _dri_texformat_al88;
else
return _dri_texformat_a8;
return MESA_FORMAT_A8;
case 1:
case GL_LUMINANCE:
case GL_LUMINANCE4:
@@ -509,7 +509,7 @@ gl_format radeonChooseTextureFormat(struct gl_context * ctx,
case GL_LUMINANCE12:
case GL_LUMINANCE16:
case GL_COMPRESSED_LUMINANCE:
return _dri_texformat_l8;
return MESA_FORMAT_L8;
case 2:
case GL_LUMINANCE_ALPHA:
@@ -528,7 +528,7 @@ gl_format radeonChooseTextureFormat(struct gl_context * ctx,
case GL_INTENSITY12:
case GL_INTENSITY16:
case GL_COMPRESSED_INTENSITY:
return _dri_texformat_i8;
return MESA_FORMAT_I8;
case GL_YCBCR_MESA:
if (type == GL_UNSIGNED_SHORT_8_8_APPLE ||