s/BlendEquatioRGB/BlendEquationRGB/

[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 f22f08a1e617a663d0b3752a37eadabded99aafd..b0c16083da1a2c286f6b24074653563e497df405 100644 (file)
--- a/src/mesa/swrast/s_texture.h
+++ b/src/mesa/swrast/s_texture.h
@@ -1,21 +1,20 @@
-/* $Id: s_texture.h,v 1.2 2000/11/05 18:24:41 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
- * 
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
- * 
+ * Version:  5.1
+ *
+ * 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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -25,26 +24,24 @@
  */
 
 
-
-
-
 #ifndef S_TEXTURE_H
 #define S_TEXTURE_H
 
 
-#include "types.h"
+#include "mtypes.h"
 #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