Initial pull of code from r6xx-r7xx-support branch

[mesa.git] / src / mesa / drivers / dri / mach64 / mach64_tex.h

diff --git a/src/mesa/drivers/dri/mach64/mach64_tex.h b/src/mesa/drivers/dri/mach64/mach64_tex.h
index acae887d3037c71ad9e371651dd79661c9c00075..8e0b23ed15bd8c8ad032b88d6b9cad55772170c7 100644 (file)
--- a/src/mesa/drivers/dri/mach64/mach64_tex.h
+++ b/src/mesa/drivers/dri/mach64/mach64_tex.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */ /* -*- mode: c; c-basic-offset: 3 -*- */
+/* -*- mode: c; c-basic-offset: 3 -*- */
 /*
  * Copyright 2000 Gareth Hughes
  * All Rights Reserved.
@@ -32,29 +32,17 @@
 #ifndef __MACH64_TEX_H__
 #define __MACH64_TEX_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 extern void mach64UpdateTextureState( GLcontext *ctx );
 
-extern void mach64SwapOutTexObj( mach64ContextPtr mach64ctx,
-                                mach64TexObjPtr t );
-
 extern void mach64UploadTexImages( mach64ContextPtr mach64ctx,
                                   mach64TexObjPtr t );
 
 extern void mach64UploadMultiTexImages( mach64ContextPtr mach64ctx,
                                        mach64TexObjPtr t0, mach64TexObjPtr t1 );
 
-extern void mach64AgeTextures( mach64ContextPtr mach64ctx, int heap );
 extern void mach64DestroyTexObj( mach64ContextPtr mach64ctx,
                                 mach64TexObjPtr t );
 
-extern void mach64UpdateTexLRU( mach64ContextPtr mach64ctx,
-                               mach64TexObjPtr t );
-
-extern void mach64PrintLocalLRU( mach64ContextPtr mach64ctx, int heap );
-extern void mach64PrintGlobalLRU( mach64ContextPtr mach64ctx, int heap );
-
 extern void mach64EmitTexStateLocked( mach64ContextPtr mmesa,
                                      mach64TexObjPtr t0,
                                      mach64TexObjPtr t1 );
@@ -84,9 +72,9 @@ extern void mach64InitTextureFuncs( struct dd_function_table *functions );
 #define MACH64PACKCOLOR4444(r, g, b, a)                                        \
    ((((a) & 0xf0) << 8) | (((r) & 0xf0) << 4) | ((g) & 0xf0) | ((b) >> 4))
 
-static __inline__ GLuint mach64PackColor( GLuint cpp,
-                                         GLubyte r, GLubyte g,
-                                         GLubyte b, GLubyte a )
+static INLINE GLuint mach64PackColor( GLuint cpp,
+                                      GLubyte r, GLubyte g,
+                                      GLubyte b, GLubyte a )
 {
    switch ( cpp ) {
    case 2:
@@ -99,4 +87,3 @@ static __inline__ GLuint mach64PackColor( GLuint cpp,
 }
 
 #endif
-#endif