fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 15:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/mesa: generalize code for the compressed texture map/unmap fallback

Browse source 
in order to support ASTC

Tested-by: Mike Lothian <mike@fireburn.co.uk>
Tested-By: Gert Wollny<gert.wollny@collabora.com>
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
Reviewed-By: Gert Wollny <gw.fossdev@gmail.com>
This commit is contained in:
Marek Olšák 2018-02-13 16:39:11 +01:00
parent 3d7e4311bf
commit c3fafa127a
2 changed files with 31 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -207,9 +207,9 @@ st_FreeTextureImageBuffer(struct gl_context *ctx,
stImage->transfer = NULL; stImage->transfer = NULL;
stImage->num_transfers = 0; stImage->num_transfers = 0;
if (stImage->etc_data) { if (stImage->compressed_data) {
free(stImage->etc_data); free(stImage->compressed_data);
stImage->etc_data = NULL; stImage->compressed_data = NULL;
} }
/* if the texture image is being deallocated, the structure of the /* if the texture image is being deallocated, the structure of the
@ -231,22 +231,23 @@ st_compressed_format_fallback(struct st_context *st, mesa_format format)
} }
static void static void
etc_fallback_allocate(struct st_context *st, struct st_texture_image *stImage) compressed_tex_fallback_allocate(struct st_context *st,
struct st_texture_image *stImage)
{ {
struct gl_texture_image *texImage = &stImage->base; struct gl_texture_image *texImage = &stImage->base;
if (!st_compressed_format_fallback(st, texImage->TexFormat)) if (!st_compressed_format_fallback(st, texImage->TexFormat))
return; return;
if (stImage->etc_data) if (stImage->compressed_data)
free(stImage->etc_data); free(stImage->compressed_data);
unsigned data_size = _mesa_format_image_size(texImage->TexFormat, unsigned data_size = _mesa_format_image_size(texImage->TexFormat,
texImage->Width2, texImage->Width2,
texImage->Height2, texImage->Height2,
texImage->Depth2); texImage->Depth2);
stImage->etc_data = stImage->compressed_data =
malloc(data_size * _mesa_num_tex_faces(texImage->TexObject->Target)); malloc(data_size * _mesa_num_tex_faces(texImage->TexObject->Target));
} }
@ -275,22 +276,28 @@ st_MapTextureImage(struct gl_context *ctx,
&transfer); &transfer);
if (map) { if (map) {
if (st_compressed_format_fallback(st, texImage->TexFormat)) { if (st_compressed_format_fallback(st, texImage->TexFormat)) {
/* ETC isn't supported by all gallium drivers, where it's represented /* Some compressed formats don't have to be supported by drivers,
* by uncompressed formats. We store the compressed data (as it's * and st/mesa transparently handles decompression on upload (Unmap),
* needed for image copies in OES_copy_image), and decompress as * so that drivers don't see the compressed formats.
* necessary in Unmap.
* *
* Note: all ETC1/ETC2 formats have 4x4 block sizes. * We store the compressed data (it's needed for glGetCompressedTex-
* Image and image copies in OES_copy_image).
*/ */
unsigned z = transfer->box.z; unsigned z = transfer->box.z;
struct st_texture_image_transfer *itransfer = &stImage->transfer[z]; struct st_texture_image_transfer *itransfer = &stImage->transfer[z];
unsigned bytes = _mesa_get_format_bytes(texImage->TexFormat); unsigned blk_w, blk_h;
_mesa_get_format_block_size(texImage->TexFormat, &blk_w, &blk_h);
unsigned y_blocks = DIV_ROUND_UP(texImage->Height2, blk_h);
unsigned stride = *rowStrideOut = itransfer->temp_stride = unsigned stride = *rowStrideOut = itransfer->temp_stride =
_mesa_format_row_stride(texImage->TexFormat, texImage->Width2); _mesa_format_row_stride(texImage->TexFormat, texImage->Width2);
unsigned block_size = _mesa_get_format_bytes(texImage->TexFormat);
*mapOut = itransfer->temp_data = *mapOut = itransfer->temp_data =
stImage->etc_data + ((x / 4) * bytes + (y / 4) * stride) + stImage->compressed_data +
z * stride * texImage->Height2 / 4; (z * y_blocks + (y / blk_h)) * stride +
(x / blk_w) * block_size;
itransfer->map = map; itransfer->map = map;
} }
else { else {
@ -631,7 +638,7 @@ st_AllocTextureImageBuffer(struct gl_context *ctx,
stObj->needs_validation = true; stObj->needs_validation = true;
etc_fallback_allocate(st, stImage); compressed_tex_fallback_allocate(st, stImage);
/* Look if the parent texture object has space for this image */ /* Look if the parent texture object has space for this image */
if (stObj->pt && if (stObj->pt &&
@ -2840,7 +2847,7 @@ st_texture_storage(struct gl_context *ctx,
st_texture_image(texObj->Image[face][level]); st_texture_image(texObj->Image[face][level]);
pipe_resource_reference(&stImage->pt, stObj->pt); pipe_resource_reference(&stImage->pt, stObj->pt);
etc_fallback_allocate(st, stImage); compressed_tex_fallback_allocate(st, stImage);
} }
} }

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

@ -42,9 +42,9 @@ struct pipe_resource;
struct st_texture_image_transfer { struct st_texture_image_transfer {
struct pipe_transfer *transfer; struct pipe_transfer *transfer;
/* For ETC fallback. */ /* For compressed texture fallback. */
GLubyte *temp_data; /**< Temporary ETC texture storage. */ GLubyte *temp_data; /**< Temporary compressed texture storage. */
unsigned temp_stride; /**< Stride of the ETC texture storage. */ unsigned temp_stride; /**< Stride of the compressed texture storage. */
GLubyte *map; /**< Saved map pointer of the uncompressed transfer. */ GLubyte *map; /**< Saved map pointer of the uncompressed transfer. */
}; };
@ -90,10 +90,11 @@ struct st_texture_image
struct st_texture_image_transfer *transfer; struct st_texture_image_transfer *transfer;
unsigned num_transfers; unsigned num_transfers;
/* For ETC images, keep track of the original data. This is necessary for /* For compressed images unsupported by the driver. Keep track of
* mapping/unmapping, as well as image copies. * the original data. This is necessary for mapping/unmapping,
* as well as image copies.
*/ */
GLubyte *etc_data; GLubyte *compressed_data;
}; };