i915: Don't claim to support AL1616 when neither 830 nor 915 does it.
authorEric Anholt <eric@anholt.net>
Sat, 8 Jan 2011 00:13:12 +0000 (16:13 -0800)
committerEric Anholt <eric@anholt.net>
Sat, 8 Jan 2011 01:49:03 +0000 (17:49 -0800)
Fixes an abort in fbo-generatemipmap-formats.

src/mesa/drivers/dri/intel/intel_context.c

index 34deb2c2fc9cfb87701a05d2a6e21aa14ea5d74c..2a5029964befbf805aa928d993acb2627b103255 100644 (file)
@@ -695,7 +695,8 @@ intelInitContext(struct intel_context *intel,
    ctx->TextureFormatSupported[MESA_FORMAT_A8] = GL_TRUE;
    ctx->TextureFormatSupported[MESA_FORMAT_I8] = GL_TRUE;
    ctx->TextureFormatSupported[MESA_FORMAT_AL88] = GL_TRUE;
-   ctx->TextureFormatSupported[MESA_FORMAT_AL1616] = GL_TRUE;
+   if (intel->gen >= 4)
+      ctx->TextureFormatSupported[MESA_FORMAT_AL1616] = GL_TRUE;
    ctx->TextureFormatSupported[MESA_FORMAT_S8_Z24] = GL_TRUE;
    /*
     * This was disabled in initial FBO enabling to avoid combinations