Module: Mesa Branch: staging/22.1 Commit: a5ead7cb08937eb1d37f6514d93f0bcb53133bbb URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a5ead7cb08937eb1d37f6514d93f0bcb53133bbb
Author: Mike Blumenkrantz <[email protected]> Date: Thu Apr 21 11:45:15 2022 -0400 zink: pass sparse bind bo offset through for texture binds should fix partial binding with textures cc: mesa-stable Reviewed-by: Dave Airlie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16100> --- src/gallium/drivers/zink/zink_bo.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/zink/zink_bo.c b/src/gallium/drivers/zink/zink_bo.c index b2fd01dcba2..4b1260f637f 100644 --- a/src/gallium/drivers/zink/zink_bo.c +++ b/src/gallium/drivers/zink/zink_bo.c @@ -853,7 +853,7 @@ texture_commit_single(struct zink_screen *screen, struct zink_resource *res, VkS } static bool -texture_commit_miptail(struct zink_screen *screen, struct zink_resource *res, struct zink_bo *bo, uint32_t offset, bool commit) +texture_commit_miptail(struct zink_screen *screen, struct zink_resource *res, struct zink_bo *bo, uint32_t bo_offset, uint32_t offset, bool commit) { VkBindSparseInfo sparse = {0}; sparse.sType = VK_STRUCTURE_TYPE_BIND_SPARSE_INFO; @@ -868,7 +868,7 @@ texture_commit_miptail(struct zink_screen *screen, struct zink_resource *res, st mem_bind.resourceOffset = offset; mem_bind.size = MIN2(ZINK_SPARSE_BUFFER_PAGE_SIZE, res->sparse.imageMipTailSize - offset); mem_bind.memory = commit ? (bo->mem ? bo->mem : bo->u.slab.real->mem) : VK_NULL_HANDLE; - mem_bind.memoryOffset = commit ? (bo->mem ? 0 : bo->offset) : 0; + mem_bind.memoryOffset = bo_offset + (commit ? (bo->mem ? 0 : bo->offset) : 0); mem_bind.flags = 0; sparse_bind.pBinds = &mem_bind; @@ -974,12 +974,13 @@ zink_bo_commit(struct zink_screen *screen, struct zink_resource *res, unsigned l } if (level >= res->sparse.imageMipTailFirstLod) { uint32_t offset = res->sparse.imageMipTailOffset + d * res->sparse.imageMipTailStride; - ok = texture_commit_miptail(screen, res, backing[i]->bo, offset, commit); + ok = texture_commit_miptail(screen, res, backing[i]->bo, backing_start[i], offset, commit); if (!ok) goto out; } else { ibind[i].memory = backing[i]->bo->mem ? backing[i]->bo->mem : backing[i]->bo->u.slab.real->mem; - ibind[i].memoryOffset = backing[i]->bo->mem ? 0 : backing[i]->bo->offset; + ibind[i].memoryOffset = backing_start[i] * ZINK_SPARSE_BUFFER_PAGE_SIZE + + (backing[i]->bo->mem ? 0 : backing[i]->bo->offset); commits_pending = true; } @@ -1021,7 +1022,7 @@ zink_bo_commit(struct zink_screen *screen, struct zink_resource *res, unsigned l } if (level >= res->sparse.imageMipTailFirstLod) { uint32_t offset = res->sparse.imageMipTailOffset + d * res->sparse.imageMipTailStride; - ok = texture_commit_miptail(screen, res, NULL, offset, commit); + ok = texture_commit_miptail(screen, res, NULL, 0, offset, commit); if (!ok) goto out; } else {
