diff options
| author | Aapo Tahkola <aet@rasterburn.org> | 2005-04-24 09:08:31 +0000 |
|---|---|---|
| committer | Aapo Tahkola <aet@rasterburn.org> | 2005-04-24 09:08:31 +0000 |
| commit | 6ffd0a4cf1aae2b5ea0fd683a2d7607e59cd3f68 (patch) | |
| tree | 39fa877aeee98f7e14598c67269c39a7293761a3 /src/mesa/drivers/dri/r300/radeon_lock.h | |
| parent | 5c906924ed6ee664ba61764dd21bee36dce06d02 (diff) | |
Modifying to build against current Mesa. Disabled r200*.c files since they didnt want to build anymore.
Diffstat (limited to 'src/mesa/drivers/dri/r300/radeon_lock.h')
| -rw-r--r-- | src/mesa/drivers/dri/r300/radeon_lock.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r300/radeon_lock.h b/src/mesa/drivers/dri/r300/radeon_lock.h index 3359d7822c..c9acbce0c3 100644 --- a/src/mesa/drivers/dri/r300/radeon_lock.h +++ b/src/mesa/drivers/dri/r300/radeon_lock.h @@ -96,6 +96,7 @@ extern int prevLockLine; DEBUG_LOCK(); \ } while (0) +#if R200_MERGED #define UNLOCK_HARDWARE( radeon ) \ do { \ DRM_UNLOCK( (radeon)->dri.fd, \ @@ -109,5 +110,13 @@ extern int prevLockLine; __r200->save_on_next_unlock = GL_FALSE; \ } \ } while (0) - +#else +#define UNLOCK_HARDWARE( radeon ) \ + do { \ + DRM_UNLOCK( (radeon)->dri.fd, \ + (radeon)->dri.hwLock, \ + (radeon)->dri.hwContext ); \ + DEBUG_RESET(); \ + } while (0) +#endif #endif /* __RADEON_LOCK_H__ */ |