diff options
| author | Chia-I Wu <olvaffe@gmail.com> | 2013-04-10 21:32:13 +0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2013-04-24 12:56:17 -0700 |
| commit | 75d402b2118c55b0131025016a859a35733746b5 (patch) | |
| tree | d9b420ad6fd4255e3e5b7ed798e82780d73b76bd | |
| parent | bc98950a2a667fbf415e4caf820b4b5e50839b49 (diff) | |
i965/gen7: fix 3DSTATE_LINE_STIPPLE_PATTERN
The inverse repeat count should taks up bits 31:15 and is in U1.16. Fixes
the "Restarting lines within a single Begin/End block" subtest of piglit
linestipple, and gets the other failing subtests much closer to passing.
v2: Rewrite commit message with more detailed piglit info (by anholt)
Reviewed-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_misc_state.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c b/src/mesa/drivers/dri/i965/brw_misc_state.c index 953f6cdbdb3..6b619299006 100644 --- a/src/mesa/drivers/dri/i965/brw_misc_state.c +++ b/src/mesa/drivers/dri/i965/brw_misc_state.c @@ -947,9 +947,20 @@ static void upload_line_stipple(struct brw_context *brw) BEGIN_BATCH(3); OUT_BATCH(_3DSTATE_LINE_STIPPLE_PATTERN << 16 | (3 - 2)); OUT_BATCH(ctx->Line.StipplePattern); - tmp = 1.0 / (GLfloat) ctx->Line.StippleFactor; - tmpi = tmp * (1<<13); - OUT_BATCH(tmpi << 16 | ctx->Line.StippleFactor); + + if (intel->gen >= 7) { + /* in U1.16 */ + tmp = 1.0 / (GLfloat) ctx->Line.StippleFactor; + tmpi = tmp * (1<<16); + OUT_BATCH(tmpi << 15 | ctx->Line.StippleFactor); + } + else { + /* in U1.13 */ + tmp = 1.0 / (GLfloat) ctx->Line.StippleFactor; + tmpi = tmp * (1<<13); + OUT_BATCH(tmpi << 16 | ctx->Line.StippleFactor); + } + CACHED_BATCH(); } |