fix up radeon span functions using latest r200 code from Brian,

[mesa.git] / src / mesa / drivers / dri / r200 / r200_lock.h

diff --git a/src/mesa/drivers/dri/r200/r200_lock.h b/src/mesa/drivers/dri/r200/r200_lock.h
index 59bc1d656e1eaea3bd97df58fa54f7b830eda0a5..e4c3a7e9352c6c876a7e7ce9deaa4a33243b0708 100644 (file)
--- a/src/mesa/drivers/dri/r200/r200_lock.h
+++ b/src/mesa/drivers/dri/r200/r200_lock.h
@@ -1,5 +1,5 @@
-/* $XFree86$ */
-/**************************************************************************
+/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_lock.h,v 1.1 2002/10/30 12:51:52 alanh Exp $ */
+/*
 Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
 
 The Weather Channel (TM) funded Tungsten Graphics to develop the
@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_LOCK_H__
 #define __R200_LOCK_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void r200GetLock( r200ContextPtr rmesa, GLuint flags );
 
 /* Turn DEBUG_LOCKING on to find locking conflicts.
@@ -98,8 +96,6 @@ extern int prevLockLine;
       DEBUG_LOCK();                                            \
    } while (0)
 
-/* Unlock the hardware.
- */
 #define UNLOCK_HARDWARE( rmesa )                                       \
    do {                                                                        \
       DRM_UNLOCK( rmesa->dri.fd,                                       \
@@ -108,5 +104,4 @@ extern int prevLockLine;
       DEBUG_RESET();                                                   \
    } while (0)
 
-#endif
 #endif /* __R200_LOCK_H__ */