fix typo

[mesa.git] / src / mesa / swrast / s_texture.h

diff --git a/src/mesa/swrast/s_texture.h b/src/mesa/swrast/s_texture.h
index edb19691e71422c6691344648a8ef1dbb566d23d..b0c16083da1a2c286f6b24074653563e497df405 100644 (file)
--- a/src/mesa/swrast/s_texture.h
+++ b/src/mesa/swrast/s_texture.h
@@ -1,10 +1,9 @@
-/* $Id: s_texture.h,v 1.3 2000/11/22 07:32:18 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  5.1
  *
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,9 +24,6 @@
  */
 
 
-
-
-
 #ifndef S_TEXTURE_H
 #define S_TEXTURE_H
 
@@ -36,15 +32,16 @@
 #include "swrast.h"
 
 
-extern void gl_texture_pixels( GLcontext *ctx, GLuint texSet, GLuint n,
-                               const GLfloat s[], const GLfloat t[],
-                               const GLfloat r[], GLfloat lambda[],
-                               GLchan primary_rgba[][4], GLchan rgba[][4] );
-
 extern void
+_swrast_texture_table_lookup( const struct gl_color_table *table,
+                              GLuint n, GLchan rgba[][4] );
+
+extern texture_sample_func
 _swrast_choose_texture_sample_func( GLcontext *ctx,
-                                   GLuint texUnit,
                                    const struct gl_texture_object *tObj );
 
-#endif
 
+extern void
+_swrast_texture_span( GLcontext *ctx, struct sw_span *span );
+
+#endif