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

lavapipe: stop crashes with 3D z blits

Browse source 
This code just didn't handle 3D Z blits properly, rewrite
to handle change in direction here.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7416>
This commit is contained in:
Dave Airlie 2020-11-02 11:33:36 +10:00 • committed by Marge Bot
parent c871ac04a1
commit 1e3fbee4b0
1 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/gallium/frontends/lavapipe/lvp_execute.c
View file

@ -1732,18 +1732,22 @@ static void handle_blit_image(struct lvp_cmd_buffer_entry *cmd,
info.mask = util_format_is_depth_or_stencil(info.src.format) ? PIPE_MASK_ZS : PIPE_MASK_RGBA;
info.filter = blitcmd->filter == VK_FILTER_NEAREST ? PIPE_TEX_FILTER_NEAREST : PIPE_TEX_FILTER_LINEAR;
for (i = 0; i < blitcmd->region_count; i++) {
int srcX0, srcX1, srcY0, srcY1;
unsigned dstX0, dstX1, dstY0, dstY1;
int srcX0, srcX1, srcY0, srcY1, srcZ0, srcZ1;
unsigned dstX0, dstX1, dstY0, dstY1, dstZ0, dstZ1;
srcX0 = blitcmd->regions[i].srcOffsets[0].x;
srcX1 = blitcmd->regions[i].srcOffsets[1].x;
srcY0 = blitcmd->regions[i].srcOffsets[0].y;
srcY1 = blitcmd->regions[i].srcOffsets[1].y;
srcZ0 = blitcmd->regions[i].srcOffsets[0].z;
srcZ1 = blitcmd->regions[i].srcOffsets[1].z;
dstX0 = blitcmd->regions[i].dstOffsets[0].x;
dstX1 = blitcmd->regions[i].dstOffsets[1].x;
dstY0 = blitcmd->regions[i].dstOffsets[0].y;
dstY1 = blitcmd->regions[i].dstOffsets[1].y;
dstZ0 = blitcmd->regions[i].dstOffsets[0].z;
dstZ1 = blitcmd->regions[i].dstOffsets[1].z;
if (dstX0 < dstX1) {
info.dst.box.x = dstX0;
@ -1768,19 +1772,28 @@ static void handle_blit_image(struct lvp_cmd_buffer_entry *cmd,
info.dst.box.height = dstY0 - dstY1;
info.src.box.height = srcY0 - srcY1;
}
info.src.level = blitcmd->regions[i].srcSubresource.mipLevel;
info.src.box.z = blitcmd->regions[i].srcOffsets[0].z + blitcmd->regions[i].srcSubresource.baseArrayLayer;
if (blitcmd->src->bo->target == PIPE_TEXTURE_3D)
info.src.box.depth = blitcmd->regions[i].srcOffsets[1].z - blitcmd->regions[i].srcOffsets[0].z;
else
info.src.box.depth = blitcmd->regions[i].srcSubresource.layerCount;
info.dst.level = blitcmd->regions[i].dstSubresource.mipLevel;
info.dst.box.z = blitcmd->regions[i].dstOffsets[0].z + blitcmd->regions[i].dstSubresource.baseArrayLayer;
if (blitcmd->dst->bo->target == PIPE_TEXTURE_3D)
info.dst.box.depth = blitcmd->regions[i].dstOffsets[1].z - blitcmd->regions[i].dstOffsets[0].z;
else
if (blitcmd->src->bo->target == PIPE_TEXTURE_3D) {
if (dstZ0 < dstZ1) {
info.dst.box.z = dstZ0;
info.src.box.z = srcZ0;
info.dst.box.depth = dstZ1 - dstZ0;
info.src.box.depth = srcZ1 - srcZ0;
} else {
info.dst.box.z = dstZ1;
info.src.box.z = srcZ1;
info.dst.box.depth = dstZ0 - dstZ1;
info.src.box.depth = srcZ0 - srcZ1;
}
} else {
info.src.box.z = blitcmd->regions[i].srcSubresource.baseArrayLayer;
info.dst.box.z = blitcmd->regions[i].dstSubresource.baseArrayLayer;
info.src.box.depth = blitcmd->regions[i].srcSubresource.layerCount;
info.dst.box.depth = blitcmd->regions[i].dstSubresource.layerCount;
}
info.src.level = blitcmd->regions[i].srcSubresource.mipLevel;
info.dst.level = blitcmd->regions[i].dstSubresource.mipLevel;
state->pctx->blit(state->pctx, &info);
}
}