From: Eric Anholt <eric@anholt.net>
Date: Tue, 15 Nov 2011 23:49:26 +0000 (-0800)
Subject: i965: Drop intel_context.c's texture format set up for this driver.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=899e6ea8d3cac3f60c60935d59e020094b4b79a7;p=mesa.git

i965: Drop intel_context.c's texture format set up for this driver.

This is a no-op change on gen6, but should result in some
actually-unsupported formats on gen4 no longer being chosen (like
RGBA_FLOAT32 now being RGBA_FLOAT16).

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 9af21c8dace..4973b247c88 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -641,12 +641,6 @@ intelInitContext(struct intel_context *intel,
    ctx->TextureFormatSupported[MESA_FORMAT_A8] = true;
    ctx->TextureFormatSupported[MESA_FORMAT_I8] = true;
    ctx->TextureFormatSupported[MESA_FORMAT_AL88] = true;
-   if (intel->gen >= 4) {
-      ctx->TextureFormatSupported[MESA_FORMAT_L16] = true;
-      ctx->TextureFormatSupported[MESA_FORMAT_A16] = true;
-      ctx->TextureFormatSupported[MESA_FORMAT_I16] = true;
-      ctx->TextureFormatSupported[MESA_FORMAT_AL1616] = true;
-   }
 
    /* Depth and stencil */
    ctx->TextureFormatSupported[MESA_FORMAT_S8_Z24] = true;
@@ -678,87 +672,6 @@ intelInitContext(struct intel_context *intel,
    ctx->TextureFormatSupported[MESA_FORMAT_RGBA_DXT3] = true;
    ctx->TextureFormatSupported[MESA_FORMAT_RGBA_DXT5] = true;
 
-#ifndef I915
-   /* GL_ARB_texture_compression_rgtc */
-   ctx->TextureFormatSupported[MESA_FORMAT_RED_RGTC1] = true;
-   ctx->TextureFormatSupported[MESA_FORMAT_SIGNED_RED_RGTC1] = true;
-   ctx->TextureFormatSupported[MESA_FORMAT_RG_RGTC2] = true;
-   ctx->TextureFormatSupported[MESA_FORMAT_SIGNED_RG_RGTC2] = true;
-
-   /* GL_ARB_texture_rg */
-   ctx->TextureFormatSupported[MESA_FORMAT_R8] = true;
-   ctx->TextureFormatSupported[MESA_FORMAT_R16] = true;
-   ctx->TextureFormatSupported[MESA_FORMAT_RG88] = true;
-   ctx->TextureFormatSupported[MESA_FORMAT_RG1616] = true;
-
-   /* GL_MESA_texture_signed_rgba / GL_EXT_texture_snorm */
-   ctx->TextureFormatSupported[MESA_FORMAT_DUDV8] = true;
-   ctx->TextureFormatSupported[MESA_FORMAT_SIGNED_RGBA8888_REV] = true;
-   ctx->TextureFormatSupported[MESA_FORMAT_SIGNED_R8] = true;
-   ctx->TextureFormatSupported[MESA_FORMAT_SIGNED_RG88_REV] = true;
-   ctx->TextureFormatSupported[MESA_FORMAT_SIGNED_R16] = true;
-   ctx->TextureFormatSupported[MESA_FORMAT_SIGNED_GR1616] = true;
-
-   /* GL_EXT_texture_sRGB */
-   ctx->TextureFormatSupported[MESA_FORMAT_SARGB8] = true;
-   if (intel->gen >= 5 || intel->is_g4x)
-      ctx->TextureFormatSupported[MESA_FORMAT_SRGB_DXT1] = true;
-   ctx->TextureFormatSupported[MESA_FORMAT_SRGBA_DXT1] = true;
-   ctx->TextureFormatSupported[MESA_FORMAT_SRGBA_DXT3] = true;
-   ctx->TextureFormatSupported[MESA_FORMAT_SRGBA_DXT5] = true;
-   if (intel->gen >= 5 || intel->is_g4x) {
-      ctx->TextureFormatSupported[MESA_FORMAT_SL8] = true;
-      ctx->TextureFormatSupported[MESA_FORMAT_SLA8] = true;
-   }
-
-   if (intel->gen >= 4) {
-      /* Each combination of 32-bit ints are supported, but the RGB 32-bit ints
-       * don't support use as a render target (GPU hangs).
-       */
-      ctx->TextureFormatSupported[MESA_FORMAT_R_INT32] = true;
-      ctx->TextureFormatSupported[MESA_FORMAT_RG_INT32] = true;
-      ctx->TextureFormatSupported[MESA_FORMAT_RGB_INT32] = true;
-      ctx->TextureFormatSupported[MESA_FORMAT_RGBA_INT32] = true;
-
-      ctx->TextureFormatSupported[MESA_FORMAT_R_UINT32] = true;
-      ctx->TextureFormatSupported[MESA_FORMAT_RG_UINT32] = true;
-      ctx->TextureFormatSupported[MESA_FORMAT_RGB_UINT32] = true;
-      ctx->TextureFormatSupported[MESA_FORMAT_RGBA_UINT32] = true;
-
-      /* For 16 and 8 bits, RGB is unsupported entirely. */
-      ctx->TextureFormatSupported[MESA_FORMAT_R_UINT16] = true;
-      ctx->TextureFormatSupported[MESA_FORMAT_RG_UINT16] = true;
-      ctx->TextureFormatSupported[MESA_FORMAT_RGBA_UINT16] = true;
-      ctx->TextureFormatSupported[MESA_FORMAT_R_INT16] = true;
-      ctx->TextureFormatSupported[MESA_FORMAT_RG_INT16] = true;
-      ctx->TextureFormatSupported[MESA_FORMAT_RGBA_INT16] = true;
-
-      ctx->TextureFormatSupported[MESA_FORMAT_R_UINT8] = true;
-      ctx->TextureFormatSupported[MESA_FORMAT_RG_UINT8] = true;
-      ctx->TextureFormatSupported[MESA_FORMAT_RGBA_UINT8] = true;
-      ctx->TextureFormatSupported[MESA_FORMAT_R_INT8] = true;
-      ctx->TextureFormatSupported[MESA_FORMAT_RG_INT8] = true;
-      ctx->TextureFormatSupported[MESA_FORMAT_RGBA_INT8] = true;
-   }
-
-#ifdef TEXTURE_FLOAT_ENABLED
-   ctx->TextureFormatSupported[MESA_FORMAT_RGBA_FLOAT32] = true;
-   ctx->TextureFormatSupported[MESA_FORMAT_RG_FLOAT32] = true;
-   ctx->TextureFormatSupported[MESA_FORMAT_R_FLOAT32] = true;
-   ctx->TextureFormatSupported[MESA_FORMAT_INTENSITY_FLOAT32] = true;
-   ctx->TextureFormatSupported[MESA_FORMAT_LUMINANCE_FLOAT32] = true;
-   ctx->TextureFormatSupported[MESA_FORMAT_ALPHA_FLOAT32] = true;
-   ctx->TextureFormatSupported[MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32] = true;
-
-   /* GL_EXT_texture_shared_exponent */
-   ctx->TextureFormatSupported[MESA_FORMAT_RGB9_E5_FLOAT] = true;
-
-   /* GL_EXT_packed_float */
-   ctx->TextureFormatSupported[MESA_FORMAT_R11_G11_B10_FLOAT] = true;
-#endif
-
-#endif /* !I915 */
-
    driParseConfigFiles(&intel->optionCache, &intelScreen->optionCache,
                        sPriv->myNum, (intel->gen >= 4) ? "i965" : "i915");
    if (intel->gen < 4)