OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: use pipeline->slab_bo in more places

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16687>
This commit is contained in:
Samuel Pitoiset
2022-05-24 10:31:00 +02:00
committed by Marge Bot
parent 0393cba27b
commit 6f854ac2f2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/amd/vulkan/radv_cmd_buffer.c
View File

@@ -5150,7 +5150,7 @@ radv_emit_compute_pipeline(struct radv_cmd_buffer *cmd_buffer,
cmd_buffer->compute_scratch_waves_wanted = cmd_buffer->compute_scratch_waves_wanted =
MAX2(cmd_buffer->compute_scratch_waves_wanted, pipeline->base.max_waves); 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)) if (unlikely(cmd_buffer->device->trace_bo))
radv_save_pipeline(cmd_buffer, &pipeline->base); radv_save_pipeline(cmd_buffer, &pipeline->base);

2
src/amd/vulkan/radv_pipeline.c
View File

@@ -3988,7 +3988,7 @@ radv_upload_shaders(struct radv_device *device, struct radv_pipeline *pipeline,
pipeline->slab_bo = pipeline->slab->alloc->arena->bo; pipeline->slab_bo = pipeline->slab->alloc->arena->bo;
/* Upload shader binaries. */ /* 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; uint32_t slab_offset = pipeline->slab->alloc->offset;
char *slab_ptr = pipeline->slab->alloc->arena->ptr; char *slab_ptr = pipeline->slab->alloc->arena->ptr;