fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-04 10:40:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

zink: pass sparse backing page offset to binding function

Browse source 
this is the offset of the memory block being bound

cc: mesa-stable

fixes:
KHR-GL46.sparse_buffer_tests.BufferStorageTest

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16100>
This commit is contained in:
Mike Blumenkrantz 2022-04-21 10:36:56 -04:00
parent 7b0d367735
commit a0771d809e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gallium/drivers/zink/zink_bo.c
View file

@ -695,7 +695,7 @@ zink_bo_unmap(struct zink_screen *screen, struct zink_bo *bo)
}
static bool
buffer_commit_single(struct zink_screen *screen, struct zink_resource *res, struct zink_bo *bo, uint32_t offset, uint32_t size, bool commit)
buffer_commit_single(struct zink_screen *screen, struct zink_resource *res, struct zink_bo *bo, uint32_t bo_offset, uint32_t offset, uint32_t size, bool commit)
{
VkBindSparseInfo sparse = {0};
sparse.sType = VK_STRUCTURE_TYPE_BIND_SPARSE_INFO;
@ -712,7 +712,7 @@ buffer_commit_single(struct zink_screen *screen, struct zink_resource *res, stru
mem_bind.resourceOffset = offset;
mem_bind.size = MIN2(res->base.b.width0 - offset, size);
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 * ZINK_SPARSE_BUFFER_PAGE_SIZE + (commit ? (bo->mem ? 0 : bo->offset) : 0);
mem_bind.flags = 0;
sparse_bind[0].pBinds = &mem_bind;
sparse_bind[1].pBinds = &mem_bind;
@ -764,7 +764,7 @@ buffer_bo_commit(struct zink_screen *screen, struct zink_resource *res, uint32_t
ok = false;
goto out;
}
if (!buffer_commit_single(screen, res, backing->bo,
if (!buffer_commit_single(screen, res, backing->bo, backing_start,
(uint64_t)span_va_page * ZINK_SPARSE_BUFFER_PAGE_SIZE,
(uint64_t)backing_size * ZINK_SPARSE_BUFFER_PAGE_SIZE, true)) {
@ -798,7 +798,7 @@ buffer_bo_commit(struct zink_screen *screen, struct zink_resource *res, uint32_t
continue;
}
if (!done && !buffer_commit_single(screen, res, NULL,
if (!done && !buffer_commit_single(screen, res, NULL, 0,
(uint64_t)base_page * ZINK_SPARSE_BUFFER_PAGE_SIZE,
(uint64_t)(end_va_page - base_page) * ZINK_SPARSE_BUFFER_PAGE_SIZE, false)) {
ok = false;