Mesa (main): radv: use pipeline->slab_bo in more places

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Tue May 24 10:31:00 2022 +0200

radv: use pipeline->slab_bo in more places

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16687>

---

 src/amd/vulkan/radv_cmd_buffer.c | 2 +-
 src/amd/vulkan/radv_pipeline.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index de171518b52..172d0e63150 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -5150,7 +5150,7 @@ radv_emit_compute_pipeline(struct radv_cmd_buffer *cmd_buffer,
    cmd_buffer->compute_scratch_waves_wanted =
       MAX2(cmd_buffer->compute_scratch_waves_wanted, pipeline->base.max_waves);
 
-   radv_cs_add_buffer(cmd_buffer->device->ws, cmd_buffer->cs, pipeline->base.slab->alloc->arena->bo);
+   radv_cs_add_buffer(cmd_buffer->device->ws, cmd_buffer->cs, pipeline->base.slab_bo);
 
    if (unlikely(cmd_buffer->device->trace_bo))
       radv_save_pipeline(cmd_buffer, &pipeline->base);
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 0fac2c2de76..301b4b25475 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -3988,7 +3988,7 @@ radv_upload_shaders(struct radv_device *device, struct radv_pipeline *pipeline,
    pipeline->slab_bo = pipeline->slab->alloc->arena->bo;
 
    /* Upload shader binaries. */
-   uint64_t slab_va = radv_buffer_get_va(pipeline->slab->alloc->arena->bo);
+   uint64_t slab_va = radv_buffer_get_va(pipeline->slab_bo);
    uint32_t slab_offset = pipeline->slab->alloc->offset;
    char *slab_ptr = pipeline->slab->alloc->arena->ptr;