From 5f86ae057a645c03dc1e0c51c2fb1b2628a50e0a Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 9 Jan 2008 13:40:40 -0800 Subject: [intel] Rename lost_hardware vtbl entry to new_batch. Both drivers have ended up relying on lost_hardware being called after each batch buffer, so update the name. This removes one of the calls on 965 whic h was outside of the batchbuffer handling code and just duplicating what had already happened through batchbuffer handling. --- src/mesa/drivers/dri/i915/i915_vtbl.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/mesa/drivers/dri/i915/i915_vtbl.c') diff --git a/src/mesa/drivers/dri/i915/i915_vtbl.c b/src/mesa/drivers/dri/i915/i915_vtbl.c index 1de518ace1..8b45cdacbb 100644 --- a/src/mesa/drivers/dri/i915/i915_vtbl.c +++ b/src/mesa/drivers/dri/i915/i915_vtbl.c @@ -579,9 +579,14 @@ i915_set_draw_region(struct intel_context *intel, static void -i915_lost_hardware(struct intel_context *intel) +i915_new_batch(struct intel_context *intel) { struct i915_context *i915 = i915_context(&intel->ctx); + + /* Mark all state as needing to be emitted when starting a new batchbuffer. + * Using hardware contexts would be an alternative, but they have some + * difficulties associated with them (physical address requirements). + */ i915->state.emitted = 0; } @@ -607,7 +612,7 @@ i915InitVtbl(struct i915_context *i915) i915->intel.vtbl.check_vertex_size = i915_check_vertex_size; i915->intel.vtbl.destroy = i915_destroy_context; i915->intel.vtbl.emit_state = i915_emit_state; - i915->intel.vtbl.lost_hardware = i915_lost_hardware; + i915->intel.vtbl.new_batch = i915_new_batch; i915->intel.vtbl.reduced_primitive_state = i915_reduced_primitive_state; i915->intel.vtbl.render_start = i915_render_start; i915->intel.vtbl.render_prevalidate = i915_render_prevalidate; -- cgit v1.2.3