diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-09-24 19:59:30 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-09-24 19:59:30 +0000 |
| commit | f515c78a2320369ead087c4e0efd583f17b4b78b (patch) | |
| tree | 9c1727baca27c88d99c28aeda4c8acf206488f99 /src/mesa/swrast/s_blend.c | |
| parent | ba001224a18fa12792696ef393e708e90092127e (diff) | |
Change logicop, blend, masking functions to use the colors/indexes in the
sw_span object, rather than an explicit parameter.
Diffstat (limited to 'src/mesa/swrast/s_blend.c')
| -rw-r--r-- | src/mesa/swrast/s_blend.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mesa/swrast/s_blend.c b/src/mesa/swrast/s_blend.c index d94ff3923c..91ec513d5b 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 ); } |