Eliminate local variables defined in i830 BEGIN_LP_RING().

This lets us get better sanity asserts, and avoid mysterious braces when you
do two BEGIN_LP_RING()s in a single function.  Potential minor performance
loss isn't too exciting, as ring access is about to become a compat path
anyway.  This change also removes the requirement for ring emits to be aligned
to dwords.

1 files changed, 7 insertions, 0 deletions

diff --git a/src/i830.h b/src/i830.h
index 68a71c58..6c3fa522 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -395,6 +395,13 @@ typedef struct _I830Rec {
    /* Regions allocated either from the above pools, or from agpgart. */
    I830RingBuffer *LpRing;
 
+   /** Number of bytes being emitted in the current BEGIN_LP_RING */
+   unsigned int ring_emitting;
+   /** Number of bytes that have been emitted in the current BEGIN_LP_RING */
+   unsigned int ring_used;
+   /** Offset in the ring for the next DWORD emit */
+   uint32_t ring_next;
+
 #ifdef I830_XV
    /* For Xvideo */
    i830_memory *overlay_regs;