2 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i915/i830_vtbl.c b/src/mesa/drivers/dri/i915/i830_vtbl.c
index 3617ce764d2..1a659fd53ea 100644
--- a/src/mesa/drivers/dri/i915/i830_vtbl.c
+++ b/src/mesa/drivers/dri/i915/i830_vtbl.c
@@ -360,9 +360,11 @@ static void i830_emit_state( intelContextPtr intel )
 {
    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"); 
diff --git a/src/mesa/drivers/dri/i915/i915_vtbl.c b/src/mesa/drivers/dri/i915/i915_vtbl.c
index 95fa5b4f378..203e1a45909 100644
--- a/src/mesa/drivers/dri/i915/i915_vtbl.c
+++ b/src/mesa/drivers/dri/i915/i915_vtbl.c
@@ -219,9 +219,9 @@ static void i915_emit_state( intelContextPtr intel )
 {
    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.