diff options
| author | Eric Anholt <[email protected]> | 2012-12-18 13:10:29 -0800 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2012-12-22 13:46:04 -0800 |
| commit | 3b458416e3d5647f65be93bb78c96d5d68830660 (patch) | |
| tree | ed138f59215fad415ac5ba773f1bb815cde35b26 /src/mesa/drivers/dri | |
| parent | 46386816a77c6e5751a0685776c0a6320f46f8fe (diff) | |
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 <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri')
| -rw-r--r-- | 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 901d0ea2910..580d0215d49 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; |