summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2012-11-08 04:13:26 -0800
committerAndreas Boll <andreas.boll.dev@gmail.com>2013-01-20 15:08:27 +0100
commitba36bd0375d89e78e3c2ffb923b9ba7af0e4bfb9 (patch)
tree4584dfe3672db5e5a0f8dc120f5b118130aaa8d5
parenta3f5601465086bfcda4e68c3c55a284dd84879c6 (diff)
i965: Fix AA Line Distance Mode in 3DSTATE_SF on Ivybridge.
We were accidentally setting bit 14 in DWord 2 (which is Reserved/MBZ) rather than bit 14 in DWord 3 (which is AA Line Distance Mode). There's also no reason to ever set it to legacy mode; the bit is only used when drawing antialiased lines anyway. Set it unconditionally. NOTE: This is a candidate for stable branches. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> (cherry picked from commit e639385064663ba401544de5dbd463fa7f6cce2d)
-rw-r--r--src/mesa/drivers/dri/i965/gen7_sf_state.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/gen7_sf_state.c b/src/mesa/drivers/dri/i965/gen7_sf_state.c
index 871a8b753a3..28c65083844 100644
--- a/src/mesa/drivers/dri/i965/gen7_sf_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_sf_state.c
@@ -253,7 +253,6 @@ upload_sf_state(struct brw_context *brw)
}
if (ctx->Line.SmoothFlag) {
dw2 |= GEN6_SF_LINE_AA_ENABLE;
- dw2 |= GEN6_SF_LINE_AA_MODE_TRUE;
dw2 |= GEN6_SF_LINE_END_CAP_WIDTH_1_0;
}
if (ctx->Line.StippleFlag && intel->is_haswell) {
@@ -264,10 +263,9 @@ upload_sf_state(struct brw_context *brw)
dw2 |= GEN6_SF_MSRAST_ON_PATTERN;
/* FINISHME: Last Pixel Enable? Vertex Sub Pixel Precision Select?
- * FINISHME: AA Line Distance Mode?
*/
- dw3 = 0;
+ dw3 = GEN6_SF_LINE_AA_MODE_TRUE;
/* _NEW_PROGRAM | _NEW_POINT */
if (!(ctx->VertexProgram.PointSizeEnabled || ctx->Point._Attenuated))