mesa: Rename 4 color component unsigned byte MESA_FORMATs

[mesa.git] / src / mesa / drivers / dri / nouveau / nv20_state_tex.c

diff --git a/src/mesa/drivers/dri/nouveau/nv20_state_tex.c b/src/mesa/drivers/dri/nouveau/nv20_state_tex.c
index ffbc2dfe09c90b3d76a4f4bca0959b893999d714..7af721850e22c59db36eb32704c9ad5f69d05042 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv20_state_tex.c
+++ b/src/mesa/drivers/dri/nouveau/nv20_state_tex.c
@@ -87,7 +87,7 @@ static uint32_t
 get_tex_format_pot(struct gl_texture_image *ti)
 {
        switch (ti->TexFormat) {
-       case MESA_FORMAT_ARGB8888:
+       case MESA_FORMAT_B8G8R8A8_UNORM:
                return NV20_3D_TEX_FORMAT_FORMAT_A8R8G8B8;
 
        case MESA_FORMAT_ARGB1555:
@@ -96,7 +96,7 @@ get_tex_format_pot(struct gl_texture_image *ti)
        case MESA_FORMAT_ARGB4444:
                return NV20_3D_TEX_FORMAT_FORMAT_A4R4G4B4;
 
-       case MESA_FORMAT_XRGB8888:
+       case MESA_FORMAT_B8G8R8X8_UNORM:
                return NV20_3D_TEX_FORMAT_FORMAT_X8R8G8B8;
 
        case MESA_FORMAT_RGB565:
@@ -128,7 +128,7 @@ static uint32_t
 get_tex_format_rect(struct gl_texture_image *ti)
 {
        switch (ti->TexFormat) {
-       case MESA_FORMAT_ARGB8888:
+       case MESA_FORMAT_B8G8R8A8_UNORM:
                return NV20_3D_TEX_FORMAT_FORMAT_A8R8G8B8_RECT;
 
        case MESA_FORMAT_ARGB1555:
@@ -137,7 +137,7 @@ get_tex_format_rect(struct gl_texture_image *ti)
        case MESA_FORMAT_ARGB4444:
                return NV20_3D_TEX_FORMAT_FORMAT_A4R4G4B4_RECT;
 
-       case MESA_FORMAT_XRGB8888:
+       case MESA_FORMAT_B8G8R8X8_UNORM:
                return NV20_3D_TEX_FORMAT_FORMAT_R8G8B8_RECT;
 
        case MESA_FORMAT_RGB565: