summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@tungstengraphics.com>2004-07-01 11:35:53 +0000
committerAlan Hourihane <alanh@tungstengraphics.com>2004-07-01 11:35:53 +0000
commit869fc59b63ee99ced26fbfa02492abb8cd16586d (patch)
tree0bf1a35f6f0f75b883738e369c1aa0ffda6c84ad
parent160215bdeb252c73547cc5247c47e8c5770972e3 (diff)
fix for older gcc's (from freedesktop bug id #419)
-rw-r--r--src/mesa/drivers/dri/i915/i830_vtbl.c6
-rw-r--r--src/mesa/drivers/dri/i915/i915_vtbl.c2
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 3617ce764d..1a659fd53e 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 95fa5b4f37..203e1a4590 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.