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.

diff --git a/src/mesa/drivers/dri/common/texmem.c b/src/mesa/drivers/dri/common/texmem.c
index 798ef1e..b36dcdc 100644 (file)
--- a/src/mesa/drivers/dri/common/texmem.c
+++ b/src/mesa/drivers/dri/common/texmem.c
@@ -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;
 /*@}*/
 
 

diff --git a/src/mesa/drivers/dri/common/texmem.h b/src/mesa/drivers/dri/common/texmem.h
index 6dd07b8..00a02b3 100644 (file)
--- a/src/mesa/drivers/dri/common/texmem.h
+++ b/src/mesa/drivers/dri/common/texmem.h
@@ -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 );
 

diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c
index 4f8daa7..557d6d4 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_texture.c
+++ b/src/mesa/drivers/dri/radeon/radeon_texture.c
@@ -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 ||