diff options
| author | Eric Anholt <eric@anholt.net> | 2009-06-29 09:45:06 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-06-29 10:33:50 -0700 |
| commit | 3927874d9c7fafb61651d0fc69547c8e010181f5 (patch) | |
| tree | 5808681a32ac7ae4bd1aafc61357b152b0ec13e3 /src/mesa/drivers/dri/i915 | |
| parent | 7b5373c4345687b3af89f97a4c3998b8ca5debd5 (diff) | |
intel: Make LOCK_HARDWARE recursive to avoid hand-rolling recursiveness.
Diffstat (limited to 'src/mesa/drivers/dri/i915')
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_tris.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_tris.c b/src/mesa/drivers/dri/i915/intel_tris.c index 1d39278cbf..a905455342 100644 --- a/src/mesa/drivers/dri/i915/intel_tris.c +++ b/src/mesa/drivers/dri/i915/intel_tris.c @@ -1255,11 +1255,9 @@ intel_meta_draw_poly(struct intel_context *intel, { union fi *vb; GLint i; - GLboolean was_locked = intel->locked; unsigned int saved_vertex_size = intel->vertex_size; - if (!was_locked) - LOCK_HARDWARE(intel); + LOCK_HARDWARE(intel); intel->vertex_size = 6; @@ -1283,8 +1281,7 @@ intel_meta_draw_poly(struct intel_context *intel, intel->vertex_size = saved_vertex_size; - if (!was_locked) - UNLOCK_HARDWARE(intel); + UNLOCK_HARDWARE(intel); } static void |