From 5c2c8652d16b56c0bb5c4e6ab368ca8215e5ca1f Mon Sep 17 00:00:00 2001 From: Nanley Chery Date: Mon, 22 Aug 2022 15:28:54 -0700 Subject: [PATCH] mesa/st: Drop st_texture_image_transfer::map MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's only used in the scope of a single function, st_UnmapTextureImage. Use a local variable instead. Acked-by: Marek Olšák Reviewed-by: Tapani Pälli Part-of: --- src/mesa/state_tracker/st_cb_texture.c | 13 +++++-------- src/mesa/state_tracker/st_texture.h | 1 - 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 584e33a9c0b..7705a315220 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -566,8 +566,6 @@ st_UnmapTextureImage(struct gl_context *ctx, assert(z == transfer->box.z); - itransfer->map = map; - if (util_format_is_compressed(texImage->pt->format)) { /* Transcode into a different compressed format. */ unsigned size = @@ -609,7 +607,7 @@ st_UnmapTextureImage(struct gl_context *ctx, pack.Alignment = 4; _mesa_texstore(ctx, 2, GL_RGBA, texImage->pt->format, - transfer->stride, &itransfer->map, + transfer->stride, &map, transfer->box.width, transfer->box.height, 1, GL_RGBA, GL_UNSIGNED_BYTE, tmp, &pack); @@ -617,7 +615,7 @@ st_UnmapTextureImage(struct gl_context *ctx, } else { /* Decompress into an uncompressed format. */ if (texImage->TexFormat == MESA_FORMAT_ETC1_RGB8) { - _mesa_etc1_unpack_rgba8888(itransfer->map, transfer->stride, + _mesa_etc1_unpack_rgba8888(map, transfer->stride, itransfer->temp_data, itransfer->temp_stride, transfer->box.width, @@ -625,20 +623,20 @@ st_UnmapTextureImage(struct gl_context *ctx, } else if (_mesa_is_format_etc2(texImage->TexFormat)) { bool bgra = texImage->pt->format == PIPE_FORMAT_B8G8R8A8_SRGB; - _mesa_unpack_etc2_format(itransfer->map, transfer->stride, + _mesa_unpack_etc2_format(map, transfer->stride, itransfer->temp_data, itransfer->temp_stride, transfer->box.width, transfer->box.height, texImage->TexFormat, bgra); } else if (_mesa_is_format_astc_2d(texImage->TexFormat)) { - _mesa_unpack_astc_2d_ldr(itransfer->map, transfer->stride, + _mesa_unpack_astc_2d_ldr(map, transfer->stride, itransfer->temp_data, itransfer->temp_stride, transfer->box.width, transfer->box.height, texImage->TexFormat); } else if (_mesa_is_format_bptc(texImage->TexFormat)) { - _mesa_unpack_bptc(itransfer->map, transfer->stride, + _mesa_unpack_bptc(map, transfer->stride, itransfer->temp_data, itransfer->temp_stride, transfer->box.width, transfer->box.height, @@ -654,7 +652,6 @@ st_UnmapTextureImage(struct gl_context *ctx, itransfer->temp_data = NULL; itransfer->temp_stride = 0; - itransfer->map = NULL; } else { st_texture_image_unmap(st, texImage, slice); } diff --git a/src/mesa/state_tracker/st_texture.h b/src/mesa/state_tracker/st_texture.h index c6ef7694da4..064200d07da 100644 --- a/src/mesa/state_tracker/st_texture.h +++ b/src/mesa/state_tracker/st_texture.h @@ -46,7 +46,6 @@ struct st_texture_image_transfer /* For compressed texture fallback. */ GLubyte *temp_data; /**< Temporary compressed texture storage. */ unsigned temp_stride; /**< Stride of the compressed texture storage. */ - GLubyte *map; /**< Saved map pointer of the uncompressed transfer. */ struct pipe_box box; /**< Region of the transfer's resource to write. */ };