diff options
Diffstat (limited to 'mesalib/src/mesa/main')
| -rw-r--r-- | mesalib/src/mesa/main/context.c | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/dd.h | 21 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/debug.c | 93 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/debug.h | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/fbobject.c | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/formats.c | 20 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/formats.h | 1 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/mipmap.c | 3 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/texfetch.c | 7 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/texfetch_tmp.h | 82 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/texformat.c | 3 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/teximage.c | 21 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/texstore.c | 383 |
13 files changed, 317 insertions, 323 deletions
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c index b83a5d621..0cf794735 100644 --- a/mesalib/src/mesa/main/context.c +++ b/mesalib/src/mesa/main/context.c @@ -907,7 +907,7 @@ _mesa_initialize_context(struct gl_context *ctx, /*ASSERT(driverContext);*/ assert(driverFunctions->NewTextureObject); - assert(driverFunctions->FreeTexImageData); + assert(driverFunctions->FreeTextureImageBuffer); ctx->API = api; ctx->Visual = *visual; diff --git a/mesalib/src/mesa/main/dd.h b/mesalib/src/mesa/main/dd.h index fcf40ecf1..d918b1e31 100644 --- a/mesalib/src/mesa/main/dd.h +++ b/mesalib/src/mesa/main/dd.h @@ -479,7 +479,26 @@ struct dd_function_table { /** * Called to free tImage->Data. */ - void (*FreeTexImageData)( struct gl_context *ctx, struct gl_texture_image *tImage ); + void (*FreeTextureImageBuffer)( struct gl_context *ctx, struct gl_texture_image *tImage ); + + /** Map a slice of a texture image into user space. + * \param texImage the texture image + * \param slice the 3D image slice or array texture slice + * \param x, y, w, h region of interest + * \param mode bitmask of GL_MAP_READ_BIT, GL_MAP_WRITE_BIT + * \param mapOut returns start of mapping of region of interest + * \param rowStrideOut returns row stride (in bytes) + */ + void (*MapTextureImage)(struct gl_context *ctx, + struct gl_texture_image *texImage, + GLuint slice, + GLuint x, GLuint y, GLuint w, GLuint h, + GLbitfield mode, + GLubyte **mapOut, GLint *rowStrideOut); + + void (*UnmapTextureImage)(struct gl_context *ctx, + struct gl_texture_image *texImage, + GLuint slice); /** Map texture image data into user space */ void (*MapTexture)( struct gl_context *ctx, struct gl_texture_object *tObj ); diff --git a/mesalib/src/mesa/main/debug.c b/mesalib/src/mesa/main/debug.c index b1fc096f2..2bb37452d 100644 --- a/mesalib/src/mesa/main/debug.c +++ b/mesalib/src/mesa/main/debug.c @@ -353,11 +353,10 @@ dump_texture(struct gl_texture_object *texObj, GLuint writeImages) for (j = 0; j < numFaces; j++) { struct gl_texture_image *texImg = texObj->Image[j][i]; if (texImg) { - printf(" Face %u level %u: %d x %d x %d, format %s at %p\n", + printf(" Face %u level %u: %d x %d x %d, format %s\n", j, i, texImg->Width, texImg->Height, texImg->Depth, - _mesa_get_format_name(texImg->TexFormat), - texImg->Data); + _mesa_get_format_name(texImg->TexFormat)); if (writeImages == WRITE_ALL || (writeImages == WRITE_ONE && !written)) { write_texture_image(texObj, j, i); @@ -566,58 +565,66 @@ _mesa_dump_image(const char *filename, const void *image, GLuint w, GLuint h, * Quick and dirty function to "print" a texture to stdout. */ void -_mesa_print_texture(struct gl_context *ctx, const struct gl_texture_image *img) +_mesa_print_texture(struct gl_context *ctx, struct gl_texture_image *img) { #if CHAN_TYPE != GL_UNSIGNED_BYTE _mesa_problem(NULL, "PrintTexture not supported"); #else + const GLint slice = 0; + GLint srcRowStride; GLuint i, j, c; - const GLubyte *data = (const GLubyte *) img->Data; + GLubyte *data; + + ctx->Driver.MapTextureImage(ctx, img, slice, + 0, 0, img->Width, img->Height, GL_MAP_READ_BIT, + &data, &srcRowStride); if (!data) { printf("No texture data\n"); - return; } + else { + /* XXX add more formats or make into a new format utility function */ + switch (img->TexFormat) { + case MESA_FORMAT_A8: + case MESA_FORMAT_L8: + case MESA_FORMAT_I8: + c = 1; + break; + case MESA_FORMAT_AL88: + case MESA_FORMAT_AL88_REV: + c = 2; + break; + case MESA_FORMAT_RGB888: + case MESA_FORMAT_BGR888: + c = 3; + break; + case MESA_FORMAT_RGBA8888: + case MESA_FORMAT_ARGB8888: + c = 4; + break; + default: + _mesa_problem(NULL, "error in PrintTexture\n"); + return; + } - /* XXX add more formats or make into a new format utility function */ - switch (img->TexFormat) { - case MESA_FORMAT_A8: - case MESA_FORMAT_L8: - case MESA_FORMAT_I8: - case MESA_FORMAT_CI8: - c = 1; - break; - case MESA_FORMAT_AL88: - case MESA_FORMAT_AL88_REV: - c = 2; - break; - case MESA_FORMAT_RGB888: - case MESA_FORMAT_BGR888: - c = 3; - break; - case MESA_FORMAT_RGBA8888: - case MESA_FORMAT_ARGB8888: - c = 4; - break; - default: - _mesa_problem(NULL, "error in PrintTexture\n"); - return; - } + for (i = 0; i < img->Height; i++) { + for (j = 0; j < img->Width; j++) { + if (c==1) + printf("%02x ", data[0]); + else if (c==2) + printf("%02x%02x ", data[0], data[1]); + else if (c==3) + printf("%02x%02x%02x ", data[0], data[1], data[2]); + else if (c==4) + printf("%02x%02x%02x%02x ", data[0], data[1], data[2], data[3]); + data += (srcRowStride - img->Width) * c; + } + /* XXX use img->ImageStride here */ + printf("\n"); - for (i = 0; i < img->Height; i++) { - for (j = 0; j < img->Width; j++) { - if (c==1) - printf("%02x ", data[0]); - else if (c==2) - printf("%02x%02x ", data[0], data[1]); - else if (c==3) - printf("%02x%02x%02x ", data[0], data[1], data[2]); - else if (c==4) - printf("%02x%02x%02x%02x ", data[0], data[1], data[2], data[3]); - data += (img->RowStride - img->Width) * c; } - /* XXX use img->ImageStride here */ - printf("\n"); } + + ctx->Driver.UnmapTextureImage(ctx, img, slice); #endif } diff --git a/mesalib/src/mesa/main/debug.h b/mesalib/src/mesa/main/debug.h index d7c53b655..bc64a83bb 100644 --- a/mesalib/src/mesa/main/debug.h +++ b/mesalib/src/mesa/main/debug.h @@ -89,6 +89,6 @@ _mesa_dump_image(const char *filename, const void *image, GLuint w, GLuint h, GLenum format, GLenum type); extern void -_mesa_print_texture(struct gl_context *ctx, const struct gl_texture_image *img); +_mesa_print_texture(struct gl_context *ctx, struct gl_texture_image *img); #endif diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c index 0b48fc7ea..fd371aba8 100644 --- a/mesalib/src/mesa/main/fbobject.c +++ b/mesalib/src/mesa/main/fbobject.c @@ -2321,7 +2321,7 @@ _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment, } else { gl_format format = att->Renderbuffer->Format; - if (format == MESA_FORMAT_CI8 || format == MESA_FORMAT_S8) { + if (format == MESA_FORMAT_S8) { /* special cases */ *params = GL_INDEX; } diff --git a/mesalib/src/mesa/main/formats.c b/mesalib/src/mesa/main/formats.c index f9298d2d1..65c08f024 100644 --- a/mesalib/src/mesa/main/formats.c +++ b/mesalib/src/mesa/main/formats.c @@ -42,8 +42,7 @@ struct gl_format_info /** * Base format is one of GL_RED, GL_RG, GL_RGB, GL_RGBA, GL_ALPHA, * GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_INTENSITY, GL_YCBCR_MESA, - * GL_COLOR_INDEX, GL_DEPTH_COMPONENT, GL_STENCIL_INDEX, - * GL_DEPTH_STENCIL, GL_DUDV_ATI. + * GL_DEPTH_COMPONENT, GL_STENCIL_INDEX, GL_DEPTH_STENCIL, GL_DUDV_ATI. */ GLenum BaseFormat; @@ -331,15 +330,6 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] = 1, 1, 2 /* BlockWidth/Height,Bytes */ }, { - MESA_FORMAT_CI8, /* Name */ - "MESA_FORMAT_CI8", /* StrName */ - GL_COLOR_INDEX, /* BaseFormat */ - GL_UNSIGNED_INT, /* DataType */ - 0, 0, 0, 0, /* Red/Green/Blue/AlphaBits */ - 0, 0, 8, 0, 0, /* Lum/Int/Index/Depth/StencilBits */ - 1, 1, 1 /* BlockWidth/Height,Bytes */ - }, - { MESA_FORMAT_YCBCR, /* Name */ "MESA_FORMAT_YCBCR", /* StrName */ GL_YCBCR_MESA, /* BaseFormat */ @@ -1223,10 +1213,9 @@ _mesa_get_format_datatype(gl_format format) /** - * Return the basic format for the given type. The result will be - * one of GL_RGB, GL_RGBA, GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, - * GL_INTENSITY, GL_YCBCR_MESA, GL_COLOR_INDEX, GL_DEPTH_COMPONENT, - * GL_STENCIL_INDEX, GL_DEPTH_STENCIL. + * Return the basic format for the given type. The result will be one of + * GL_RGB, GL_RGBA, GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_INTENSITY, + * GL_YCBCR_MESA, GL_DEPTH_COMPONENT, GL_STENCIL_INDEX, GL_DEPTH_STENCIL. */ GLenum _mesa_get_format_base_format(gl_format format) @@ -1632,7 +1621,6 @@ _mesa_format_to_type_and_comps(gl_format format, case MESA_FORMAT_A8: case MESA_FORMAT_L8: case MESA_FORMAT_I8: - case MESA_FORMAT_CI8: case MESA_FORMAT_R8: case MESA_FORMAT_S8: *datatype = GL_UNSIGNED_BYTE; diff --git a/mesalib/src/mesa/main/formats.h b/mesalib/src/mesa/main/formats.h index 5b8c01781..75d93deba 100644 --- a/mesalib/src/mesa/main/formats.h +++ b/mesalib/src/mesa/main/formats.h @@ -80,7 +80,6 @@ typedef enum MESA_FORMAT_L16, /* LLLL LLLL LLLL LLLL */ MESA_FORMAT_I8, /* IIII IIII */ MESA_FORMAT_I16, /* IIII IIII IIII IIII */ - MESA_FORMAT_CI8, /* CCCC CCCC */ MESA_FORMAT_YCBCR, /* YYYY YYYY UorV UorV */ MESA_FORMAT_YCBCR_REV, /* UorV UorV YYYY YYYY */ MESA_FORMAT_R8, /* RRRR RRRR */ diff --git a/mesalib/src/mesa/main/mipmap.c b/mesalib/src/mesa/main/mipmap.c index 8a811cb72..cf9d522f2 100644 --- a/mesalib/src/mesa/main/mipmap.c +++ b/mesalib/src/mesa/main/mipmap.c @@ -1948,8 +1948,7 @@ generate_mipmap_uncompressed(struct gl_context *ctx, GLenum target, } /* Free old image data */ - if (dstImage->Data) - ctx->Driver.FreeTexImageData(ctx, dstImage); + ctx->Driver.FreeTextureImageBuffer(ctx, dstImage); /* initialize new image */ _mesa_init_teximage_fields(ctx, target, dstImage, dstWidth, dstHeight, diff --git a/mesalib/src/mesa/main/texfetch.c b/mesalib/src/mesa/main/texfetch.c index 72283eb68..11cc8e047 100644 --- a/mesalib/src/mesa/main/texfetch.c +++ b/mesalib/src/mesa/main/texfetch.c @@ -325,13 +325,6 @@ texfetch_funcs[MESA_FORMAT_COUNT] = store_texel_i16 }, { - MESA_FORMAT_CI8, - fetch_texel_1d_f_ci8, - fetch_texel_2d_f_ci8, - fetch_texel_3d_f_ci8, - store_texel_ci8 - }, - { MESA_FORMAT_YCBCR, fetch_texel_1d_f_ycbcr, fetch_texel_2d_f_ycbcr, diff --git a/mesalib/src/mesa/main/texfetch_tmp.h b/mesalib/src/mesa/main/texfetch_tmp.h index d170adf2e..548d50c8e 100644 --- a/mesalib/src/mesa/main/texfetch_tmp.h +++ b/mesalib/src/mesa/main/texfetch_tmp.h @@ -1379,88 +1379,6 @@ static void store_texel_i16(struct gl_texture_image *texImage, #endif -/* MESA_FORMAT_CI8 ***********************************************************/ - -/* Fetch CI texel from 1D, 2D or 3D ci8 texture, lookup the index in a - * color table, and return 4 GLchans. - */ -static void FETCH(f_ci8)( const struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, GLfloat *texel ) -{ - const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1); - const struct gl_color_table *palette; - GLuint index; - GET_CURRENT_CONTEXT(ctx); - - if (ctx->Texture.SharedPalette) { - palette = &ctx->Texture.Palette; - } - else { - palette = &texImage->TexObject->Palette; - } - if (palette->Size == 0) - return; /* undefined results */ - - /* Mask the index against size of palette to avoid going out of bounds */ - index = (*src) & (palette->Size - 1); - - { - const GLfloat *table = palette->TableF; - switch (palette->_BaseFormat) { - case GL_ALPHA: - texel[RCOMP] = - texel[GCOMP] = - texel[BCOMP] = 0.0F; - texel[ACOMP] = table[index]; - break; - case GL_LUMINANCE: - texel[RCOMP] = - texel[GCOMP] = - texel[BCOMP] = table[index]; - texel[ACOMP] = 1.0F; - break; - case GL_INTENSITY: - texel[RCOMP] = - texel[GCOMP] = - texel[BCOMP] = - texel[ACOMP] = table[index]; - break; - case GL_LUMINANCE_ALPHA: - texel[RCOMP] = - texel[GCOMP] = - texel[BCOMP] = table[index * 2 + 0]; - texel[ACOMP] = table[index * 2 + 1]; - break; - case GL_RGB: - texel[RCOMP] = table[index * 3 + 0]; - texel[GCOMP] = table[index * 3 + 1]; - texel[BCOMP] = table[index * 3 + 2]; - texel[ACOMP] = 1.0F; - break; - case GL_RGBA: - texel[RCOMP] = table[index * 4 + 0]; - texel[GCOMP] = table[index * 4 + 1]; - texel[BCOMP] = table[index * 4 + 2]; - texel[ACOMP] = table[index * 4 + 3]; - break; - default: - _mesa_problem(ctx, "Bad palette format in fetch_texel_ci8"); - return; - } - } -} - -#if DIM == 3 -static void store_texel_ci8(struct gl_texture_image *texImage, - GLint i, GLint j, GLint k, const void *texel) -{ - const GLubyte *index = (const GLubyte *) texel; - GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1); - *dst = *index; -} -#endif - - /* Fetch texel from 1D, 2D or 3D srgb8 texture, return 4 GLfloats */ /* Note: component order is same as for MESA_FORMAT_RGB888 */ static void FETCH(srgb8)(const struct gl_texture_image *texImage, diff --git a/mesalib/src/mesa/main/texformat.c b/mesalib/src/mesa/main/texformat.c index c919a74e0..075c40c86 100644 --- a/mesalib/src/mesa/main/texformat.c +++ b/mesalib/src/mesa/main/texformat.c @@ -204,9 +204,6 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat, case GL_COLOR_INDEX12_EXT: case GL_COLOR_INDEX16_EXT: case GL_COLOR_INDEX8_EXT: - RETURN_IF_SUPPORTED(MESA_FORMAT_CI8); - break; - default: ; /* fallthrough */ } diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c index a005d2935..886e52114 100644 --- a/mesalib/src/mesa/main/teximage.c +++ b/mesalib/src/mesa/main/teximage.c @@ -595,7 +595,7 @@ _mesa_new_texture_image( struct gl_context *ctx ) /** * Free texture image data. - * This function is a fallback called via ctx->Driver.FreeTexImageData(). + * This function is a fallback called via ctx->Driver.FreeTextureImageBuffer(). * * \param texImage texture image. * @@ -630,8 +630,8 @@ _mesa_delete_texture_image(struct gl_context *ctx, /* Free texImage->Data and/or any other driver-specific texture * image storage. */ - ASSERT(ctx->Driver.FreeTexImageData); - ctx->Driver.FreeTexImageData( ctx, texImage ); + ASSERT(ctx->Driver.FreeTextureImageBuffer); + ctx->Driver.FreeTextureImageBuffer( ctx, texImage ); ASSERT(texImage->Data == NULL); if (texImage->ImageOffsets) @@ -1211,7 +1211,7 @@ void _mesa_clear_texture_image(struct gl_context *ctx, struct gl_texture_image *texImage) { - ctx->Driver.FreeTexImageData(ctx, texImage); + ctx->Driver.FreeTextureImageBuffer(ctx, texImage); clear_teximage_fields(texImage); } @@ -2456,9 +2456,7 @@ teximage(struct gl_context *ctx, GLuint dims, else { gl_format texFormat; - if (texImage->Data) { - ctx->Driver.FreeTexImageData( ctx, texImage ); - } + ctx->Driver.FreeTextureImageBuffer(ctx, texImage); ASSERT(texImage->Data == NULL); texFormat = _mesa_choose_texture_format(ctx, texObj, target, level, @@ -2597,8 +2595,7 @@ _mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image) if (!texImage) { _mesa_error(ctx, GL_OUT_OF_MEMORY, "glEGLImageTargetTexture2D"); } else { - if (texImage->Data) - ctx->Driver.FreeTexImageData( ctx, texImage ); + ctx->Driver.FreeTextureImageBuffer(ctx, texImage); ASSERT(texImage->Data == NULL); ctx->Driver.EGLImageTargetTexture2D(ctx, target, @@ -2804,7 +2801,7 @@ copyteximage(struct gl_context *ctx, GLuint dims, GLint srcX = x, srcY = y, dstX = 0, dstY = 0; /* Free old texture image */ - ctx->Driver.FreeTexImageData(ctx, texImage); + ctx->Driver.FreeTextureImageBuffer(ctx, texImage); _mesa_init_teximage_fields(ctx, target, texImage, width, height, 1, border, internalFormat, texFormat); @@ -3362,9 +3359,7 @@ compressedteximage(struct gl_context *ctx, GLuint dims, else { gl_format texFormat; - if (texImage->Data) { - ctx->Driver.FreeTexImageData( ctx, texImage ); - } + ctx->Driver.FreeTextureImageBuffer(ctx, texImage); ASSERT(texImage->Data == NULL); texFormat = _mesa_choose_texture_format(ctx, texObj, target, level, diff --git a/mesalib/src/mesa/main/texstore.c b/mesalib/src/mesa/main/texstore.c index c4aeaa8f1..e9915a7f0 100644 --- a/mesalib/src/mesa/main/texstore.c +++ b/mesalib/src/mesa/main/texstore.c @@ -2724,50 +2724,6 @@ _mesa_texstore_unorm8(TEXSTORE_PARAMS) -static GLboolean -_mesa_texstore_ci8(TEXSTORE_PARAMS) -{ - const GLuint texelBytes = _mesa_get_format_bytes(dstFormat); - - (void) dims; (void) baseInternalFormat; - ASSERT(dstFormat == MESA_FORMAT_CI8); - ASSERT(texelBytes == 1); - ASSERT(baseInternalFormat == GL_COLOR_INDEX); - - if (!ctx->_ImageTransferState && - !srcPacking->SwapBytes && - srcFormat == GL_COLOR_INDEX && - srcType == GL_UNSIGNED_BYTE) { - /* simple memcpy path */ - memcpy_texture(ctx, dims, - dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset, - dstRowStride, - dstImageOffsets, - srcWidth, srcHeight, srcDepth, srcFormat, srcType, - srcAddr, srcPacking); - } - else { - /* general path */ - GLint img, row; - for (img = 0; img < srcDepth; img++) { - GLubyte *dstRow = (GLubyte *) dstAddr - + dstImageOffsets[dstZoffset + img] * texelBytes - + dstYoffset * dstRowStride - + dstXoffset * texelBytes; - for (row = 0; row < srcHeight; row++) { - const GLvoid *src = _mesa_image_address(dims, srcPacking, - srcAddr, srcWidth, srcHeight, srcFormat, srcType, img, row, 0); - _mesa_unpack_index_span(ctx, srcWidth, GL_UNSIGNED_BYTE, dstRow, - srcType, src, srcPacking, - ctx->_ImageTransferState); - dstRow += dstRowStride; - } - } - } - return GL_TRUE; -} - - /** * Texstore for _mesa_texformat_ycbcr or _mesa_texformat_ycbcr_REV. */ @@ -4392,7 +4348,6 @@ texstore_funcs[MESA_FORMAT_COUNT] = { MESA_FORMAT_L16, _mesa_texstore_unorm16 }, { MESA_FORMAT_I8, _mesa_texstore_unorm8 }, { MESA_FORMAT_I16, _mesa_texstore_unorm16 }, - { MESA_FORMAT_CI8, _mesa_texstore_ci8 }, { MESA_FORMAT_YCBCR, _mesa_texstore_ycbcr }, { MESA_FORMAT_YCBCR_REV, _mesa_texstore_ycbcr }, { MESA_FORMAT_R8, _mesa_texstore_unorm8 }, @@ -4565,17 +4520,24 @@ texture_size(const struct gl_texture_image *texImage) } -/** Return row stride in bytes */ -static GLuint -texture_row_stride(const struct gl_texture_image *texImage) +/** + * Normally, we'll only _write_ texel data to a texture when we map it. + * But if the user is providing depth or stencil values and the texture + * image is a combined depth/stencil format, we'll actually read from + * the texture buffer too (in order to insert the depth or stencil values. + * \param userFormat the user-provided image format + * \param texFormat the destination texture format + */ +static GLbitfield +get_read_write_mode(GLenum userFormat, gl_format texFormat) { - GLuint stride = _mesa_format_row_stride(texImage->TexFormat, - texImage->Width); - return stride; + if ((userFormat == GL_STENCIL_INDEX || userFormat == GL_DEPTH_COMPONENT) + && _mesa_get_format_base_format(texFormat) == GL_DEPTH_STENCIL) + return GL_MAP_READ_BIT | GL_MAP_WRITE_BIT; + else + return GL_MAP_WRITE_BIT; } - - /** * This is the software fallback for Driver.TexImage1D(). * \sa _mesa_store_teximage2d() @@ -4590,6 +4552,12 @@ _mesa_store_teximage1d(struct gl_context *ctx, GLenum target, GLint level, struct gl_texture_image *texImage) { GLuint sizeInBytes; + const GLbitfield rwMode = get_read_write_mode(format, texImage->TexFormat); + const GLuint zeroImageOffset = 0; + GLubyte *dstMap; + GLint dstRowStride; + GLboolean success; + (void) border; /* allocate memory */ @@ -4608,20 +4576,26 @@ _mesa_store_teximage1d(struct gl_context *ctx, GLenum target, GLint level, */ return; } - else { - const GLint dstRowStride = 0; - GLboolean success = _mesa_texstore(ctx, 1, texImage->_BaseFormat, - texImage->TexFormat, - texImage->Data, - 0, 0, 0, /* dstX/Y/Zoffset */ - dstRowStride, - texImage->ImageOffsets, - width, 1, 1, - format, type, pixels, packing); - if (!success) { - _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage1D"); - } - } + + /* Map dest texture buffer (write to whole region) */ + ctx->Driver.MapTextureImage(ctx, texImage, 0, + 0, 0, width, 1, + rwMode, + &dstMap, &dstRowStride); + + success = _mesa_texstore(ctx, 1, texImage->_BaseFormat, + texImage->TexFormat, + dstMap, + 0, 0, 0, /* dstX/Y/Zoffset */ + 0, /* dstRowStride */ + &zeroImageOffset, + width, 1, 1, + format, type, pixels, packing); + + ctx->Driver.UnmapTextureImage(ctx, texImage, 0); + + if (!success) + _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage1D"); _mesa_unmap_teximage_pbo(ctx, packing); } @@ -4643,6 +4617,12 @@ _mesa_store_teximage2d(struct gl_context *ctx, GLenum target, GLint level, struct gl_texture_image *texImage) { GLuint sizeInBytes; + const GLbitfield rwMode = get_read_write_mode(format, texImage->TexFormat); + const GLuint zeroImageOffset = 0; + GLubyte *dstMap; + GLint dstRowStride; + GLboolean success; + (void) border; /* allocate memory */ @@ -4661,20 +4641,26 @@ _mesa_store_teximage2d(struct gl_context *ctx, GLenum target, GLint level, */ return; } - else { - GLint dstRowStride = texture_row_stride(texImage); - GLboolean success = _mesa_texstore(ctx, 2, texImage->_BaseFormat, - texImage->TexFormat, - texImage->Data, - 0, 0, 0, /* dstX/Y/Zoffset */ - dstRowStride, - texImage->ImageOffsets, - width, height, 1, - format, type, pixels, packing); - if (!success) { - _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D"); - } - } + + /* Map dest texture buffer (write to whole region) */ + ctx->Driver.MapTextureImage(ctx, texImage, 0, + 0, 0, width, height, + rwMode, + &dstMap, &dstRowStride); + assert(dstMap); + success = _mesa_texstore(ctx, 2, texImage->_BaseFormat, + texImage->TexFormat, + dstMap, + 0, 0, 0, /* dstX/Y/Zoffset */ + dstRowStride, + &zeroImageOffset, + width, height, 1, + format, type, pixels, packing); + + ctx->Driver.UnmapTextureImage(ctx, texImage, 0); + + if (!success) + _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D"); _mesa_unmap_teximage_pbo(ctx, packing); } @@ -4695,40 +4681,72 @@ _mesa_store_teximage3d(struct gl_context *ctx, GLenum target, GLint level, struct gl_texture_image *texImage) { GLuint sizeInBytes; + const GLbitfield rwMode = get_read_write_mode(format, texImage->TexFormat); + GLboolean success; + GLint slice; + GLubyte **sliceMaps; + GLuint *dstImageOffsets; + GLint dstRowStride; + GLuint texelSize = _mesa_get_format_bytes(texImage->TexFormat); + (void) border; /* allocate memory */ sizeInBytes = texture_size(texImage); texImage->Data = _mesa_alloc_texmemory(sizeInBytes); if (!texImage->Data) { - _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage3D"); + /* Note: we check for a NULL image pointer here, _after_ we allocated + * memory for the texture. That's what the GL spec calls for. + */ return; } - pixels = _mesa_validate_pbo_teximage(ctx, 3, width, height, depth, format, - type, pixels, packing, "glTexImage3D"); + pixels = _mesa_validate_pbo_teximage(ctx, 3, width, height, depth, + format, type, + pixels, packing, "glTexImage3D"); if (!pixels) { /* Note: we check for a NULL image pointer here, _after_ we allocated * memory for the texture. That's what the GL spec calls for. */ return; } - else { - GLint dstRowStride = texture_row_stride(texImage); - GLboolean success = _mesa_texstore(ctx, 3, texImage->_BaseFormat, - texImage->TexFormat, - texImage->Data, - 0, 0, 0, /* dstX/Y/Zoffset */ - dstRowStride, - texImage->ImageOffsets, - width, height, depth, - format, type, pixels, packing); - if (!success) { - _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage3D"); - } + + sliceMaps = (GLubyte **) malloc(depth * sizeof(GLubyte *)); + dstImageOffsets = (GLuint *) malloc(depth * sizeof(GLuint)); + + /* Map dest texture buffer slices */ + for (slice = 0; slice < depth; slice++) { + ctx->Driver.MapTextureImage(ctx, texImage, slice, + 0, 0, width, height, + rwMode, + &sliceMaps[slice], &dstRowStride); + } + /* Compute image slice offsets */ + for (slice = 0; slice < depth; slice++) { + dstImageOffsets[slice] = (sliceMaps[slice] - sliceMaps[0]) / texelSize; + } + + success = _mesa_texstore(ctx, 3, texImage->_BaseFormat, + texImage->TexFormat, + sliceMaps[0], + 0, 0, 0, /* dstX/Y/Zoffset */ + dstRowStride, + dstImageOffsets, + width, height, depth, + format, type, pixels, packing); + + /* Unmap dest texture buffer slices */ + for (slice = 0; slice < depth; slice++) { + ctx->Driver.UnmapTextureImage(ctx, texImage, slice); } + if (!success) + _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage3D"); + _mesa_unmap_teximage_pbo(ctx, packing); + + free(sliceMaps); + free(dstImageOffsets); } @@ -4746,26 +4764,37 @@ _mesa_store_texsubimage1d(struct gl_context *ctx, GLenum target, GLint level, struct gl_texture_object *texObj, struct gl_texture_image *texImage) { + const GLbitfield rwMode = get_read_write_mode(format, texImage->TexFormat); + const GLuint zeroImageOffset = 0; + GLubyte *dstMap; + GLint dstRowStride; + GLboolean success; + /* get pointer to src pixels (may be in a pbo which we'll map here) */ pixels = _mesa_validate_pbo_teximage(ctx, 1, width, 1, 1, format, type, pixels, packing, "glTexSubImage1D"); if (!pixels) return; - { - const GLint dstRowStride = 0; - GLboolean success = _mesa_texstore(ctx, 1, texImage->_BaseFormat, - texImage->TexFormat, - texImage->Data, - xoffset, 0, 0, /* offsets */ - dstRowStride, - texImage->ImageOffsets, - width, 1, 1, - format, type, pixels, packing); - if (!success) { - _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage1D"); - } - } + /* Map dest texture buffer (write to whole region) */ + ctx->Driver.MapTextureImage(ctx, texImage, 0, + xoffset, 0, width, 1, + rwMode, + &dstMap, &dstRowStride); + + success = _mesa_texstore(ctx, 1, texImage->_BaseFormat, + texImage->TexFormat, + dstMap, + 0, 0, 0, /* dstX/Y/Zoffset */ + dstRowStride, + &zeroImageOffset, + width, 1, 1, + format, type, pixels, packing); + + ctx->Driver.UnmapTextureImage(ctx, texImage, 0); + + if (!success) + _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage1D"); _mesa_unmap_teximage_pbo(ctx, packing); } @@ -4785,26 +4814,37 @@ _mesa_store_texsubimage2d(struct gl_context *ctx, GLenum target, GLint level, struct gl_texture_object *texObj, struct gl_texture_image *texImage) { + const GLbitfield rwMode = get_read_write_mode(format, texImage->TexFormat); + const GLuint zeroImageOffset = 0; + GLubyte *dstMap; + GLint dstRowStride; + GLboolean success; + /* get pointer to src pixels (may be in a pbo which we'll map here) */ pixels = _mesa_validate_pbo_teximage(ctx, 2, width, height, 1, format, type, pixels, packing, "glTexSubImage2D"); if (!pixels) return; - { - GLint dstRowStride = texture_row_stride(texImage); - GLboolean success = _mesa_texstore(ctx, 2, texImage->_BaseFormat, - texImage->TexFormat, - texImage->Data, - xoffset, yoffset, 0, - dstRowStride, - texImage->ImageOffsets, - width, height, 1, - format, type, pixels, packing); - if (!success) { - _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage2D"); - } - } + /* Map dest texture buffer (write to whole region) */ + ctx->Driver.MapTextureImage(ctx, texImage, 0, + xoffset, yoffset, width, height, + rwMode, + &dstMap, &dstRowStride); + + success = _mesa_texstore(ctx, 2, texImage->_BaseFormat, + texImage->TexFormat, + dstMap, + 0, 0, 0, /* dstX/Y/Zoffset */ + dstRowStride, + &zeroImageOffset, + width, height, 1, + format, type, pixels, packing); + + ctx->Driver.UnmapTextureImage(ctx, texImage, 0); + + if (!success) + _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage2D"); _mesa_unmap_teximage_pbo(ctx, packing); } @@ -4823,6 +4863,14 @@ _mesa_store_texsubimage3d(struct gl_context *ctx, GLenum target, GLint level, struct gl_texture_object *texObj, struct gl_texture_image *texImage) { + const GLbitfield rwMode = get_read_write_mode(format, texImage->TexFormat); + GLboolean success; + GLint slice; + GLubyte **sliceMaps; + GLuint *dstImageOffsets; + GLint dstRowStride; + GLuint texelSize = _mesa_get_format_bytes(texImage->TexFormat); + /* get pointer to src pixels (may be in a pbo which we'll map here) */ pixels = _mesa_validate_pbo_teximage(ctx, 3, width, height, depth, format, type, pixels, packing, @@ -4830,22 +4878,44 @@ _mesa_store_texsubimage3d(struct gl_context *ctx, GLenum target, GLint level, if (!pixels) return; - { - GLint dstRowStride = texture_row_stride(texImage); - GLboolean success = _mesa_texstore(ctx, 3, texImage->_BaseFormat, - texImage->TexFormat, - texImage->Data, - xoffset, yoffset, zoffset, - dstRowStride, - texImage->ImageOffsets, - width, height, depth, - format, type, pixels, packing); - if (!success) { - _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage3D"); - } + sliceMaps = (GLubyte **) malloc((zoffset + depth) * sizeof(GLubyte *)); + dstImageOffsets = (GLuint *) malloc((zoffset + depth) * sizeof(GLuint)); + + /* Map dest texture buffer slices */ + for (slice = 0; slice < depth; slice++) { + ctx->Driver.MapTextureImage(ctx, texImage, zoffset + slice, + xoffset, yoffset, width, height, + rwMode, + &sliceMaps[zoffset + slice], &dstRowStride); + } + + /* Compute image slice offsets */ + for (slice = 0; slice < depth; slice++) { + dstImageOffsets[slice] = + (sliceMaps[zoffset + slice] - sliceMaps[zoffset]) / texelSize; } + success = _mesa_texstore(ctx, 3, texImage->_BaseFormat, + texImage->TexFormat, + sliceMaps[zoffset], + 0, 0, 0, /* dstX/Y/Zoffset */ + dstRowStride, + dstImageOffsets, + width, height, depth, + format, type, pixels, packing); + + /* Unmap dest texture buffer slices */ + for (slice = 0; slice < depth; slice++) { + ctx->Driver.UnmapTextureImage(ctx, texImage, zoffset + slice); + } + + if (!success) + _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexSubImage3D"); + _mesa_unmap_teximage_pbo(ctx, packing); + + free(sliceMaps); + free(dstImageOffsets); } @@ -4885,7 +4955,8 @@ _mesa_store_compressed_teximage2d(struct gl_context *ctx, struct gl_texture_object *texObj, struct gl_texture_image *texImage) { - (void) width; (void) height; (void) border; + GLubyte *dstMap; + GLint dstRowStride; /* This is pretty simple, basically just do a memcpy without worrying * about the usual image unpacking or image transfer operations. @@ -4910,8 +4981,17 @@ _mesa_store_compressed_teximage2d(struct gl_context *ctx, if (!data) return; + + /* Map dest texture buffer (write to whole region) */ + ctx->Driver.MapTextureImage(ctx, texImage, 0, + 0, 0, width, height, + GL_MAP_WRITE_BIT, + &dstMap, &dstRowStride); + /* copy the data */ - memcpy(texImage->Data, data, imageSize); + memcpy(dstMap, data, imageSize); + + ctx->Driver.UnmapTextureImage(ctx, texImage, 0); _mesa_unmap_teximage_pbo(ctx, &ctx->Unpack); } @@ -4980,19 +5060,15 @@ _mesa_store_compressed_texsubimage2d(struct gl_context *ctx, GLenum target, struct gl_texture_object *texObj, struct gl_texture_image *texImage) { - GLint bytesPerRow, destRowStride, srcRowStride; + GLint bytesPerRow, dstRowStride, srcRowStride; GLint i, rows; - GLubyte *dest; + GLubyte *dstMap; const GLubyte *src; const gl_format texFormat = texImage->TexFormat; - const GLint destWidth = texImage->Width; GLuint bw, bh; _mesa_get_format_block_size(texFormat, &bw, &bh); - (void) level; - (void) format; - /* these should have been caught sooner */ ASSERT((width % bw) == 0 || width == 2 || width == 1); ASSERT((height % bh) == 0 || height == 2 || height == 1); @@ -5009,21 +5085,24 @@ _mesa_store_compressed_texsubimage2d(struct gl_context *ctx, GLenum target, srcRowStride = _mesa_format_row_stride(texFormat, width); src = (const GLubyte *) data; - destRowStride = _mesa_format_row_stride(texFormat, destWidth); - dest = _mesa_compressed_image_address(xoffset, yoffset, 0, - texFormat, destWidth, - (GLubyte *) texImage->Data); + /* Map dest texture buffer (write to whole region) */ + ctx->Driver.MapTextureImage(ctx, texImage, 0, + xoffset, yoffset, width, height, + GL_MAP_WRITE_BIT, + &dstMap, &dstRowStride); bytesPerRow = srcRowStride; /* bytes per row of blocks */ rows = height / bh; /* rows in blocks */ /* copy rows of blocks */ for (i = 0; i < rows; i++) { - memcpy(dest, src, bytesPerRow); - dest += destRowStride; + memcpy(dstMap, src, bytesPerRow); + dstMap += dstRowStride; src += srcRowStride; } + ctx->Driver.UnmapTextureImage(ctx, texImage, 0); + _mesa_unmap_teximage_pbo(ctx, &ctx->Unpack); } |