[Mesa-dev] [PATCH 3/4] i965: Also fix validation of Z32F_S8 textures.

[Eric Anholt]

This was caught by the assertion in the next commit.  This causes 8
depthstencil cases to start passing (presumably because of fewer broken
texture validates happening) while regressing 3.  Given that this causes
there to be no more failures at the 585 and 146 sizes while only
introducing failures at the 292 size that is broken for other
depth/stencil formats as well, I'm comfortable with this.
---
 src/mesa/drivers/dri/intel/intel_mipmap_tree.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
index 901d0ea..580d021 100644
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -607,6 +607,8 @@ intel_miptree_match_image(struct intel_mipmap_tree *mt,
    gl_format mt_format = mt->format;
    if (mt->format == MESA_FORMAT_X8_Z24 && mt->stencil_mt)
       mt_format = MESA_FORMAT_S8_Z24;
+   if (mt->format == MESA_FORMAT_Z32_FLOAT && mt->stencil_mt)
+      mt_format = MESA_FORMAT_Z32_FLOAT_X24S8;
    if (mt->etc_format != MESA_FORMAT_NONE)
       mt_format = mt->etc_format;
 
-- 
1.7.10.4