OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename some span pack/unpack functions for better uniformity

Browse Source
This commit is contained in:
Brian Paul
2004-02-28 20:35:57 +00:00
parent d0582776a6
commit 8cfd08b613
9 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesa/main/colortab.c
View File

@@ -198,7 +198,7 @@ store_colortable_entries(GLcontext *ctx, struct gl_color_table *table,
GLfloat *tableF; GLfloat *tableF;
GLint i; GLint i;
_mesa_unpack_float_color_span(ctx, _mesa_unpack_color_span_float(ctx,
count, /* number of pixels */ count, /* number of pixels */
table->Format, /* dest format */ table->Format, /* dest format */
tempTab, /* dest address */ tempTab, /* dest address */
@@ -261,7 +261,7 @@ store_colortable_entries(GLcontext *ctx, struct gl_color_table *table,
/* non-float (GLchan) */ /* non-float (GLchan) */
const GLint comps = _mesa_components_in_format(table->Format); const GLint comps = _mesa_components_in_format(table->Format);
GLchan *dest = (GLchan *) table->Table + start * comps; GLchan *dest = (GLchan *) table->Table + start * comps;
_mesa_unpack_chan_color_span(ctx, count, /* number of entries */ _mesa_unpack_color_span_chan(ctx, count, /* number of entries */
table->Format, /* dest format */ table->Format, /* dest format */
dest, /* dest address */ dest, /* dest address */
format, type, data, /* src data */ format, type, data, /* src data */
@@ -862,7 +862,7 @@ _mesa_GetColorTable( GLenum target, GLenum format,
return; return;
} }
_mesa_pack_rgba_span(ctx, table->Size, (const GLchan (*)[4]) rgba, _mesa_pack_rgba_span_chan(ctx, table->Size, (const GLchan (*)[4]) rgba,
format, type, data, &ctx->Pack, GL_FALSE); format, type, data, &ctx->Pack, GL_FALSE);
} }

14
src/mesa/main/convolve.c
View File

@@ -143,7 +143,7 @@ _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, G
ctx->Convolution1D.Height = 1; ctx->Convolution1D.Height = 1;
/* unpack filter image */ /* unpack filter image */
_mesa_unpack_float_color_span(ctx, width, GL_RGBA, _mesa_unpack_color_span_float(ctx, width, GL_RGBA,
ctx->Convolution1D.Filter, ctx->Convolution1D.Filter,
format, type, image, &ctx->Unpack, format, type, image, &ctx->Unpack,
0, GL_FALSE); 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, const GLvoid *src = _mesa_image_address(&ctx->Unpack, image, width,
height, format, type, 0, i, 0); height, format, type, 0, i, 0);
GLfloat *dst = ctx->Convolution2D.Filter + i * width * 4; 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, format, type, src, &ctx->Unpack,
0, GL_FALSE); 0, GL_FALSE);
} }
@@ -563,7 +563,7 @@ _mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *im
filter->Height, format, type, filter->Height, format, type,
0, row, 0); 0, row, 0);
const GLfloat *src = filter->Filter + row * filter->Width * 4; 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, (const GLfloat (*)[4]) src,
format, type, dst, &ctx->Pack, 0); 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, GLvoid *dst = _mesa_image_address( &ctx->Pack, row, filter->Width,
filter->Height, format, type, filter->Height, format, type,
0, 0, 0); 0, 0, 0);
_mesa_pack_float_rgba_span(ctx, filter->Width, _mesa_pack_rgba_span_float(ctx, filter->Width,
(const GLfloat (*)[4]) filter->Filter, (const GLfloat (*)[4]) filter->Filter,
format, type, dst, &ctx->Pack, 0); format, type, dst, &ctx->Pack, 0);
} }
@@ -750,7 +750,7 @@ _mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row,
1, format, type, 1, format, type,
0, 0, 0); 0, 0, 0);
const GLfloat *src = filter->Filter + colStart; 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, (const GLfloat (*)[4]) src,
format, type, dst, &ctx->Pack, 0); format, type, dst, &ctx->Pack, 0);
} }
@@ -807,7 +807,7 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs
ctx->Separable2D.Height = height; ctx->Separable2D.Height = height;
/* unpack row filter */ /* unpack row filter */
_mesa_unpack_float_color_span(ctx, width, GL_RGBA, _mesa_unpack_color_span_float(ctx, width, GL_RGBA,
ctx->Separable2D.Filter, ctx->Separable2D.Filter,
format, type, row, &ctx->Unpack, format, type, row, &ctx->Unpack,
0, GL_FALSE); 0, GL_FALSE);
@@ -834,7 +834,7 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs
} }
/* unpack column filter */ /* 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], &ctx->Separable2D.Filter[colStart],
format, type, column, &ctx->Unpack, format, type, column, &ctx->Unpack,
0, GL_FALSE); 0, GL_FALSE);

2
src/mesa/main/histogram.c
View File

@@ -719,7 +719,7 @@ _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvo
minmax[1][GCOMP] = CLAMP(ctx->MinMax.Max[GCOMP], 0.0F, 1.0F); minmax[1][GCOMP] = CLAMP(ctx->MinMax.Max[GCOMP], 0.0F, 1.0F);
minmax[1][BCOMP] = CLAMP(ctx->MinMax.Max[BCOMP], 0.0F, 1.0F); minmax[1][BCOMP] = CLAMP(ctx->MinMax.Max[BCOMP], 0.0F, 1.0F);
minmax[1][ACOMP] = CLAMP(ctx->MinMax.Max[ACOMP], 0.0F, 1.0F); minmax[1][ACOMP] = CLAMP(ctx->MinMax.Max[ACOMP], 0.0F, 1.0F);
_mesa_pack_float_rgba_span(ctx, 2, (CONST GLfloat (*)[4]) minmax, _mesa_pack_rgba_span_float(ctx, 2, (CONST GLfloat (*)[4]) minmax,
format, type, values, &ctx->Pack, 0); format, type, values, &ctx->Pack, 0);
} }

14
src/mesa/main/image.c
View File

@@ -917,7 +917,7 @@ _mesa_pack_bitmap( GLint width, GLint height, const GLubyte *source,
* glGetConvolutionFilter(), etc. * glGetConvolutionFilter(), etc.
*/ */
void void
_mesa_pack_float_rgba_span( GLcontext *ctx, _mesa_pack_rgba_span_float( GLcontext *ctx,
GLuint n, CONST GLfloat rgbaIn[][4], GLuint n, CONST GLfloat rgbaIn[][4],
GLenum dstFormat, GLenum dstType, GLenum dstFormat, GLenum dstType,
GLvoid *dstAddr, GLvoid *dstAddr,
@@ -1897,7 +1897,7 @@ _mesa_pack_float_rgba_span( GLcontext *ctx,
} }
break; break;
default: default:
_mesa_problem(ctx, "bad type in _mesa_pack_float_rgba_span"); _mesa_problem(ctx, "bad type in _mesa_pack_rgba_span_float");
} }
} }
@@ -1918,7 +1918,7 @@ _mesa_pack_float_rgba_span( GLcontext *ctx,
* transferOps - bitmask of IMAGE_*_BIT operations to apply * transferOps - bitmask of IMAGE_*_BIT operations to apply
*/ */
void void
_mesa_pack_rgba_span( GLcontext *ctx, _mesa_pack_rgba_span_chan( GLcontext *ctx,
GLuint n, CONST GLchan srcRgba[][4], GLuint n, CONST GLchan srcRgba[][4],
GLenum dstFormat, GLenum dstType, GLenum dstFormat, GLenum dstType,
GLvoid *dstAddr, GLvoid *dstAddr,
@@ -1969,7 +1969,7 @@ _mesa_pack_rgba_span( GLcontext *ctx,
rgba[i][BCOMP] = CHAN_TO_FLOAT(srcRgba[i][BCOMP]); rgba[i][BCOMP] = CHAN_TO_FLOAT(srcRgba[i][BCOMP]);
rgba[i][ACOMP] = CHAN_TO_FLOAT(srcRgba[i][ACOMP]); rgba[i][ACOMP] = CHAN_TO_FLOAT(srcRgba[i][ACOMP]);
} }
_mesa_pack_float_rgba_span(ctx, n, (const GLfloat (*)[4]) rgba, _mesa_pack_rgba_span_float(ctx, n, (const GLfloat (*)[4]) rgba,
dstFormat, dstType, dstAddr, dstFormat, dstType, dstAddr,
dstPacking, transferOps); dstPacking, transferOps);
UNDEFARRAY(rgba); /* mac 32k limitation */ UNDEFARRAY(rgba); /* mac 32k limitation */
@@ -2701,7 +2701,7 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
* XXX perhaps expand this to process whole images someday. * XXX perhaps expand this to process whole images someday.
*/ */
void void
_mesa_unpack_chan_color_span( GLcontext *ctx, _mesa_unpack_color_span_chan( GLcontext *ctx,
GLuint n, GLenum dstFormat, GLchan dest[], GLuint n, GLenum dstFormat, GLchan dest[],
GLenum srcFormat, GLenum srcType, GLenum srcFormat, GLenum srcType,
const GLvoid *source, const GLvoid *source,
@@ -3095,7 +3095,7 @@ _mesa_unpack_chan_color_span( GLcontext *ctx,
void void
_mesa_unpack_float_color_span( GLcontext *ctx, _mesa_unpack_color_span_float( GLcontext *ctx,
GLuint n, GLenum dstFormat, GLfloat dest[], GLuint n, GLenum dstFormat, GLfloat dest[],
GLenum srcFormat, GLenum srcType, GLenum srcFormat, GLenum srcType,
const GLvoid *source, const GLvoid *source,
@@ -3302,7 +3302,7 @@ _mesa_unpack_float_color_span( GLcontext *ctx,
dstLuminanceIndex = dstIntensityIndex = -1; dstLuminanceIndex = dstIntensityIndex = -1;
break; break;
default: default:
_mesa_problem(ctx, "bad dstFormat in _mesa_unpack_float_color_span()"); _mesa_problem(ctx, "bad dstFormat in _mesa_unpack_color_span_float()");
UNDEFARRAY(rgba); /* mac 32k limitation */ UNDEFARRAY(rgba); /* mac 32k limitation */
return; return;
} }

8
src/mesa/main/image.h
View File

@@ -97,7 +97,7 @@ _mesa_pack_bitmap( GLint width, GLint height, const GLubyte *source,
extern void extern void
_mesa_pack_float_rgba_span( GLcontext *ctx, _mesa_pack_rgba_span_float( GLcontext *ctx,
GLuint n, CONST GLfloat rgba[][4], GLuint n, CONST GLfloat rgba[][4],
GLenum dstFormat, GLenum dstType, GLvoid *dstAddr, GLenum dstFormat, GLenum dstType, GLvoid *dstAddr,
const struct gl_pixelstore_attrib *dstPacking, const struct gl_pixelstore_attrib *dstPacking,
@@ -105,7 +105,7 @@ _mesa_pack_float_rgba_span( GLcontext *ctx,
extern void extern void
_mesa_pack_rgba_span( GLcontext *ctx, _mesa_pack_rgba_span_chan( GLcontext *ctx,
GLuint n, CONST GLchan rgba[][4], GLuint n, CONST GLchan rgba[][4],
GLenum dstFormat, GLenum dstType, GLvoid *dstAddr, GLenum dstFormat, GLenum dstType, GLvoid *dstAddr,
const struct gl_pixelstore_attrib *dstPacking, const struct gl_pixelstore_attrib *dstPacking,
@@ -113,7 +113,7 @@ _mesa_pack_rgba_span( GLcontext *ctx,
extern void extern void
_mesa_unpack_chan_color_span( GLcontext *ctx, _mesa_unpack_color_span_chan( GLcontext *ctx,
GLuint n, GLenum dstFormat, GLchan dest[], GLuint n, GLenum dstFormat, GLchan dest[],
GLenum srcFormat, GLenum srcType, GLenum srcFormat, GLenum srcType,
const GLvoid *source, const GLvoid *source,
@@ -122,7 +122,7 @@ _mesa_unpack_chan_color_span( GLcontext *ctx,
extern void extern void
_mesa_unpack_float_color_span( GLcontext *ctx, _mesa_unpack_color_span_float( GLcontext *ctx,
GLuint n, GLenum dstFormat, GLfloat dest[], GLuint n, GLenum dstFormat, GLfloat dest[],
GLenum srcFormat, GLenum srcType, GLenum srcFormat, GLenum srcType,
const GLvoid *source, const GLvoid *source,

2
src/mesa/main/teximage.c
View File

@@ -1954,7 +1954,7 @@ _mesa_GetTexImage( GLenum target, GLint level, GLenum format,
for (col = 0; col < width; col++) { for (col = 0; col < width; col++) {
(*texImage->FetchTexelc)(texImage, col, row, img, rgba[col]); (*texImage->FetchTexelc)(texImage, col, row, img, rgba[col]);
} }
_mesa_pack_rgba_span(ctx, width, (const GLchan (*)[4])rgba, _mesa_pack_rgba_span_chan(ctx, width, (const GLchan (*)[4])rgba,
format, type, dest, &ctx->Pack, format, type, dest, &ctx->Pack,
0 /* no image transfer */); 0 /* no image transfer */);
} /* format */ } /* format */

6
src/mesa/main/texstore.c
View File

@@ -359,7 +359,7 @@ transfer_teximage(GLcontext *ctx, GLuint dimensions,
const GLvoid *src = _mesa_image_address(srcPacking, const GLvoid *src = _mesa_image_address(srcPacking,
srcAddr, srcWidth, srcHeight, srcAddr, srcWidth, srcHeight,
srcFormat, srcType, img, row, 0); 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, srcFormat, srcType, src, srcPacking,
transferOps & IMAGE_PRE_CONVOLUTION_BITS, transferOps & IMAGE_PRE_CONVOLUTION_BITS,
GL_TRUE); GL_TRUE);
@@ -389,7 +389,7 @@ transfer_teximage(GLcontext *ctx, GLuint dimensions,
+ (dstZoffset + img) * (dstImageStride / sizeof(GLchan)) + (dstZoffset + img) * (dstImageStride / sizeof(GLchan))
+ dstYoffset * (dstRowStride / sizeof(GLchan)); + dstYoffset * (dstRowStride / sizeof(GLchan));
for (row = 0; row < convHeight; row++) { for (row = 0; row < convHeight; row++) {
_mesa_pack_float_rgba_span(ctx, convWidth, _mesa_pack_rgba_span_float(ctx, convWidth,
(const GLfloat (*)[4]) srcf, (const GLfloat (*)[4]) srcf,
texDestFormat, CHAN_TYPE, texDestFormat, CHAN_TYPE,
dest, &_mesa_native_packing, dest, &_mesa_native_packing,
@@ -418,7 +418,7 @@ transfer_teximage(GLcontext *ctx, GLuint dimensions,
const GLvoid *srcRow = _mesa_image_address(srcPacking, const GLvoid *srcRow = _mesa_image_address(srcPacking,
srcAddr, srcWidth, srcHeight, srcAddr, srcWidth, srcHeight,
srcFormat, srcType, img, row, 0); 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, destRow, srcFormat, srcType, srcRow,
srcPacking, transferOps); srcPacking, transferOps);
destRow += (dstRowStride / sizeof(GLchan)); destRow += (dstRowStride / sizeof(GLchan));

4
src/mesa/swrast/s_drawpix.c
View File

@@ -802,7 +802,7 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
for (row = 0; row < height; row++) { for (row = 0; row < height; row++) {
const GLvoid *source = _mesa_image_address(unpack, const GLvoid *source = _mesa_image_address(unpack,
pixels, width, height, format, type, 0, row, 0); 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, format, type, source, unpack,
transferOps & IMAGE_PRE_CONVOLUTION_BITS, transferOps & IMAGE_PRE_CONVOLUTION_BITS,
GL_FALSE); GL_FALSE);
@@ -856,7 +856,7 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
span.arrayMask = arrayMask; span.arrayMask = arrayMask;
span.interpMask = interpMask; 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, (GLchan *) span.array->rgba,
format, type, source, unpack, format, type, source, unpack,
transferOps); transferOps);

8
src/mesa/swrast/s_readpix.c
View File

@@ -409,7 +409,7 @@ read_rgba_pixels( GLcontext *ctx,
} }
_mesa_map_ci_to_rgba_chan(ctx, readWidth, index, rgba); _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, GL_RGBA, GL_FLOAT, dest, &_mesa_native_packing,
transferOps & IMAGE_PRE_CONVOLUTION_BITS); transferOps & IMAGE_PRE_CONVOLUTION_BITS);
dest += width * 4; dest += width * 4;
@@ -431,7 +431,7 @@ read_rgba_pixels( GLcontext *ctx,
GLvoid *dest; GLvoid *dest;
dest = _mesa_image_address(packing, pixels, readWidth, height, dest = _mesa_image_address(packing, pixels, readWidth, height,
format, type, 0, row, 0); format, type, 0, row, 0);
_mesa_pack_float_rgba_span(ctx, readWidth, _mesa_pack_rgba_span_float(ctx, readWidth,
(const GLfloat (*)[4]) src, (const GLfloat (*)[4]) src,
format, type, dest, packing, format, type, dest, packing,
transferOps & IMAGE_POST_CONVOLUTION_BITS); transferOps & IMAGE_POST_CONVOLUTION_BITS);
@@ -468,7 +468,7 @@ read_rgba_pixels( GLcontext *ctx,
CHECKARRAY(rgbaf, return); /* mac 32k limitation */ CHECKARRAY(rgbaf, return); /* mac 32k limitation */
_mesa_chan_to_float_span(ctx, readWidth, _mesa_chan_to_float_span(ctx, readWidth,
(CONST GLchan (*)[4]) rgba, rgbaf); (CONST GLchan (*)[4]) rgba, rgbaf);
_mesa_pack_float_rgba_span(ctx, readWidth, _mesa_pack_rgba_span_float(ctx, readWidth,
(CONST GLfloat (*)[4]) rgbaf, (CONST GLfloat (*)[4]) rgbaf,
format, type, dst, packing, format, type, dst, packing,
ctx->_ImageTransferState); ctx->_ImageTransferState);
@@ -476,7 +476,7 @@ read_rgba_pixels( GLcontext *ctx,
} }
else { else {
/* GLubytes are fine */ /* 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, format, type, dst, packing,
ctx->_ImageTransferState); ctx->_ImageTransferState);
} }