summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/i965/brw_wm.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-09-21 12:05:37 -0700
committerEric Anholt <eric@anholt.net>2010-09-21 12:29:57 -0700
commitdd9a88f4ddf4e5fa384792f891a1cc3d8ff73946 (patch)
tree4baf4501066875a9af204476453bea1421a0e2d5 /src/mesa/drivers/dri/i965/brw_wm.c
parent4a0bc4716db7bbcbcd65c0f993704733f47d41f7 (diff)
i965: Track the windowizer's dispatch for kill pixel, promoted, and OQ
Looks like the problem was we weren't passing the depth to the render target as expected, so the chip would wedge. Fixes GPU hang in occlusion-query-discard. Bug #30097
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_wm.c')
-rw-r--r--src/mesa/drivers/dri/i965/brw_wm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c
index d70be7bda2..17ff3e2b2b 100644
--- a/src/mesa/drivers/dri/i965/brw_wm.c
+++ b/src/mesa/drivers/dri/i965/brw_wm.c
@@ -215,6 +215,7 @@ static void do_wm_prog( struct brw_context *brw,
static void brw_wm_populate_key( struct brw_context *brw,
struct brw_wm_prog_key *key )
{
+ struct intel_context *intel = &brw->intel;
GLcontext *ctx = &brw->intel.ctx;
/* BRW_NEW_FRAGMENT_PROGRAM */
const struct brw_fragment_program *fp =
@@ -279,7 +280,8 @@ static void brw_wm_populate_key( struct brw_context *brw,
}
}
- brw_wm_lookup_iz(line_aa,
+ brw_wm_lookup_iz(intel,
+ line_aa,
lookup,
uses_depth,
key);