summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2007-08-09 12:02:45 +0100
committerKeith Whitwell <[email protected]>2007-08-09 15:46:15 +0100
commit277e4989f348913e3852f3d8c4efb82ba1380fcb (patch)
tree499f6a10de84f1d84dfd52db74091c9de53f490d /src
parentfb8caffea8ac9a8f8e2ee63959264abe8eb36c59 (diff)
Don't reemit hardware state *every* primitive.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/pipe/i915simple/i915_context.h1
-rw-r--r--src/mesa/pipe/i915simple/i915_prim_emit.c6
-rw-r--r--src/mesa/pipe/i915simple/i915_state_derived.c3
-rw-r--r--src/mesa/pipe/i915simple/i915_state_emit.c2
4 files changed, 11 insertions, 1 deletions
diff --git a/src/mesa/pipe/i915simple/i915_context.h b/src/mesa/pipe/i915simple/i915_context.h
index dab54231904..c298f0f581e 100644
--- a/src/mesa/pipe/i915simple/i915_context.h
+++ b/src/mesa/pipe/i915simple/i915_context.h
@@ -56,6 +56,7 @@ struct i915_context
struct pipe_mipmap_tree *texture[PIPE_MAX_SAMPLERS];
struct pipe_viewport_state viewport;
GLuint dirty;
+ GLuint hw_dirty;
GLuint *batch_start;
diff --git a/src/mesa/pipe/i915simple/i915_prim_emit.c b/src/mesa/pipe/i915simple/i915_prim_emit.c
index 6d7cfe2e3ec..a1e0e851969 100644
--- a/src/mesa/pipe/i915simple/i915_prim_emit.c
+++ b/src/mesa/pipe/i915simple/i915_prim_emit.c
@@ -120,7 +120,11 @@ emit_prim( struct draw_stage *stage,
unsigned *ptr;
unsigned i;
- i915_emit_hardware_state( i915 );
+ if (i915->dirty)
+ i915_update_derived( i915 );
+
+ if (i915->hw_dirty)
+ i915_emit_hardware_state( i915 );
ptr = winsys->batch_start( winsys, nr * vertex_size, 0 );
if (ptr == 0) {
diff --git a/src/mesa/pipe/i915simple/i915_state_derived.c b/src/mesa/pipe/i915simple/i915_state_derived.c
index 6e91e4448f3..f1f798b5069 100644
--- a/src/mesa/pipe/i915simple/i915_state_derived.c
+++ b/src/mesa/pipe/i915simple/i915_state_derived.c
@@ -182,5 +182,8 @@ void i915_update_derived( struct i915_context *i915 )
I915_NEW_FRAMEBUFFER))
compute_cliprect(i915);
+ if (i915->dirty)
+ i915->hw_dirty = 1;
+
i915->dirty = 0;
}
diff --git a/src/mesa/pipe/i915simple/i915_state_emit.c b/src/mesa/pipe/i915simple/i915_state_emit.c
index aeb2d6753f2..3553d565c56 100644
--- a/src/mesa/pipe/i915simple/i915_state_emit.c
+++ b/src/mesa/pipe/i915simple/i915_state_emit.c
@@ -250,5 +250,7 @@ i915_emit_hardware_state(struct i915_context *i915 )
for (i = 0; i < dwords; i++)
OUT_BATCH( prog[i] );
}
+
+ i915->hw_dirty = 0;
}