diff options
author | Patrice Mandin <pmandin@caramail.com> | 2007-07-07 00:08:35 +0200 |
---|---|---|
committer | Patrice Mandin <pmandin@caramail.com> | 2007-07-07 00:08:35 +0200 |
commit | f0aa6654e27b279ecb29e9fd19c140cb1ac7946f (patch) | |
tree | ea9caba04ed3c5b3005edd79060002cb66a5e03a /src/mesa/swrast/s_drawpix.c | |
parent | 69501d76fc6a45da48bf4c416ac9e15edd44e7a9 (diff) | |
parent | f98bdfca574478837b33c97d131dad4833e3ee12 (diff) |
Merge branch 'master' of git+ssh://pmandin@git.freedesktop.org/git/mesa/mesa
Diffstat (limited to 'src/mesa/swrast/s_drawpix.c')
-rw-r--r-- | src/mesa/swrast/s_drawpix.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c index b8b452e33d..1c9f64b275 100644 --- a/src/mesa/swrast/s_drawpix.c +++ b/src/mesa/swrast/s_drawpix.c @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 6.5.2 + * Version: 7.1 * - * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2007 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"), @@ -398,10 +398,9 @@ draw_stencil_pixels( GLcontext *ctx, GLint x, GLint y, width, height, GL_COLOR_INDEX, type, row, skipPixels); - _mesa_unpack_index_span(ctx, spanWidth, destType, values, - type, source, unpack, - ctx->_ImageTransferState); - _mesa_apply_stencil_transfer_ops(ctx, spanWidth, values); + _mesa_unpack_stencil_span(ctx, spanWidth, destType, values, + type, source, unpack, + ctx->_ImageTransferState); if (zoom) { _swrast_write_zoomed_stencil_span(ctx, x, y, spanWidth, spanX, spanY, values); |