Module: Mesa Branch: main Commit: 6c8b0b35a68c8e6d8e564751dc5d53022a4bab07 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6c8b0b35a68c8e6d8e564751dc5d53022a4bab07
Author: Jason Ekstrand <[email protected]> Date: Thu Sep 23 11:38:35 2021 -0500 lavapipe: Drop lvp_queue::flags It's now part of vk_queue Reviewed-By: Mike Blumenkrantz <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13003> --- src/gallium/frontends/lavapipe/lvp_device.c | 3 +-- src/gallium/frontends/lavapipe/lvp_private.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c index d2b12296db9..d78ca12e7e9 100644 --- a/src/gallium/frontends/lavapipe/lvp_device.c +++ b/src/gallium/frontends/lavapipe/lvp_device.c @@ -1368,7 +1368,6 @@ lvp_queue_init(struct lvp_device *device, struct lvp_queue *queue, queue->device = device; simple_mtx_init(&queue->last_lock, mtx_plain); - queue->flags = 0; queue->timeline = 0; queue->ctx = device->pscreen->context_create(device->pscreen, NULL, PIPE_CONTEXT_ROBUST_BUFFER_ACCESS); queue->cso = cso_create_context(queue->ctx, CSO_NO_VBUF); @@ -1513,7 +1512,7 @@ VKAPI_ATTR void VKAPI_CALL lvp_GetDeviceQueue2( struct lvp_queue *queue; queue = &device->queue; - if (pQueueInfo->flags != queue->flags) { + if (pQueueInfo->flags != queue->vk.flags) { /* From the Vulkan 1.1.70 spec: * * "The queue returned by vkGetDeviceQueue2 must have the same diff --git a/src/gallium/frontends/lavapipe/lvp_private.h b/src/gallium/frontends/lavapipe/lvp_private.h index c94def398df..711ae1c576f 100644 --- a/src/gallium/frontends/lavapipe/lvp_private.h +++ b/src/gallium/frontends/lavapipe/lvp_private.h @@ -167,7 +167,6 @@ bool lvp_physical_device_extension_supported(struct lvp_physical_device *dev, struct lvp_queue { struct vk_queue vk; - VkDeviceQueueCreateFlags flags; struct lvp_device * device; struct pipe_context *ctx; struct cso_context *cso;
