Merge commit 'origin/master' into gallium-map-range

[mesa.git] / src / mesa / drivers / dri / radeon / radeon_lock.h

diff --git a/src/mesa/drivers/dri/radeon/radeon_lock.h b/src/mesa/drivers/dri/radeon/radeon_lock.h
index e793541e3f05c8452bc82db22b98faf9866edd29..86e96aa7d2c614bf3bbcf6f658b6a179039773ad 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_lock.h
+++ b/src/mesa/drivers/dri/radeon/radeon_lock.h
@@ -94,18 +94,18 @@ extern int prevLockLine;
    do {                                                                \
       char __ret = 0;                                          \
       DEBUG_CHECK_LOCK();                                      \
-      DRM_CAS( rmesa->dri.hwLock, rmesa->dri.hwContext,                \
-              (DRM_LOCK_HELD | rmesa->dri.hwContext), __ret ); \
+      DRM_CAS( (rmesa)->dri.hwLock, (rmesa)->dri.hwContext,            \
+              (DRM_LOCK_HELD | (rmesa)->dri.hwContext), __ret );       \
       if ( __ret )                                             \
-        radeonGetLock( rmesa, 0 );                             \
+        radeonGetLock( (rmesa), 0 );                           \
       DEBUG_LOCK();                                            \
    } while (0)
 
 #define UNLOCK_HARDWARE( rmesa )                                       \
    do {                                                                        \
-      DRM_UNLOCK( rmesa->dri.fd,                                       \
-                 rmesa->dri.hwLock,                                    \
-                 rmesa->dri.hwContext );                               \
+      DRM_UNLOCK( (rmesa)->dri.fd,                                     \
+                 (rmesa)->dri.hwLock,                                  \
+                 (rmesa)->dri.hwContext );                             \
       DEBUG_RESET();                                                   \
    } while (0)