diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-02-28 20:35:57 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2004-02-28 20:35:57 +0000 |
| commit | 8cfd08b6134e2036ddceb1facfa82e15026068a2 (patch) | |
| tree | 76037f839147f64c9e4f676b25b4ef24ea2b6822 /src/mesa/swrast | |
| parent | d0582776a619cc0633a0cbeea010a0db5e3e210f (diff) | |
rename some span pack/unpack functions for better uniformity
Diffstat (limited to 'src/mesa/swrast')
| -rw-r--r-- | src/mesa/swrast/s_drawpix.c | 4 | ||||
| -rw-r--r-- | src/mesa/swrast/s_readpix.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c index 5d4093f32c..cc2564f6c5 100644 --- a/src/mesa/swrast/s_drawpix.c +++ b/src/mesa/swrast/s_drawpix.c @@ -802,7 +802,7 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y, for (row = 0; row < height; row++) { const GLvoid *source = _mesa_image_address(unpack, pixels, width, height, format, type, 0, row, 0); - _mesa_unpack_float_color_span(ctx, width, GL_RGBA, (GLfloat *) dest, + _mesa_unpack_color_span_float(ctx, width, GL_RGBA, (GLfloat *) dest, format, type, source, unpack, transferOps & IMAGE_PRE_CONVOLUTION_BITS, GL_FALSE); @@ -856,7 +856,7 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y, span.arrayMask = arrayMask; span.interpMask = interpMask; - _mesa_unpack_chan_color_span(ctx, span.end, GL_RGBA, + _mesa_unpack_color_span_chan(ctx, span.end, GL_RGBA, (GLchan *) span.array->rgba, format, type, source, unpack, transferOps); diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c index f2b91e0528..7c2ce36491 100644 --- a/src/mesa/swrast/s_readpix.c +++ b/src/mesa/swrast/s_readpix.c @@ -409,7 +409,7 @@ read_rgba_pixels( GLcontext *ctx, } _mesa_map_ci_to_rgba_chan(ctx, readWidth, index, rgba); } - _mesa_pack_rgba_span(ctx, readWidth, (const GLchan (*)[4]) rgba, + _mesa_pack_rgba_span_chan(ctx, readWidth, (const GLchan (*)[4]) rgba, GL_RGBA, GL_FLOAT, dest, &_mesa_native_packing, transferOps & IMAGE_PRE_CONVOLUTION_BITS); dest += width * 4; @@ -431,7 +431,7 @@ read_rgba_pixels( GLcontext *ctx, GLvoid *dest; dest = _mesa_image_address(packing, pixels, readWidth, height, format, type, 0, row, 0); - _mesa_pack_float_rgba_span(ctx, readWidth, + _mesa_pack_rgba_span_float(ctx, readWidth, (const GLfloat (*)[4]) src, format, type, dest, packing, transferOps & IMAGE_POST_CONVOLUTION_BITS); @@ -468,7 +468,7 @@ read_rgba_pixels( GLcontext *ctx, CHECKARRAY(rgbaf, return); /* mac 32k limitation */ _mesa_chan_to_float_span(ctx, readWidth, (CONST GLchan (*)[4]) rgba, rgbaf); - _mesa_pack_float_rgba_span(ctx, readWidth, + _mesa_pack_rgba_span_float(ctx, readWidth, (CONST GLfloat (*)[4]) rgbaf, format, type, dst, packing, ctx->_ImageTransferState); @@ -476,7 +476,7 @@ read_rgba_pixels( GLcontext *ctx, } else { /* GLubytes are fine */ - _mesa_pack_rgba_span(ctx, readWidth, (CONST GLchan (*)[4]) rgba, + _mesa_pack_rgba_span_chan(ctx, readWidth, (CONST GLchan (*)[4]) rgba, format, type, dst, packing, ctx->_ImageTransferState); } |