diff options
| author | Ian Romanick <[email protected]> | 2012-10-19 14:04:08 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2012-10-24 11:41:04 -0700 |
| commit | 464263d61325d8b3e79ebb89cedc9c7431d4ef9e (patch) | |
| tree | d95cb79ba9fcae9ca382191328c466f0eb828d9c /src | |
| parent | 097065f713bb7f7fd4d9447ca952995744805072 (diff) | |
i965: Fix regression in depth texture rendering on pre-SNB
This was introduced by commit 24db6d6 (cherry-picked from a683012). The
original patch fixed potential GPU hangs on SNB, and it caused some
rendering regressions there. The benefits outweigh the costs.
However, the work-around is not necessary for pre-SNB chipsets.
Applying the work-around there gives rendering regressions with no
benefit. This patch disables the work-around on pre-SNB chipsets.
Without the original patch, the piglit test
depthstencil-render-miplevels would reliably hang an SNB GPU. On ILK
this test would not hang, and it does not hang with this patch.
NOTE: This is a candidate for the 8.0 and 9.0 branches
Signed-off-by: Ian Romanick <[email protected]>
Acked-by: Kenneth Graunke <[email protected]>
Acked-by: Paul Berry <[email protected]>
(cherry picked from commit 5fe5aa8e55a8db0b80f6ff9838bad47ce0406fd0)
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_misc_state.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c b/src/mesa/drivers/dri/i965/brw_misc_state.c index d2c9246e8af..fca1555b5a2 100644 --- a/src/mesa/drivers/dri/i965/brw_misc_state.c +++ b/src/mesa/drivers/dri/i965/brw_misc_state.c @@ -393,8 +393,10 @@ static void emit_depthbuffer(struct brw_context *brw) * tile_x and tile_y to 0. This is a temporary workaround until we come * up with a better solution. */ - tile_x &= ~7; - tile_y &= ~7; + if (intel->gen >= 6) { + tile_x &= ~7; + tile_y &= ~7; + } BEGIN_BATCH(len); OUT_BATCH(_3DSTATE_DEPTH_BUFFER << 16 | (len - 2)); |