diff options
| author | Ian Romanick <[email protected]> | 2010-09-20 07:03:34 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2011-08-29 11:07:49 -0700 |
| commit | 0c1b71665487fcaeffa8f4d7b5ad0ba425a2c169 (patch) | |
| tree | 1e1ee057aafd8fb6ad9234a7f11e195fed06c45c /src/mesa/drivers/dri/nouveau | |
| parent | 6f1846e3921e22f2744466ec791b8965ecee1d33 (diff) | |
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 <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/nouveau')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_texture.c | 9 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nv04_surface.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nv10_state_tex.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nv20_state_tex.c | 3 |
4 files changed, 0 insertions, 19 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c index 38b89de92e3..2f8c2f581ed 100644 --- 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 c1eda8b7f37..4a3000cd4de 100644 --- 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 620a686aea0..a0d64b1b96c 100644 --- 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 eab74aed5c2..0b1bd856bc3 100644 --- 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); } |