s/BlendEquatioRGB/BlendEquationRGB/

[mesa.git] / src / mesa / swrast / s_pixeltex.c

diff --git a/src/mesa/swrast/s_pixeltex.c b/src/mesa/swrast/s_pixeltex.c
index 3afda84fa0efd4fc74e8af5c4707e9ea5fe7f223..776a38c9153532a3317657decb328fd31ba3889e 100644 (file)
--- a/src/mesa/swrast/s_pixeltex.c
+++ b/src/mesa/swrast/s_pixeltex.c
@@ -1,4 +1,3 @@
-/* $Id: s_pixeltex.c,v 1.9 2002/05/02 00:59:20 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -35,7 +34,7 @@
 
 #include "glheader.h"
 #include "colormac.h"
-#include "mem.h"
+#include "imports.h"
 
 #include "s_context.h"
 #include "s_pixeltex.h"
@@ -99,13 +98,13 @@ _swrast_pixel_texture(GLcontext *ctx, struct sw_span *span)
 
    /* convert colors into texture coordinates */
    pixeltexgen( ctx, span->end,
-                (const GLchan (*)[4]) span->color.rgba,
-                span->texcoords[0] );
+                (const GLchan (*)[4]) span->array->rgba,
+                span->array->texcoords[0] );
 
    /* copy the new texture units for all enabled units */
    for (unit = 1; unit < ctx->Const.MaxTextureUnits; unit++) {
       if (ctx->Texture.Unit[unit]._ReallyEnabled) {
-         MEMCPY( span->texcoords[unit], span->texcoords[0],
+         MEMCPY( span->array->texcoords[unit], span->array->texcoords[0],
                  span->end * 4 * sizeof(GLfloat) );
       }
    }