Merge commit 'origin/master' into gallium-0.2
Conflicts: windows/VC8/mesa/osmesa/osmesa.vcproj windows/VC8/progs/demos/gears.vcproj windows/VC8/progs/progs.sln
This commit is contained in:
@@ -106,6 +106,28 @@ do { \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
/**
|
||||
* Same as above, but for two drawables simultaneously.
|
||||
*
|
||||
*/
|
||||
|
||||
#define DRI_VALIDATE_TWO_DRAWABLES_INFO(psp, pdp, prp) \
|
||||
do { \
|
||||
while (*((pdp)->pStamp) != (pdp)->lastStamp || \
|
||||
*((prp)->pStamp) != (prp)->lastStamp) { \
|
||||
register unsigned int hwContext = (psp)->pSAREA->lock.lock & \
|
||||
~(DRM_LOCK_HELD | DRM_LOCK_CONT); \
|
||||
DRM_UNLOCK((psp)->fd, &(psp)->pSAREA->lock, hwContext); \
|
||||
\
|
||||
DRM_SPINLOCK(&(psp)->pSAREA->drawable_lock, (psp)->drawLockID); \
|
||||
DRI_VALIDATE_DRAWABLE_INFO_ONCE(pdp); \
|
||||
DRI_VALIDATE_DRAWABLE_INFO_ONCE(prp); \
|
||||
DRM_SPINUNLOCK(&(psp)->pSAREA->drawable_lock, (psp)->drawLockID); \
|
||||
\
|
||||
DRM_LIGHT_LOCK((psp)->fd, &(psp)->pSAREA->lock, hwContext); \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
|
||||
/**
|
||||
* Driver callback functions.
|
||||
|
Reference in New Issue
Block a user