Mesa (master): i965/gen4: Fix assertion failures in depthstencil piglit tests.

[Eric Anholt]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Oct 31 12:58:49 2012 -0700

i965/gen4: Fix assertion failures in depthstencil piglit tests.

Don't forget to set depth_mt even if !hiz_mt.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/drivers/dri/i965/brw_misc_state.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c b/src/mesa/drivers/dri/i965/brw_misc_state.c
index ce23fa0..d4b4c75 100644
--- a/src/mesa/drivers/dri/i965/brw_misc_state.c
+++ b/src/mesa/drivers/dri/i965/brw_misc_state.c
@@ -416,11 +416,12 @@ static void emit_depthbuffer(struct brw_context *brw)
    unsigned int len;
    bool separate_stencil = false;
 
-   if (depth_irb &&
-       depth_irb->mt &&
-       depth_irb->mt->hiz_mt) {
+   if (depth_irb){
       depth_mt = depth_irb->mt;
-      hiz_region = depth_irb->mt->hiz_mt->region;
+      if (depth_mt &&
+          depth_mt->hiz_mt) {
+         hiz_region = depth_irb->mt->hiz_mt->region;
+      }
    }
 
    /* 3DSTATE_DEPTH_BUFFER, 3DSTATE_STENCIL_BUFFER are both