Mesa (master): i965: Also fix validation of Z32F_S8 textures.

[Eric Anholt]

Module: Mesa
Branch: master
Commit: 3b458416e3d5647f65be93bb78c96d5d68830660
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3b458416e3d5647f65be93bb78c96d5d68830660

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Dec 18 13:10:29 2012 -0800

i965: Also fix validation of Z32F_S8 textures.

This was caught by the assertion in the next commit.  It fixes the
remaining piglit depthstencil-render-miplevels cases, probably by
avoiding broken stencil copies in the validation path.

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>

---

 src/mesa/drivers/dri/intel/intel_mipmap_tree.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

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;