Index: i830_vtbl.c
===================================================================
RCS file: /cvs/xorg/xc/extras/Mesa/src/mesa/drivers/dri/i915/i830_vtbl.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 i830_vtbl.c
--- i830_vtbl.c	16 Jun 2004 09:18:42 -0000	1.1.1.1
+++ i830_vtbl.c	25 Jun 2004 11:56:24 -0000
@@ -340,9 +340,10 @@
 {
    i830ContextPtr i830 = I830_CONTEXT(intel);
    struct i830_hw_state *state = i830->current;
-   BATCH_LOCALS;
    int i;
-   GLuint dirty = state->active & ~state->emitted;
+   GLuint dirty;
+   BATCH_LOCALS;
+   dirty = state->active & ~state->emitted;
 
    if (dirty & I830_UPLOAD_CTX) {
       if (VERBOSE) fprintf(stderr, "I830_UPLOAD_CTX:\n"); 
Index: i915_vtbl.c
===================================================================
RCS file: /cvs/xorg/xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_vtbl.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 i915_vtbl.c
--- i915_vtbl.c	16 Jun 2004 09:18:43 -0000	1.1.1.1
+++ i915_vtbl.c	25 Jun 2004 11:56:24 -0000
@@ -199,9 +199,9 @@
 {
    i915ContextPtr i915 = I915_CONTEXT(intel);
    struct i915_hw_state *state = i915->current;
-   BATCH_LOCALS;
    int i;
    GLuint dirty;
+   BATCH_LOCALS;
 
    /* More to workaround the multitex hang - if one texture unit state
     * is modified, emit all texture units.