summaryrefslogtreecommitdiff
path: root/src/i915_3d.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-06-08 10:24:51 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2010-06-08 19:52:46 +0100
commitf429fb9d872950705e11171d0e7407fb7673c786 (patch)
tree708d09e096cad518806ab59ed09755e1f72722f7 /src/i915_3d.c
parent0776a42b70f2de7b7d7d8804046c79442da1cb8a (diff)
xp:trapezoids
Diffstat (limited to 'src/i915_3d.c')
-rw-r--r--src/i915_3d.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/i915_3d.c b/src/i915_3d.c
index 906043b1..80788383 100644
--- a/src/i915_3d.c
+++ b/src/i915_3d.c
@@ -34,12 +34,8 @@
#include "i915_reg.h"
-void I915EmitInvarientState(ScrnInfoPtr scrn)
+void I915EmitInvarientState(intel_screen_private *intel)
{
- 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 |
@@ -70,7 +66,9 @@ void I915EmitInvarientState(ScrnInfoPtr scrn)
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 |