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/main/texstore.c | |
| parent | d0582776a619cc0633a0cbeea010a0db5e3e210f (diff) | |
rename some span pack/unpack functions for better uniformity
Diffstat (limited to 'src/mesa/main/texstore.c')
| -rw-r--r-- | src/mesa/main/texstore.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index 97040487f6..61bbc10bf6 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -359,7 +359,7 @@ transfer_teximage(GLcontext *ctx, GLuint dimensions, const GLvoid *src = _mesa_image_address(srcPacking, srcAddr, srcWidth, srcHeight, srcFormat, srcType, img, row, 0); - _mesa_unpack_float_color_span(ctx, srcWidth, GL_RGBA, dstf, + _mesa_unpack_color_span_float(ctx, srcWidth, GL_RGBA, dstf, srcFormat, srcType, src, srcPacking, transferOps & IMAGE_PRE_CONVOLUTION_BITS, GL_TRUE); @@ -389,7 +389,7 @@ transfer_teximage(GLcontext *ctx, GLuint dimensions, + (dstZoffset + img) * (dstImageStride / sizeof(GLchan)) + dstYoffset * (dstRowStride / sizeof(GLchan)); for (row = 0; row < convHeight; row++) { - _mesa_pack_float_rgba_span(ctx, convWidth, + _mesa_pack_rgba_span_float(ctx, convWidth, (const GLfloat (*)[4]) srcf, texDestFormat, CHAN_TYPE, dest, &_mesa_native_packing, @@ -418,7 +418,7 @@ transfer_teximage(GLcontext *ctx, GLuint dimensions, const GLvoid *srcRow = _mesa_image_address(srcPacking, srcAddr, srcWidth, srcHeight, srcFormat, srcType, img, row, 0); - _mesa_unpack_chan_color_span(ctx, srcWidth, texDestFormat, + _mesa_unpack_color_span_chan(ctx, srcWidth, texDestFormat, destRow, srcFormat, srcType, srcRow, srcPacking, transferOps); destRow += (dstRowStride / sizeof(GLchan)); |