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

convolution for glTexImage[123]D now works

Browse Source
This commit is contained in:
Brian Paul
2000-08-31 15:24:39 +00:00
parent b92d64e150
commit 5a0d3dc7b3
1 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
/* $Id: teximage.c,v 1.42 2000/08/30 18:22:28 brianp Exp $ */ /* $Id: teximage.c,v 1.43 2000/08/31 15:24:39 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -684,16 +684,27 @@ adjust_texture_size_for_convolution(const GLcontext *ctx, GLuint dimensions,
/* /*
* Called by glTexImage[123]D. Fill in a texture image with data given * Called by glTexImage[123]D. Fill in a texture image with data given
* by the client. All pixel transfer and unpack modes are handled here. * by the client. All pixel transfer and unpack modes are handled here.
* Input: dimensions (1, 2, or 3)
* texImage - destination texture image (we'll malloc the memory)
* width, height, depth - size of source image
* srcFormat, srcType - source image format and type
* pixels - source image data
* srcPacking - source image packing parameters
*
* NOTE: All texture image parameters should have already been error checked. * NOTE: All texture image parameters should have already been error checked.
*
* NOTE: the texImage dimensions and source image dimensions must be correct
* with respect to convolution with border mode = reduce.
*/ */
static void static void
make_texture_image( GLcontext *ctx, GLuint dimensions, make_texture_image( GLcontext *ctx, GLuint dimensions,
struct gl_texture_image *texImage, struct gl_texture_image *texImage,
GLint width, GLint height, GLint depth,
GLenum srcFormat, GLenum srcType, const GLvoid *pixels, GLenum srcFormat, GLenum srcType, const GLvoid *pixels,
const struct gl_pixelstore_attrib *srcPacking) const struct gl_pixelstore_attrib *srcPacking)
{ {
GLint components, numPixels; GLint components, numPixels;
GLint internalFormat, width, height, depth, border; GLint internalFormat, border;
ASSERT(ctx); ASSERT(ctx);
ASSERT(texImage); ASSERT(texImage);
@@ -702,9 +713,6 @@ make_texture_image( GLcontext *ctx, GLuint dimensions,
ASSERT(srcPacking); ASSERT(srcPacking);
internalFormat = texImage->IntFormat; internalFormat = texImage->IntFormat;
width = texImage->Width;
height = texImage->Height;
depth = texImage->Depth;
border = texImage->Border; border = texImage->Border;
components = components_in_intformat(internalFormat); components = components_in_intformat(internalFormat);
@@ -790,38 +798,38 @@ make_texture_image( GLcontext *ctx, GLuint dimensions,
/* color index texture */ /* color index texture */
const GLint destBytesPerRow = width * components * sizeof(GLubyte); const GLint destBytesPerRow = width * components * sizeof(GLubyte);
const GLenum dstType = GL_UNSIGNED_BYTE; const GLenum dstType = GL_UNSIGNED_BYTE;
GLubyte *dest = texImage->Data; GLubyte *destTex = texImage->Data;
GLint img, row; GLint img, row;
for (img = 0; img < depth; img++) { for (img = 0; img < depth; img++) {
for (row = 0; row < height; row++) { for (row = 0; row < height; row++) {
const GLvoid *srcAddr = _mesa_image_address(srcPacking, const GLvoid *srcAddr = _mesa_image_address(srcPacking,
pixels, width, height, srcFormat, srcType, img, row, 0); pixels, width, height, srcFormat, srcType, img, row, 0);
_mesa_unpack_index_span(ctx, width, dstType, dest, _mesa_unpack_index_span(ctx, width, dstType, destTex,
srcType, srcAddr, srcPacking, srcType, srcAddr, srcPacking,
ctx->ImageTransferState); ctx->ImageTransferState);
dest += destBytesPerRow; destTex += destBytesPerRow;
} }
} }
} }
else { else {
/* regular, color texture */ /* regular, color texture */
const GLint destBytesPerRow = width * components * sizeof(GLubyte); GLint destBytesPerRow;
const GLenum dstFormat = texImage->Format; const GLenum dstFormat = texImage->Format;
GLubyte *dest = texImage->Data; GLubyte *destTex = texImage->Data;
GLint img, row; GLint img, row;
GLint w = width, h = height; GLint convWidth = width, convHeight = height;
if ((dimensions == 1 && ctx->Pixel.Convolution1DEnabled) || if ((dimensions == 1 && ctx->Pixel.Convolution1DEnabled) ||
(dimensions >= 2 && (dimensions >= 2 &&
(ctx->Pixel.Convolution2DEnabled || ctx->Pixel.Separable2DEnabled) (ctx->Pixel.Convolution2DEnabled || ctx->Pixel.Separable2DEnabled)
)) { )) {
GLfloat *tmpImage, *convImage; GLfloat *tmpImage, *convImage;
tmpImage = (GLfloat *) MALLOC(width * height * sizeof(GLfloat)); tmpImage = (GLfloat *) MALLOC(width * height * 4 * sizeof(GLfloat));
if (!tmpImage) { if (!tmpImage) {
gl_error(ctx, GL_OUT_OF_MEMORY, "glTexImage"); gl_error(ctx, GL_OUT_OF_MEMORY, "glTexImage");
return; return;
} }
convImage = (GLfloat *) MALLOC(width * height * sizeof(GLfloat)); convImage = (GLfloat *) MALLOC(width * height * 4 * sizeof(GLfloat));
if (!convImage) { if (!convImage) {
gl_error(ctx, GL_OUT_OF_MEMORY, "glTexImage"); gl_error(ctx, GL_OUT_OF_MEMORY, "glTexImage");
FREE(tmpImage); FREE(tmpImage);
@@ -844,34 +852,33 @@ make_texture_image( GLcontext *ctx, GLuint dimensions,
/* convolve */ /* convolve */
if (dimensions == 1) { if (dimensions == 1) {
if (ctx->Pixel.Convolution1DEnabled) { ASSERT(ctx->Pixel.Convolution1DEnabled);
_mesa_convolve_1d_image(ctx, &w, tmpImage, convImage); _mesa_convolve_1d_image(ctx, &convWidth, tmpImage, convImage);
}
} }
else { else {
if (ctx->Pixel.Convolution2DEnabled) { if (ctx->Pixel.Convolution2DEnabled) {
_mesa_convolve_2d_image(ctx, &w, &h, tmpImage, convImage); _mesa_convolve_2d_image(ctx, &convWidth, &convHeight,
tmpImage, convImage);
} }
else { else {
ASSERT(ctx->Pixel.Separable2DEnabled); ASSERT(ctx->Pixel.Separable2DEnabled);
_mesa_convolve_sep_image(ctx, &w, &h, tmpImage, convImage); _mesa_convolve_sep_image(ctx, &convWidth, &convHeight,
tmpImage, convImage);
} }
} }
/* transfer ops after convolution */ /* packing and transfer ops after convolution */
srcf = convImage; srcf = convImage;
for (row = 0; row < h; row++) { destBytesPerRow = convWidth * components * sizeof(GLubyte);
GLvoid *dest; for (row = 0; row < convHeight; row++) {
dest = _mesa_image_address(&_mesa_native_packing, pixels, _mesa_pack_float_rgba_span(ctx, convWidth,
w, h, GL_RGBA, GL_UNSIGNED_BYTE,
0, row, 0);
_mesa_pack_float_rgba_span(ctx, w,
(const GLfloat (*)[4]) srcf, (const GLfloat (*)[4]) srcf,
dstFormat, GL_UNSIGNED_BYTE, dstFormat, GL_UNSIGNED_BYTE,
dest, &_mesa_native_packing, destTex, &_mesa_native_packing,
ctx->ImageTransferState ctx->ImageTransferState
& IMAGE_POST_CONVOLUTION_BITS); & IMAGE_POST_CONVOLUTION_BITS);
srcf += w * 4; srcf += convWidth * 4;
destTex += destBytesPerRow;
} }
} }
@@ -884,10 +891,10 @@ make_texture_image( GLcontext *ctx, GLuint dimensions,
for (row = 0; row < height; row++) { for (row = 0; row < height; row++) {
const GLvoid *srcAddr = _mesa_image_address(srcPacking, const GLvoid *srcAddr = _mesa_image_address(srcPacking,
pixels, width, height, srcFormat, srcType, img, row, 0); pixels, width, height, srcFormat, srcType, img, row, 0);
_mesa_unpack_ubyte_color_span(ctx, width, dstFormat, dest, _mesa_unpack_ubyte_color_span(ctx, width, dstFormat, destTex,
srcFormat, srcType, srcAddr, srcPacking, srcFormat, srcType, srcAddr, srcPacking,
ctx->ImageTransferState); ctx->ImageTransferState);
dest += destBytesPerRow; destTex += destBytesPerRow;
} }
} }
} }
@@ -1587,8 +1594,8 @@ _mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
} }
if (retain || !success) { if (retain || !success) {
/* make internal copy of the texture image */ /* make internal copy of the texture image */
make_texture_image(ctx, 1, texImage, format, type, make_texture_image(ctx, 1, texImage, width, 1, 1,
pixels, &ctx->Unpack); format, type, pixels, &ctx->Unpack);
if (!success && ctx->Driver.TexImage1D) { if (!success && ctx->Driver.TexImage1D) {
/* let device driver try to use unpacked image */ /* let device driver try to use unpacked image */
(*ctx->Driver.TexImage1D)( ctx, target, level, texImage->Format, (*ctx->Driver.TexImage1D)( ctx, target, level, texImage->Format,
@@ -1718,8 +1725,8 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
} }
if (retain || !success) { if (retain || !success) {
/* make internal copy of the texture image */ /* make internal copy of the texture image */
make_texture_image(ctx, 2, texImage, format, type, make_texture_image(ctx, 2, texImage, width, height, 1,
pixels, &ctx->Unpack); format, type, pixels, &ctx->Unpack);
if (!success && ctx->Driver.TexImage2D) { if (!success && ctx->Driver.TexImage2D) {
/* let device driver try to use unpacked image */ /* let device driver try to use unpacked image */
(*ctx->Driver.TexImage2D)( ctx, target, level, texImage->Format, (*ctx->Driver.TexImage2D)( ctx, target, level, texImage->Format,
@@ -1854,8 +1861,8 @@ _mesa_TexImage3D( GLenum target, GLint level, GLint internalFormat,
} }
if (retain || !success) { if (retain || !success) {
/* make internal copy of the texture image */ /* make internal copy of the texture image */
make_texture_image(ctx, 3, texImage, format, type, make_texture_image(ctx, 3, texImage, width, height, depth,
pixels, &ctx->Unpack); format, type, pixels, &ctx->Unpack);
if (!success && ctx->Driver.TexImage3D) { if (!success && ctx->Driver.TexImage3D) {
/* let device driver try to use unpacked image */ /* let device driver try to use unpacked image */
(*ctx->Driver.TexImage3D)( ctx, target, level, texImage->Format, (*ctx->Driver.TexImage3D)( ctx, target, level, texImage->Format,