diff options
| author | Oliver McFadden <z3ro.geek@gmail.com> | 2007-05-11 22:26:47 +0000 |
|---|---|---|
| committer | Oliver McFadden <z3ro.geek@gmail.com> | 2007-05-11 22:26:47 +0000 |
| commit | 93f9e61f433788cd70acbe2a8fbdc6a4f5fd0881 (patch) | |
| tree | 61dc590c290718795c75b93d80ee3e1cb623f90c | |
| parent | f405fbb36de167eb3294358d97e6f62a420f3bff (diff) | |
r300: Corrected another error; regexp replaced something it shouldn't have.
| -rw-r--r-- | src/mesa/drivers/dri/r300/radeon_lock.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/mesa/drivers/dri/r300/radeon_lock.h b/src/mesa/drivers/dri/r300/radeon_lock.h index 3c1c8c2a0d..c47adc9575 100644 --- a/src/mesa/drivers/dri/r300/radeon_lock.h +++ b/src/mesa/drivers/dri/r300/radeon_lock.h @@ -107,27 +107,12 @@ extern int prevLockLine; DEBUG_LOCK(); \ } while (0) -#if R200_MERGED #define UNLOCK_HARDWARE( rmesa ) \ do { \ DRM_UNLOCK((rmesa)->dri.fd, \ (rmesa)->dri.hwLock, \ (rmesa)->dri.hwContext); \ DEBUG_RESET(); \ - if (IS_R200_CLASS((rmesa)->radeonScreen)) { \ - r200ContextPtr __r200 = (r200ContextPtr)(rmesa); \ - if (__r200->save_on_next_unlock) \ - r200SaveHwState(__r200); \ - __r200->save_on_next_unlock = GL_FALSE; \ - } \ } while (0) -#else -#define UNLOCK_HARDWARErmesa \ - do { \ - DRM_UNLOCK((rmesa)->dri.fd, \ - (rmesa)->dri.hwLock, \ - (rmesa)->dri.hwContext); \ - DEBUG_RESET(); \ - } while (0) -#endif + #endif /* __RADEON_LOCK_H__ */ |