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_maos.h
diff --git
a/src/mesa/drivers/dri/r200/r200_maos.h
b/src/mesa/drivers/dri/r200/r200_maos.h
index a430497db989238a7f61188443a85cfd6d90877a..d3ed06d4021912e599fce64c87ac6e6246ca26b8 100644
(file)
--- a/
src/mesa/drivers/dri/r200/r200_maos.h
+++ b/
src/mesa/drivers/dri/r200/r200_maos.h
@@
-1,4
+1,3
@@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_maos.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,12
+35,9
@@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __R200_MAOS_H__
#define __R200_MAOS_H__
#ifndef __R200_MAOS_H__
#define __R200_MAOS_H__
-#ifdef GLX_DIRECT_RENDERING
-
#include "r200_context.h"
#include "r200_context.h"
-extern void r200EmitArrays( GLcontext *ctx, GLu
int inputs
);
+extern void r200EmitArrays( GLcontext *ctx, GLu
byte *vimap_rev
);
extern void r200ReleaseArrays( GLcontext *ctx, GLuint newinputs );
#endif
extern void r200ReleaseArrays( GLcontext *ctx, GLuint newinputs );
#endif
-#endif