From c1d4d4999303f9167b20f4e0674b9436e6295cf7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Thu, 24 Apr 2014 14:11:43 +0300 Subject: [PATCH] i915: Don't advertise Z formats in TextureFormatSupported on gen2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Gen2 doesn't support texturing from Z formats, so state as much. Reviewed-by: Eric Anholt Signed-off-by: Ville Syrjälä --- src/mesa/drivers/dri/i915/i915_context.c | 28 +++++++++++++----------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c index ebcab9477f3..44b0d8bb5ce 100644 --- a/src/mesa/drivers/dri/i915/i915_context.c +++ b/src/mesa/drivers/dri/i915/i915_context.c @@ -114,19 +114,21 @@ intel_init_texture_formats(struct gl_context *ctx) ctx->TextureFormatSupported[MESA_FORMAT_L8A8_UNORM] = true; /* Depth and stencil */ - ctx->TextureFormatSupported[MESA_FORMAT_Z24_UNORM_S8_UINT] = true; - ctx->TextureFormatSupported[MESA_FORMAT_Z24_UNORM_X8_UINT] = true; - - /* - * This was disabled in initial FBO enabling to avoid combinations - * of depth+stencil that wouldn't work together. We since decided - * that it was OK, since it's up to the app to come up with the - * combo that actually works, so this can probably be re-enabled. - */ - /* - ctx->TextureFormatSupported[MESA_FORMAT_Z_UNORM16] = true; - ctx->TextureFormatSupported[MESA_FORMAT_Z24] = true; - */ + if (intel->gen == 3) { + ctx->TextureFormatSupported[MESA_FORMAT_Z24_UNORM_S8_UINT] = true; + ctx->TextureFormatSupported[MESA_FORMAT_Z24_UNORM_X8_UINT] = true; + + /* + * This was disabled in initial FBO enabling to avoid combinations + * of depth+stencil that wouldn't work together. We since decided + * that it was OK, since it's up to the app to come up with the + * combo that actually works, so this can probably be re-enabled. + */ + /* + ctx->TextureFormatSupported[MESA_FORMAT_Z_UNORM16] = true; + ctx->TextureFormatSupported[MESA_FORMAT_Z24] = true; + */ + } /* ctx->Extensions.MESA_ycbcr_texture */ ctx->TextureFormatSupported[MESA_FORMAT_YCBCR] = true; -- 2.30.2