diff options
| author | Ryan Neph <ryanneph@google.com> | 2022-08-18 12:40:49 -0700 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-12-16 01:59:39 +0000 |
| commit | 42b0c01248707a565477cdc823580f5d8a870a99 (patch) | |
| tree | 53d4218c9484f54e2dee67e3c44b23d3f1fe5f7c | |
| parent | a5346dec8e848ca5de0e1a8d4bc03fcf988924d3 (diff) | |
| download | virglrenderer-42b0c01248707a565477cdc823580f5d8a870a99.tar.gz | |
vkr: replace uint64_t queue_id with uint32_t ring_idx
Align with the virglrenderer external API that prefers 32-bit unsigned
ring_idx.
Signed-off-by: Ryan Neph <ryanneph@google.com>
Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/982>
| -rw-r--r-- | src/venus/vkr_context.c | 6 | ||||
| -rw-r--r-- | src/venus/vkr_queue.c | 8 | ||||
| -rw-r--r-- | src/venus/vkr_queue.h | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/venus/vkr_context.c b/src/venus/vkr_context.c index 893c42b5..9f0cbaf5 100644 --- a/src/venus/vkr_context.c +++ b/src/venus/vkr_context.c @@ -191,8 +191,8 @@ vkr_context_retire_fences_locked(struct virgl_context *base) /* retire syncs from destroyed devices */ LIST_FOR_EACH_ENTRY_SAFE (sync, sync_tmp, &ctx->signaled_syncs, head) { - /* queue_id might have already get reused but is opaque to the clients */ - ctx->base.fence_retire(&ctx->base, sync->queue_id, sync->fence_id); + /* ring_idx might have already get reused but is opaque to the clients */ + ctx->base.fence_retire(&ctx->base, sync->ring_idx, sync->fence_id); free(sync); } list_inithead(&ctx->signaled_syncs); @@ -211,7 +211,7 @@ vkr_context_retire_fences_locked(struct virgl_context *base) vkr_queue_get_signaled_syncs(queue, &retired_syncs, &queue_empty); LIST_FOR_EACH_ENTRY_SAFE (sync, sync_tmp, &retired_syncs, head) { - ctx->base.fence_retire(&ctx->base, sync->queue_id, sync->fence_id); + ctx->base.fence_retire(&ctx->base, sync->ring_idx, sync->fence_id); vkr_device_free_queue_sync(dev, sync); } diff --git a/src/venus/vkr_queue.c b/src/venus/vkr_queue.c index 05c976dd..9d6255fe 100644 --- a/src/venus/vkr_queue.c +++ b/src/venus/vkr_queue.c @@ -13,7 +13,7 @@ struct vkr_queue_sync * vkr_device_alloc_queue_sync(struct vkr_device *dev, uint32_t fence_flags, - uint64_t queue_id, + uint32_t ring_idx, uint64_t fence_id) { struct vn_device_proc_table *vk = &dev->proc_table; @@ -56,7 +56,7 @@ vkr_device_alloc_queue_sync(struct vkr_device *dev, sync->device_lost = false; sync->flags = fence_flags; - sync->queue_id = queue_id; + sync->ring_idx = ring_idx; sync->fence_id = fence_id; return sync; @@ -131,7 +131,7 @@ vkr_queue_sync_retire(struct vkr_context *ctx, struct vn_device_proc_table *vk = &dev->proc_table; if (vkr_renderer_flags & VKR_RENDERER_ASYNC_FENCE_CB) { - ctx->base.fence_retire(&ctx->base, sync->queue_id, sync->fence_id); + ctx->base.fence_retire(&ctx->base, sync->ring_idx, sync->fence_id); vkr_device_free_queue_sync(dev, sync); } else { vk->DestroyFence(dev->base.handle.device, sync->fence, NULL); @@ -225,7 +225,7 @@ vkr_queue_thread(void *arg) list_del(&sync->head); if (vkr_renderer_flags & VKR_RENDERER_ASYNC_FENCE_CB) { - ctx->base.fence_retire(&ctx->base, sync->queue_id, sync->fence_id); + ctx->base.fence_retire(&ctx->base, sync->ring_idx, sync->fence_id); vkr_device_free_queue_sync(queue->device, sync); } else { list_addtail(&sync->head, &queue->signaled_syncs); diff --git a/src/venus/vkr_queue.h b/src/venus/vkr_queue.h index 2350be27..ac90934b 100644 --- a/src/venus/vkr_queue.h +++ b/src/venus/vkr_queue.h @@ -13,7 +13,7 @@ struct vkr_queue_sync { bool device_lost; uint32_t flags; - uint64_t queue_id; + uint32_t ring_idx; uint64_t fence_id; struct list_head head; @@ -87,7 +87,7 @@ vkr_context_init_event_dispatch(struct vkr_context *ctx); struct vkr_queue_sync * vkr_device_alloc_queue_sync(struct vkr_device *dev, uint32_t fence_flags, - uint64_t queue_id, + uint32_t ring_idx, uint64_t fence_id); void |