diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-07-08 09:54:43 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-07-08 10:00:41 +0100 |
| commit | 1e2cae0ab339e477929e429f8ff31b11fcaf2cbf (patch) | |
| tree | 0caebc8024c481ebb0113d3f04d7ed4c42807a30 | |
| parent | ec3dd64e739c4c2bbd8141de5275fe8a90f24a57 (diff) | |
sna/gen3: Restore disabling the use of stencil/fog in the invariant
One cleanup too far causing spurious results after rebooting. We also
need to ensure that the writemask is fully enabled (ie not disabled)
as well.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/gen3_render.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c index 4b59f40a..464e87be 100644 --- a/src/sna/gen3_render.c +++ b/src/sna/gen3_render.c @@ -1082,12 +1082,13 @@ static void gen3_emit_invariant(struct sna *sna) CSB_TCB(6, 6) | CSB_TCB(7, 7)); - OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | I1_LOAD_S(3) | I1_LOAD_S(4) | 1); - OUT_BATCH(0x00000000); /* Disable texture coordinate wrap-shortest */ + OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | I1_LOAD_S(3) | I1_LOAD_S(4) | I1_LOAD_S(5) | 1); + OUT_BATCH(0); /* Disable texture coordinate wrap-shortest */ OUT_BATCH((1 << S4_POINT_WIDTH_SHIFT) | S4_LINE_WIDTH_ONE | S4_CULLMODE_NONE | S4_VFMT_XY); + OUT_BATCH(0); /* Disable fog/stencil. *Enable* write mask. */ OUT_BATCH(_3DSTATE_SCISSOR_ENABLE_CMD | DISABLE_SCISSOR_RECT); OUT_BATCH(_3DSTATE_DEPTH_SUBRECT_DISABLE); |