diff options
| author | Brian Paul <[email protected]> | 2004-02-28 20:35:57 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2004-02-28 20:35:57 +0000 |
| commit | 8cfd08b6134e2036ddceb1facfa82e15026068a2 (patch) | |
| tree | 76037f839147f64c9e4f676b25b4ef24ea2b6822 /src/mesa/main/convolve.c | |
| parent | d0582776a619cc0633a0cbeea010a0db5e3e210f (diff) | |
rename some span pack/unpack functions for better uniformity
Diffstat (limited to 'src/mesa/main/convolve.c')
| -rw-r--r-- | src/mesa/main/convolve.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c index e6b19fabd42..edb02482b39 100644 --- a/src/mesa/main/convolve.c +++ b/src/mesa/main/convolve.c @@ -143,7 +143,7 @@ _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, G ctx->Convolution1D.Height = 1; /* unpack filter image */ - _mesa_unpack_float_color_span(ctx, width, GL_RGBA, + _mesa_unpack_color_span_float(ctx, width, GL_RGBA, ctx->Convolution1D.Filter, format, type, image, &ctx->Unpack, 0, GL_FALSE); @@ -227,7 +227,7 @@ _mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, G const GLvoid *src = _mesa_image_address(&ctx->Unpack, image, width, height, format, type, 0, i, 0); GLfloat *dst = ctx->Convolution2D.Filter + i * width * 4; - _mesa_unpack_float_color_span(ctx, width, GL_RGBA, dst, + _mesa_unpack_color_span_float(ctx, width, GL_RGBA, dst, format, type, src, &ctx->Unpack, 0, GL_FALSE); } @@ -563,7 +563,7 @@ _mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *im filter->Height, format, type, 0, row, 0); const GLfloat *src = filter->Filter + row * filter->Width * 4; - _mesa_pack_float_rgba_span(ctx, filter->Width, + _mesa_pack_rgba_span_float(ctx, filter->Width, (const GLfloat (*)[4]) src, format, type, dst, &ctx->Pack, 0); } @@ -739,7 +739,7 @@ _mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *dst = _mesa_image_address( &ctx->Pack, row, filter->Width, filter->Height, format, type, 0, 0, 0); - _mesa_pack_float_rgba_span(ctx, filter->Width, + _mesa_pack_rgba_span_float(ctx, filter->Width, (const GLfloat (*)[4]) filter->Filter, format, type, dst, &ctx->Pack, 0); } @@ -750,7 +750,7 @@ _mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row, 1, format, type, 0, 0, 0); const GLfloat *src = filter->Filter + colStart; - _mesa_pack_float_rgba_span(ctx, filter->Height, + _mesa_pack_rgba_span_float(ctx, filter->Height, (const GLfloat (*)[4]) src, format, type, dst, &ctx->Pack, 0); } @@ -807,7 +807,7 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs ctx->Separable2D.Height = height; /* unpack row filter */ - _mesa_unpack_float_color_span(ctx, width, GL_RGBA, + _mesa_unpack_color_span_float(ctx, width, GL_RGBA, ctx->Separable2D.Filter, format, type, row, &ctx->Unpack, 0, GL_FALSE); @@ -834,7 +834,7 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs } /* unpack column filter */ - _mesa_unpack_float_color_span(ctx, width, GL_RGBA, + _mesa_unpack_color_span_float(ctx, width, GL_RGBA, &ctx->Separable2D.Filter[colStart], format, type, column, &ctx->Unpack, 0, GL_FALSE); |