Mesa (main): zink: pass sparse backing page offset to binding function

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 6317f88b044501354a052064478d5b43dfe41809
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6317f88b044501354a052064478d5b43dfe41809

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Thu Apr 21 10:36:56 2022 -0400

zink: pass sparse backing page offset to binding function

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 at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16100>

---

 src/gallium/drivers/zink/ci/zink-nv-fails.txt | 1 -
 src/gallium/drivers/zink/zink_bo.c            | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/zink/ci/zink-nv-fails.txt b/src/gallium/drivers/zink/ci/zink-nv-fails.txt
index 25fdabdaa06..24f9f0be051 100644
--- a/src/gallium/drivers/zink/ci/zink-nv-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-nv-fails.txt
@@ -3,7 +3,6 @@ GTF-GL46.gtf30.GL3Tests.framebuffer_blit.framebuffer_blit_functionality_scissor_
 GTF-GL46.gtf30.GL3Tests.framebuffer_blit.framebuffer_blit_functionality_stencil_blit,Fail
 KHR-GL46.copy_image.functional,Fail
 KHR-GL46.shader_image_load_store.non-layered_binding,Fail
-KHR-GL46.sparse_buffer_tests.BufferStorageTest,Crash
 KHR-GL46.sparse_texture2_tests.SparseTexture2Commitment,Fail
 KHR-GL46.sparse_texture2_tests.SparseTexture2Lookup,Fail
 KHR-GL46.sparse_texture2_tests.StandardPageSizesTestCase,Fail
diff --git a/src/gallium/drivers/zink/zink_bo.c b/src/gallium/drivers/zink/zink_bo.c
index 0131940cd3e..b2fd01dcba2 100644
--- a/src/gallium/drivers/zink/zink_bo.c
+++ b/src/gallium/drivers/zink/zink_bo.c
@@ -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;