diff options
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 64d28cfe6a4..f77e823ca08 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -1038,6 +1038,8 @@ 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 ) @@ -1052,6 +1054,9 @@ void LOCK_HARDWARE( struct intel_context *intel ) if (intel->locked >= 2) return; + if (!sPriv->dri2.enabled) + _glthread_LOCK_MUTEX(lockMutex); + if (intel->driDrawable) { intel_fb = intel->driDrawable->driverPrivate; @@ -1103,8 +1108,10 @@ void UNLOCK_HARDWARE( struct intel_context *intel ) assert(intel->locked == 0); - if (!sPriv->dri2.enabled) + 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); |