projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://joukj@git.freedesktop.org/git/mesa/mesa
[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 587e4fe5ccd47e5f31f97fe5674283850f434adf..4ff98907fbf5f9facd65d4d183e50fecfa85c014 100644
(file)
--- a/
src/mesa/drivers/dri/r200/r200_lock.h
+++ b/
src/mesa/drivers/dri/r200/r200_lock.h
@@
-1,4
+1,3
@@
-/* $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.
/*
Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
@@
-36,8
+35,6
@@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __R200_LOCK_H__
#define __R200_LOCK_H__
#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.
extern void r200GetLock( r200ContextPtr rmesa, GLuint flags );
/* Turn DEBUG_LOCKING on to find locking conflicts.
@@
-106,5
+103,4
@@
extern int prevLockLine;
DEBUG_RESET(); \
} while (0)
DEBUG_RESET(); \
} while (0)
-#endif
#endif /* __R200_LOCK_H__ */
#endif /* __R200_LOCK_H__ */