summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/radeon/radeon_lock.h
diff options
context:
space:
mode:
authorOliver McFadden <z3ro.geek@gmail.com>2007-05-11 22:02:52 +0000
committerOliver McFadden <z3ro.geek@gmail.com>2007-05-11 22:02:52 +0000
commit98d25a5a28b1d6e4ed299904aec4104f7d6c80b0 (patch)
tree37c943148855d5ee319c83ab19eab90d4f6d4ff0 /src/mesa/drivers/dri/radeon/radeon_lock.h
parent0aa998b2ab6fdfe139b54de9868e2383440685d0 (diff)
r300: Initial work on merging radeon_lock.[ch].
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_lock.h')
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_lock.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_lock.h b/src/mesa/drivers/dri/radeon/radeon_lock.h
index 4e8617eb8f..3ba69e86c1 100644
--- a/src/mesa/drivers/dri/radeon/radeon_lock.h
+++ b/src/mesa/drivers/dri/radeon/radeon_lock.h
@@ -1,8 +1,12 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_lock.h,v 1.3 2002/10/30 12:51:55 alanh Exp $ */
/**************************************************************************
Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
VA Linux Systems Inc., Fremont, California.
+Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
+
+The Weather Channel (TM) funded Tungsten Graphics to develop the
+initial release of the Radeon 8500 driver under the XFree86 license.
+This notice must be preserved.
All Rights Reserved.
@@ -30,8 +34,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
/*
* Authors:
- * Kevin E. Martin <martin@valinux.com>
* Gareth Hughes <gareth@valinux.com>
+ * Keith Whitwell <keith@tungstengraphics.com>
+ * Kevin E. Martin <martin@valinux.com>
*/
#ifndef __RADEON_LOCK_H__
@@ -83,7 +88,6 @@ extern int prevLockLine;
* do not do any drawing !!!
*/
-
/* Lock the hardware and validate our state.
*/
#define LOCK_HARDWARE( rmesa ) \