fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 18:18:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa/st: remove unused TexData

Browse source 
this isn't hooked up to anything at all from what I can see.

Seems like a left over from commit 5d67d4fbebb(st/mesa: remove
st_TexImage(), use core Mesa code instead).

Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2015-03-05 08:19:23 +10:00
parent fd17db6fe5
commit c5e69409d7
2 changed files with 0 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/mesa/state_tracker/st_cb_texture.c
View file

@ -178,9 +178,6 @@ st_FreeTextureImageBuffer(struct gl_context *ctx,
pipe_resource_reference(&stImage->pt, NULL);
}
_mesa_align_free(stImage->TexData);
stImage->TexData = NULL;
free(stImage->transfer);
stImage->transfer = NULL;
stImage->num_transfers = 0;
@ -501,7 +498,6 @@ st_AllocTextureImageBuffer(struct gl_context *ctx,
DBG("%s\n", __FUNCTION__);
assert(!stImage->TexData);
assert(!stImage->pt); /* xxx this might be wrong */
/* Look if the parent texture object has space for this image */
@ -1521,23 +1517,6 @@ copy_image_data_to_texture(struct st_context *st,
pipe_resource_reference(&stImage->pt, NULL);
}
else if (stImage->TexData) {
/* Copy from malloc'd memory */
/* XXX this should be re-examined/tested with a compressed format */
GLuint blockSize = util_format_get_blocksize(stObj->pt->format);
GLuint srcRowStride = stImage->base.Width * blockSize;
GLuint srcSliceStride = stImage->base.Height * srcRowStride;
st_texture_image_data(st,
stObj->pt,
stImage->base.Face,
dstLevel,
stImage->TexData,
srcRowStride,
srcSliceStride);
_mesa_align_free(stImage->TexData);
stImage->TexData = NULL;
}
pipe_resource_reference(&stImage->pt, stObj->pt);
}

6
src/mesa/state_tracker/st_texture.h
View file

@ -55,13 +55,7 @@ struct st_texture_image
{
struct gl_texture_image base;
/** Used to store texture data that doesn't fit in the parent
* object's mipmap buffer.
*/
GLubyte *TexData;
/* If stImage->pt != NULL, image data is stored here.
* Else if stImage->TexData != NULL, image is stored there.
* Else there is no image data.
*/
struct pipe_resource *pt;