diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2006-08-18 09:04:48 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2006-08-18 09:04:48 +0000 |
| commit | bd87c303e94659941a7c623d0b836e3ff317cfb4 (patch) | |
| tree | 4ec6a572608fcca670b225a8088296f39eeac38e /src/mesa/drivers/dri/i915/i830_vtbl.c | |
| parent | c1c282f36ad31f99b9d5b38a2d39118740bca928 (diff) | |
Fix writemasks on texture arb fp instructions.
Cleanup invarient state emission.
Diffstat (limited to 'src/mesa/drivers/dri/i915/i830_vtbl.c')
| -rw-r--r-- | src/mesa/drivers/dri/i915/i830_vtbl.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i915/i830_vtbl.c b/src/mesa/drivers/dri/i915/i830_vtbl.c index 9e71b11109..d40cf705a3 100644 --- a/src/mesa/drivers/dri/i915/i830_vtbl.c +++ b/src/mesa/drivers/dri/i915/i830_vtbl.c @@ -264,7 +264,7 @@ static void i830_emit_invarient_state( intelContextPtr intel ) { BATCH_LOCALS; - BEGIN_BATCH( 200 ); + BEGIN_BATCH( 40 ); OUT_BATCH(_3DSTATE_MAP_CUBE | MAP_UNIT(0)); OUT_BATCH(_3DSTATE_MAP_CUBE | MAP_UNIT(1)); @@ -370,6 +370,9 @@ static GLuint get_state_size( struct i830_hw_state *state ) GLuint sz = 0; GLuint i; + if (dirty & I830_UPLOAD_INVARIENT) + sz += 40 * sizeof(int); + if (dirty & I830_UPLOAD_CTX) sz += sizeof(state->Ctx); @@ -408,6 +411,11 @@ static void i830_emit_state( intelContextPtr intel ) counter = intel->batch.counter; } + if (dirty & I830_UPLOAD_INVARIENT) { + if (VERBOSE) fprintf(stderr, "I830_UPLOAD_INVARIENT:\n"); + i830_emit_invarient_state( intel ); + } + if (dirty & I830_UPLOAD_CTX) { if (VERBOSE) fprintf(stderr, "I830_UPLOAD_CTX:\n"); emit( i830, state->Ctx, sizeof(state->Ctx) ); @@ -514,7 +522,6 @@ void i830InitVtbl( i830ContextPtr i830 ) i830->intel.vtbl.clear_with_tris = i830ClearWithTris; i830->intel.vtbl.rotate_window = i830RotateWindow; i830->intel.vtbl.destroy = i830_destroy_context; - i830->intel.vtbl.emit_invarient_state = i830_emit_invarient_state; i830->intel.vtbl.emit_state = i830_emit_state; i830->intel.vtbl.lost_hardware = i830_lost_hardware; i830->intel.vtbl.reduced_primitive_state = i830_reduced_primitive_state; |