mesa: Rename 4 color component unsigned byte MESA_FORMATs

[mesa.git] / src / mesa / drivers / dri / r200 / r200_texstate.c

diff --git a/src/mesa/drivers/dri/r200/r200_texstate.c b/src/mesa/drivers/dri/r200/r200_texstate.c
index 12afb767bda64894e35107028df655e03c91646a..80dea79d23f035dcacfea324d3786ac0e731551a 100644 (file)
--- a/src/mesa/drivers/dri/r200/r200_texstate.c
+++ b/src/mesa/drivers/dri/r200/r200_texstate.c
@@ -69,10 +69,10 @@ struct tx_table {
 
 static const struct tx_table tx_table_be[] =
 {
-   [ MESA_FORMAT_RGBA8888 ] = { R200_TXFORMAT_ABGR8888 | R200_TXFORMAT_ALPHA_IN_MAP, 0 },
-   [ MESA_FORMAT_RGBA8888_REV ] = { R200_TXFORMAT_RGBA8888 | R200_TXFORMAT_ALPHA_IN_MAP, 0 },
-   [ MESA_FORMAT_ARGB8888 ] = { R200_TXFORMAT_ARGB8888 | R200_TXFORMAT_ALPHA_IN_MAP, 0 },
-   [ MESA_FORMAT_ARGB8888_REV ] = { R200_TXFORMAT_ARGB8888 | R200_TXFORMAT_ALPHA_IN_MAP, 0 },
+   [ MESA_FORMAT_A8B8G8R8_UNORM ] = { R200_TXFORMAT_ABGR8888 | R200_TXFORMAT_ALPHA_IN_MAP, 0 },
+   [ MESA_FORMAT_R8G8B8A8_UNORM ] = { R200_TXFORMAT_RGBA8888 | R200_TXFORMAT_ALPHA_IN_MAP, 0 },
+   [ MESA_FORMAT_B8G8R8A8_UNORM ] = { R200_TXFORMAT_ARGB8888 | R200_TXFORMAT_ALPHA_IN_MAP, 0 },
+   [ MESA_FORMAT_A8R8G8B8_UNORM ] = { R200_TXFORMAT_ARGB8888 | R200_TXFORMAT_ALPHA_IN_MAP, 0 },
    [ MESA_FORMAT_RGB888 ] = { 0xffffffff, 0 },
    [ MESA_FORMAT_RGB565 ] = { R200_TXFORMAT_RGB565, 0 },
    [ MESA_FORMAT_RGB565_REV ] = { R200_TXFORMAT_RGB565, 0 },
@@ -97,10 +97,10 @@ static const struct tx_table tx_table_be[] =
 
 static const struct tx_table tx_table_le[] =
 {
-   [ MESA_FORMAT_RGBA8888 ] = { R200_TXFORMAT_RGBA8888 | R200_TXFORMAT_ALPHA_IN_MAP, 0 },
-   [ MESA_FORMAT_RGBA8888_REV ] = { R200_TXFORMAT_ABGR8888 | R200_TXFORMAT_ALPHA_IN_MAP, 0 },
-   [ MESA_FORMAT_ARGB8888 ] = { R200_TXFORMAT_ARGB8888 | R200_TXFORMAT_ALPHA_IN_MAP, 0 },
-   [ MESA_FORMAT_ARGB8888_REV ] = { R200_TXFORMAT_ARGB8888 | R200_TXFORMAT_ALPHA_IN_MAP, 0 },
+   [ MESA_FORMAT_A8B8G8R8_UNORM ] = { R200_TXFORMAT_RGBA8888 | R200_TXFORMAT_ALPHA_IN_MAP, 0 },
+   [ MESA_FORMAT_R8G8B8A8_UNORM ] = { R200_TXFORMAT_ABGR8888 | R200_TXFORMAT_ALPHA_IN_MAP, 0 },
+   [ MESA_FORMAT_B8G8R8A8_UNORM ] = { R200_TXFORMAT_ARGB8888 | R200_TXFORMAT_ALPHA_IN_MAP, 0 },
+   [ MESA_FORMAT_A8R8G8B8_UNORM ] = { R200_TXFORMAT_ARGB8888 | R200_TXFORMAT_ALPHA_IN_MAP, 0 },
    [ MESA_FORMAT_RGB888 ] = { R200_TXFORMAT_ARGB8888, 0 },
    [ MESA_FORMAT_RGB565 ] = { R200_TXFORMAT_RGB565, 0 },
    [ MESA_FORMAT_RGB565_REV ] = { R200_TXFORMAT_RGB565, 0 },
@@ -772,10 +772,10 @@ void r200SetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint texture_format
                        t->pp_txformat = tx_table_le[MESA_FORMAT_RGB888].format;
                }
                else {
-                       texFormat = MESA_FORMAT_ARGB8888;
-                       t->pp_txformat = tx_table_le[MESA_FORMAT_ARGB8888].format;
+                       texFormat = MESA_FORMAT_B8G8R8A8_UNORM;
+                       t->pp_txformat = tx_table_le[MESA_FORMAT_B8G8R8A8_UNORM].format;
                }
-               t->pp_txfilter |= tx_table_le[MESA_FORMAT_ARGB8888].filter;
+               t->pp_txfilter |= tx_table_le[MESA_FORMAT_B8G8R8A8_UNORM].filter;
                break;
        case 3:
        default: