diff options
| author | Eric Anholt <eric@anholt.net> | 2009-06-29 09:48:28 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-06-29 10:33:50 -0700 |
| commit | de447afff26706e3bf8bdcd5cfb8b1daf49b4b21 (patch) | |
| tree | 77e5d816119fff3b529ee83cb23f8b67c74d024d /src | |
| parent | 3927874d9c7fafb61651d0fc69547c8e010181f5 (diff) | |
intel: Remove unneded pthread mutex in LOCK_HARDWARE.
This would cause LOCK_HARDWARE to mutex all contexts in this process on
both DRI1 and DRI2. On DRI1, LOCK_HARDWARE already does it for all
processes on the system. On DRI2, LOCK_HARDWARE doesn't, but there shouldn't
be any state outside the context that needs any additional protection.
Notably, the bufmgr is protected by its own mutex and not
LOCK_HARDWARE.
This code was originally introduced with the i915tex code dump, so it's not
clear what it was there for.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 00dfb3dc79..c2280de671 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -1038,8 +1038,6 @@ intelContendedLock(struct intel_context *intel, GLuint flags) } -_glthread_DECLARE_STATIC_MUTEX(lockMutex); - /* Lock the hardware and validate our state. */ void LOCK_HARDWARE( struct intel_context *intel ) @@ -1054,8 +1052,6 @@ void LOCK_HARDWARE( struct intel_context *intel ) if (intel->locked >= 2) return; - _glthread_LOCK_MUTEX(lockMutex); - if (intel->driDrawable) { intel_fb = intel->driDrawable->driverPrivate; @@ -1111,8 +1107,6 @@ void UNLOCK_HARDWARE( struct intel_context *intel ) if (!sPriv->dri2.enabled) DRM_UNLOCK(intel->driFd, intel->driHwLock, intel->hHWContext); - _glthread_UNLOCK_MUTEX(lockMutex); - if (INTEL_DEBUG & DEBUG_LOCK) _mesa_printf("%s - unlocked\n", __progname); |