Change logicop, blend, masking functions to use the colors/indexes in the

sw_span object, rather than an explicit parameter.

1 files changed, 5 insertions, 4 deletions

diff --git a/src/mesa/swrast/s_blend.c b/src/mesa/swrast/s_blend.c
index d94ff3923cf..91ec513d5bc 100644
--- a/src/mesa/swrast/s_blend.c
+++ b/src/mesa/swrast/s_blend.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
+ * Version:  6.5.2
  *
- * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2006  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"),
@@ -847,7 +847,7 @@ void _swrast_choose_blend_func( GLcontext *ctx )
  */
 void
 _swrast_blend_span(GLcontext *ctx, struct gl_renderbuffer *rb,
-                   const struct sw_span *span, GLchan rgba[][4])
+                   struct sw_span *span)
 {
    GLchan framebuffer[MAX_WIDTH][4];
 
@@ -867,6 +867,7 @@ _swrast_blend_span(GLcontext *ctx, struct gl_renderbuffer *rb,
                              framebuffer);
    }
 
-   SWRAST_CONTEXT(ctx)->BlendFunc( ctx, span->end, span->array->mask, rgba,
+   SWRAST_CONTEXT(ctx)->BlendFunc( ctx, span->end, span->array->mask,
+                                   span->array->rgba,
 				   (const GLchan (*)[4]) framebuffer );
 }