dri: Remove MESA_FORMAT_CI8 bits from drivers that don't do paletted textures

This came from the "kill it with fire" discussion at XDS 2010.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c
index 38b89de92e3ebd2b598fd618291a5bb004e867aa..2f8c2f581edb384d10086d6027b1ca23244161fd 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_texture.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_texture.c
@@ -289,15 +289,6 @@ nouveau_choose_tex_format(struct gl_context *ctx, GLint internalFormat,
        case GL_INTENSITY8:
                return MESA_FORMAT_I8;
 
-       case GL_COLOR_INDEX:
-       case GL_COLOR_INDEX1_EXT:
-       case GL_COLOR_INDEX2_EXT:
-       case GL_COLOR_INDEX4_EXT:
-       case GL_COLOR_INDEX12_EXT:
-       case GL_COLOR_INDEX16_EXT:
-       case GL_COLOR_INDEX8_EXT:
-               return MESA_FORMAT_CI8;
-
        default:
                assert(0);
        }

diff --git a/src/mesa/drivers/dri/nouveau/nv04_surface.c b/src/mesa/drivers/dri/nouveau/nv04_surface.c
index c1eda8b7f37042db159084de7c4dfefcc8027018..4a3000cd4de8f0795ef35ddfa2fffa3cc912ae4f 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv04_surface.c
+++ b/src/mesa/drivers/dri/nouveau/nv04_surface.c
@@ -41,7 +41,6 @@ swzsurf_format(gl_format format)
        case MESA_FORMAT_L8:
        case MESA_FORMAT_I8:
        case MESA_FORMAT_RGB332:
-       case MESA_FORMAT_CI8:
                return NV04_SWIZZLED_SURFACE_FORMAT_COLOR_Y8;
 
        case MESA_FORMAT_RGB565:
@@ -81,7 +80,6 @@ surf2d_format(gl_format format)
        case MESA_FORMAT_L8:
        case MESA_FORMAT_I8:
        case MESA_FORMAT_RGB332:
-       case MESA_FORMAT_CI8:
                return NV04_CONTEXT_SURFACES_2D_FORMAT_Y8;
 
        case MESA_FORMAT_RGB565:
@@ -121,7 +119,6 @@ rect_format(gl_format format)
        case MESA_FORMAT_L8:
        case MESA_FORMAT_I8:
        case MESA_FORMAT_RGB332:
-       case MESA_FORMAT_CI8:
                return NV04_GDI_RECTANGLE_TEXT_COLOR_FORMAT_A8R8G8B8;
 
        case MESA_FORMAT_RGB565:
@@ -161,7 +158,6 @@ sifm_format(gl_format format)
        case MESA_FORMAT_L8:
        case MESA_FORMAT_I8:
        case MESA_FORMAT_RGB332:
-       case MESA_FORMAT_CI8:
                return NV03_SCALED_IMAGE_FROM_MEMORY_COLOR_FORMAT_AY8;
 
        case MESA_FORMAT_RGB565:

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state_tex.c b/src/mesa/drivers/dri/nouveau/nv10_state_tex.c
index 620a686aea0a7b76e9b9e021c9d90479c1c64e2b..a0d64b1b96cd4890580cf60c84c67102c0592aab 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv10_state_tex.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state_tex.c
@@ -114,9 +114,6 @@ get_tex_format_pot(struct gl_texture_image *ti)
        case MESA_FORMAT_L8:
                return NV10_3D_TEX_FORMAT_FORMAT_L8;
 
-       case MESA_FORMAT_CI8:
-               return NV10_3D_TEX_FORMAT_FORMAT_INDEX8;
-
        default:
                assert(0);
        }

diff --git a/src/mesa/drivers/dri/nouveau/nv20_state_tex.c b/src/mesa/drivers/dri/nouveau/nv20_state_tex.c
index eab74aed5c23d3d58282f5a80ffdb221b2e18bd3..0b1bd856bc3464da0a76338805dd14073bf085c6 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv20_state_tex.c
+++ b/src/mesa/drivers/dri/nouveau/nv20_state_tex.c
@@ -111,9 +111,6 @@ get_tex_format_pot(struct gl_texture_image *ti)
        case MESA_FORMAT_L8:
                return NV20_3D_TEX_FORMAT_FORMAT_L8;
 
-       case MESA_FORMAT_CI8:
-               return NV20_3D_TEX_FORMAT_FORMAT_INDEX8;
-
        default:
                assert(0);
        }

diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c
index e4388a021ed9149aa0a9756c3cea7e7f6ed5d536..e73e79b9c3a068af9f83ee1bbea17e6ad071028e 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_texstate.c
+++ b/src/mesa/drivers/dri/r300/r300_texstate.c
@@ -109,8 +109,6 @@ int32_t r300TranslateTexFormat(gl_format mesaFormat)
                        return R300_EASY_TX_FORMAT(X, X, X, ONE, X8);
                case MESA_FORMAT_I8:
                        return R300_EASY_TX_FORMAT(X, X, X, X, X8);
-               case MESA_FORMAT_CI8:
-                       return R300_EASY_TX_FORMAT(X, X, X, X, X8);
                case MESA_FORMAT_YCBCR:
                        return R300_EASY_TX_FORMAT(X, Y, Z, ONE, G8R8_G8B8) | R300_TX_FORMAT_YUV_MODE;
                case MESA_FORMAT_YCBCR_REV:

diff --git a/src/mesa/drivers/dri/r600/evergreen_blit.c b/src/mesa/drivers/dri/r600/evergreen_blit.c
index 95ac4aee5ce411ad1e3c7993ef4d0f0256e61232..f51bbc602a05acc4e399f0b15a22b810c3e582c8 100644 (file)
--- a/src/mesa/drivers/dri/r600/evergreen_blit.c
+++ b/src/mesa/drivers/dri/r600/evergreen_blit.c
@@ -58,7 +58,6 @@ unsigned evergreen_check_blit(gl_format mesa_format)
     case MESA_FORMAT_RGB332:
     case MESA_FORMAT_A8:
     case MESA_FORMAT_I8:
-    case MESA_FORMAT_CI8:
     case MESA_FORMAT_L8:
     case MESA_FORMAT_RGBA_FLOAT32:
     case MESA_FORMAT_RGBA_FLOAT16:
