KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lavapipe: fix array texture region copies 

these need to use different struct members for copying array textures

the buffer2image variants are already doing the right thing

Fixes: b38879f8c5 ("vallium: initial import of the vulkan frontend")

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9761>
This commit is contained in:
Mike Blumenkrantz 2021-03-22 15:45:37 -04:00 committed by Marge Bot
parent 2f8453cf56
commit dfe9bfef9b
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gallium/frontends/lavapipe/lvp_execute.c
View File

@ -1946,16 +1946,24 @@ static void handle_copy_image(struct lvp_cmd_buffer_entry *cmd,
struct pipe_box src_box;
src_box.x = copycmd->regions[i].srcOffset.x;
src_box.y = copycmd->regions[i].srcOffset.y;
src_box.z = copycmd->regions[i].srcOffset.z + copycmd->regions[i].srcSubresource.baseArrayLayer;
src_box.width = copycmd->regions[i].extent.width;
src_box.height = copycmd->regions[i].extent.height;
src_box.depth = copycmd->regions[i].extent.depth;
if (copycmd->src->bo->target == PIPE_TEXTURE_3D) {
src_box.depth = copycmd->regions[i].extent.depth;
src_box.z = copycmd->regions[i].srcOffset.z;
} else {
src_box.depth = copycmd->regions[i].srcSubresource.layerCount;
src_box.z = copycmd->regions[i].srcSubresource.baseArrayLayer;
}
unsigned dstz = copycmd->dst->bo->target == PIPE_TEXTURE_3D ?
copycmd->regions[i].dstOffset.z :
copycmd->regions[i].dstSubresource.baseArrayLayer;
state->pctx->resource_copy_region(state->pctx, copycmd->dst->bo,
copycmd->regions[i].dstSubresource.mipLevel,
copycmd->regions[i].dstOffset.x,
copycmd->regions[i].dstOffset.y,
copycmd->regions[i].dstOffset.z + copycmd->regions[i].dstSubresource.baseArrayLayer,
dstz,
copycmd->src->bo,
copycmd->regions[i].srcSubresource.mipLevel,
&src_box);