diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-06-09 10:03:08 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-06-09 10:03:29 +0100 |
| commit | 8c1a8d22978f143044cc3cd0ff2ade5736ee9d48 (patch) | |
| tree | da63b3fd81cd3fd00fcb758afa3f16feff4f54b1 /src/i915_3d.c | |
| parent | 994aa1ef571ac2ab05f6588f9068d33b536c7a37 (diff) | |
Revert "xp:trapezoids"
This reverts commit f429fb9d872950705e11171d0e7407fb7673c786.
An experimental patch I forgot was on my main branch as I was bugfixing.
ARGH!
Diffstat (limited to 'src/i915_3d.c')
| -rw-r--r-- | src/i915_3d.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/i915_3d.c b/src/i915_3d.c index 80788383..906043b1 100644 --- a/src/i915_3d.c +++ b/src/i915_3d.c @@ -34,8 +34,12 @@ #include "i915_reg.h" -void I915EmitInvarientState(intel_screen_private *intel) +void I915EmitInvarientState(ScrnInfoPtr scrn) { + intel_screen_private *intel = intel_get_screen_private(scrn); + + assert(intel->in_batch_atomic); + OUT_BATCH(_3DSTATE_AA_CMD | AA_LINE_ECAAR_WIDTH_ENABLE | AA_LINE_ECAAR_WIDTH_1_0 | @@ -66,9 +70,7 @@ void I915EmitInvarientState(intel_screen_private *intel) CSB_TCB(2, 2) | CSB_TCB(3, 3) | CSB_TCB(4, 4) | - CSB_TCB(5, 5) | - CSB_TCB(6, 6) | - CSB_TCB(7, 7)); + CSB_TCB(5, 5) | CSB_TCB(6, 6) | CSB_TCB(7, 7)); OUT_BATCH(_3DSTATE_RASTER_RULES_CMD | ENABLE_POINT_RASTER_RULE | |