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

etnaviv: use correct blit box sizes when copying resource

Browse Source 
The padded width/height is stored in samples, while the blit box
dimensions need to be specified in pixels. Use the unpadded
width/height of the resource levels to generate the blit box
dimensions used to copy a resource. The blit code already extends
those sizes to the padded sizes when necessary and possible.
Fixes crashes in some piglit tests with MSAA active.

CC: mesa-stable
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Christian Gmeiner <cgmeiner@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25751>
This commit is contained in:
Lucas Stach
2023-10-16 15:31:12 +02:00
committed by Marge Bot
parent 5612f9a704
commit b4c24d5978
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/etnaviv/etnaviv_clear_blit.c
View File

@@ -228,9 +228,9 @@ etna_copy_resource(struct pipe_context *pctx, struct pipe_resource *dst,
blit.src.level = blit.dst.level = level;
blit.src.box.width = blit.dst.box.width =
MIN2(src_priv->levels[level].padded_width, dst_priv->levels[level].padded_width);
MIN2(src_priv->levels[level].width, dst_priv->levels[level].width);
blit.src.box.height = blit.dst.box.height =
MIN2(src_priv->levels[level].padded_height, dst_priv->levels[level].padded_height);
MIN2(src_priv->levels[level].height, dst_priv->levels[level].height);
unsigned depth = MIN2(src_priv->levels[level].depth, dst_priv->levels[level].depth);
if (dst->array_size > 1) {
assert(depth == 1); /* no array of 3d texture */