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 0dfcc5c3ffbeda5826326a2a887961848f2f80f0..d3ed06d4021912e599fce64c87ac6e6246ca26b8 100644 (file)
--- a/src/mesa/drivers/dri/r200/r200_maos.h
+++ b/src/mesa/drivers/dri/r200/r200_maos.h
@@ -1,6 +1,4 @@
-/* $XFree86$ */
-/**************************************************************************
-
+/*

 Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
 
 The Weather Channel (TM) funded Tungsten Graphics to develop the
 Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
 
 The Weather Channel (TM) funded Tungsten Graphics to develop the


@@ -37,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, GLuint inputs );
+extern void r200EmitArrays( GLcontext *ctx, GLubyte *vimap_rev );

 extern void r200ReleaseArrays( GLcontext *ctx, GLuint newinputs );
 
 #endif
 extern void r200ReleaseArrays( GLcontext *ctx, GLuint newinputs );
 
 #endif

-#endif