@@ -268,7 +267,6 @@ eg_set_render_target(context_t *context, struct radeon_bo *bo, gl_format mesa_fo
            source_format = 1;
             break;
     case MESA_FORMAT_I8:
-    case MESA_FORMAT_CI8:
             format = COLOR_8;
             comp_swap = SWAP_STD;
            number_type = NUMBER_UNORM;
@@ -922,7 +920,6 @@ eg_set_tex_resource(context_t * context,
                     SQ_TEX_RESOURCE_WORD4_0__DST_SEL_W_shift, SQ_TEX_RESOURCE_WORD4_0__DST_SEL_W_mask);
            break;
     case MESA_FORMAT_I8: /* X, X, X, X */
-    case MESA_FORMAT_CI8:
            SETfield(sq_tex_resource7, FMT_8,
                     EG_SQ_TEX_RESOURCE_WORD7_0__DATA_FORMAT_shift,
                     EG_SQ_TEX_RESOURCE_WORD7_0__DATA_FORMAT_mask);

diff --git a/src/mesa/drivers/dri/r600/evergreen_chip.c b/src/mesa/drivers/dri/r600/evergreen_chip.c
index 388a96ff067a6e6617f2f0f0ffe81e04cde1b98c..42ecd2d827693f08e5a79b1834fa31f71032aec1 100644 (file)
--- a/src/mesa/drivers/dri/r600/evergreen_chip.c
+++ b/src/mesa/drivers/dri/r600/evergreen_chip.c
@@ -1221,7 +1221,6 @@ static void evergreenSetRenderTarget(context_t *context, int id)
            source_format = 1;
             break;
     case MESA_FORMAT_I8:
-    case MESA_FORMAT_CI8:
             format = COLOR_8;
             comp_swap = SWAP_STD;
            number_type = NUMBER_UNORM;

diff --git a/src/mesa/drivers/dri/r600/evergreen_tex.c b/src/mesa/drivers/dri/r600/evergreen_tex.c
index 7222e5a1987175180aa8fa349b27ba144733b355..b2b67b00f125e2e5c5e382919afe26b3a00b9fb9 100644 (file)
--- a/src/mesa/drivers/dri/r600/evergreen_tex.c
+++ b/src/mesa/drivers/dri/r600/evergreen_tex.c
@@ -496,7 +496,6 @@ static GLboolean evergreenGetTexFormat(struct gl_texture_object *tObj, gl_format
                         SQ_TEX_RESOURCE_WORD4_0__DST_SEL_W_shift, SQ_TEX_RESOURCE_WORD4_0__DST_SEL_W_mask);
                break;
        case MESA_FORMAT_I8: /* X, X, X, X */
-       case MESA_FORMAT_CI8:
                SETfield(t->SQ_TEX_RESOURCE7, FMT_8,
                             EG_SQ_TEX_RESOURCE_WORD7_0__DATA_FORMAT_shift, 
                  EG_SQ_TEX_RESOURCE_WORD7_0__DATA_FORMAT_mask);

diff --git a/src/mesa/drivers/dri/r600/r600_blit.c b/src/mesa/drivers/dri/r600/r600_blit.c
index 2d47afdcbbfe51999d6ad5248ac3131dbe308371..a84f119e49a438a9c65a14166b14dd4f43003705 100644 (file)
--- a/src/mesa/drivers/dri/r600/r600_blit.c
+++ b/src/mesa/drivers/dri/r600/r600_blit.c
@@ -55,7 +55,6 @@ unsigned r600_check_blit(gl_format mesa_format)
     case MESA_FORMAT_RGB332:
     case MESA_FORMAT_A8:
     case MESA_FORMAT_I8:
-    case MESA_FORMAT_CI8:
     case MESA_FORMAT_L8:
     case MESA_FORMAT_RGBA_FLOAT32:
     case MESA_FORMAT_RGBA_FLOAT16:
@@ -252,7 +251,6 @@ set_render_target(context_t *context, struct radeon_bo *bo, gl_format mesa_forma
            SETfield(cb_color0_info, NUMBER_UNORM, NUMBER_TYPE_shift, NUMBER_TYPE_mask);
             break;
     case MESA_FORMAT_I8:
-    case MESA_FORMAT_CI8:
             format = COLOR_8;
             comp_swap = SWAP_STD;
            SETbit(cb_color0_info, SOURCE_FORMAT_bit);
@@ -910,7 +908,6 @@ set_tex_resource(context_t * context,
                     SQ_TEX_RESOURCE_WORD4_0__DST_SEL_W_shift, SQ_TEX_RESOURCE_WORD4_0__DST_SEL_W_mask);
            break;
     case MESA_FORMAT_I8: /* X, X, X, X */
-    case MESA_FORMAT_CI8:
            SETfield(sq_tex_resource1, FMT_8,
                     SQ_TEX_RESOURCE_WORD1_0__DATA_FORMAT_shift, SQ_TEX_RESOURCE_WORD1_0__DATA_FORMAT_mask);
 

diff --git a/src/mesa/drivers/dri/r600/r600_tex.c b/src/mesa/drivers/dri/r600/r600_tex.c
index ac704e651018a4107a2c392d679e21052c274e2f..890bada40d805b29dabac8081eb5efef77159942 100644 (file)
--- a/src/mesa/drivers/dri/r600/r600_tex.c
+++ b/src/mesa/drivers/dri/r600/r600_tex.c
@@ -415,7 +415,6 @@ unsigned r600IsFormatRenderable(gl_format mesa_format)
        case MESA_FORMAT_RGB332:
        case MESA_FORMAT_A8:
        case MESA_FORMAT_I8:
-       case MESA_FORMAT_CI8:
        case MESA_FORMAT_L8:
        case MESA_FORMAT_RGBA_FLOAT32:
        case MESA_FORMAT_RGBA_FLOAT16:

diff --git a/src/mesa/drivers/dri/r600/r600_texstate.c b/src/mesa/drivers/dri/r600/r600_texstate.c
index 65fae7195fd13f7bbc5e61dcfbe97fbef6a4a7c8..b3fe544019a88ffbdad6ea448ef11de97e19aaa2 100644 (file)
--- a/src/mesa/drivers/dri/r600/r600_texstate.c
+++ b/src/mesa/drivers/dri/r600/r600_texstate.c
@@ -490,7 +490,6 @@ static GLboolean r600GetTexFormat(struct gl_texture_object *tObj, gl_format mesa
                         SQ_TEX_RESOURCE_WORD4_0__DST_SEL_W_shift, SQ_TEX_RESOURCE_WORD4_0__DST_SEL_W_mask);
                break;
        case MESA_FORMAT_I8: /* X, X, X, X */
-       case MESA_FORMAT_CI8:
                SETfield(t->SQ_TEX_RESOURCE1, FMT_8,
                         SQ_TEX_RESOURCE_WORD1_0__DATA_FORMAT_shift, SQ_TEX_RESOURCE_WORD1_0__DATA_FORMAT_mask);
 

diff --git a/src/mesa/drivers/dri/r600/r700_chip.c b/src/mesa/drivers/dri/r600/r700_chip.c
index 10fa3f9762bef0489fe37ced6e8256599b5281cb..c653c085220773af66c848ed1dae23eede27062e 100644 (file)
--- a/src/mesa/drivers/dri/r600/r700_chip.c
+++ b/src/mesa/drivers/dri/r600/r700_chip.c
@@ -410,7 +410,6 @@ static void r700SetRenderTarget(context_t *context, int id)
            SETbit(r700->render_target[id].CB_COLOR0_INFO.u32All, SOURCE_FORMAT_bit);
             break;
     case MESA_FORMAT_I8:
-    case MESA_FORMAT_CI8:
             format = COLOR_8;
             comp_swap = SWAP_STD;
            number_type = NUMBER_UNORM;