From f716bab6b78a573d446c029c1d68118a6085edfa Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Tue, 14 May 2024 17:51:33 -0500 Subject: [PATCH] nvk: Pass the queue to draw/dispatch_state_init() Part-of: --- src/nouveau/vulkan/nvk_cmd_dispatch.c | 3 ++- src/nouveau/vulkan/nvk_cmd_draw.c | 3 ++- src/nouveau/vulkan/nvk_queue.c | 4 ++-- src/nouveau/vulkan/nvk_queue.h | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/nouveau/vulkan/nvk_cmd_dispatch.c b/src/nouveau/vulkan/nvk_cmd_dispatch.c index fe86f264af4d9..e133512db2dc3 100644 --- a/src/nouveau/vulkan/nvk_cmd_dispatch.c +++ b/src/nouveau/vulkan/nvk_cmd_dispatch.c @@ -27,8 +27,9 @@ #include "nv_push_clc6c0.h" VkResult -nvk_push_dispatch_state_init(struct nvk_device *dev, struct nv_push *p) +nvk_push_dispatch_state_init(struct nvk_queue *queue, struct nv_push *p) { + struct nvk_device *dev = nvk_queue_device(queue); struct nvk_physical_device *pdev = nvk_device_physical(dev); P_MTHD(p, NV90C0, SET_OBJECT); diff --git a/src/nouveau/vulkan/nvk_cmd_draw.c b/src/nouveau/vulkan/nvk_cmd_draw.c index 205f1069d3292..64ae1d1641933 100644 --- a/src/nouveau/vulkan/nvk_cmd_draw.c +++ b/src/nouveau/vulkan/nvk_cmd_draw.c @@ -89,8 +89,9 @@ nvk_mme_set_conservative_raster_state(struct mme_builder *b) } VkResult -nvk_push_draw_state_init(struct nvk_device *dev, struct nv_push *p) +nvk_push_draw_state_init(struct nvk_queue *queue, struct nv_push *p) { + struct nvk_device *dev = nvk_queue_device(queue); struct nvk_physical_device *pdev = nvk_device_physical(dev); /* 3D state */ diff --git a/src/nouveau/vulkan/nvk_queue.c b/src/nouveau/vulkan/nvk_queue.c index d85af210ea0e2..5be346d4db1fc 100644 --- a/src/nouveau/vulkan/nvk_queue.c +++ b/src/nouveau/vulkan/nvk_queue.c @@ -313,13 +313,13 @@ nvk_queue_init_context_state(struct nvk_queue *queue, } if (queue_flags & VK_QUEUE_GRAPHICS_BIT) { - result = nvk_push_draw_state_init(dev, p); + result = nvk_push_draw_state_init(queue, p); if (result != VK_SUCCESS) return result; } if (queue_flags & VK_QUEUE_COMPUTE_BIT) { - result = nvk_push_dispatch_state_init(dev, p); + result = nvk_push_dispatch_state_init(queue, p); if (result != VK_SUCCESS) return result; } diff --git a/src/nouveau/vulkan/nvk_queue.h b/src/nouveau/vulkan/nvk_queue.h index 5ec3d2c53a4e0..4c0fd2ec284f0 100644 --- a/src/nouveau/vulkan/nvk_queue.h +++ b/src/nouveau/vulkan/nvk_queue.h @@ -65,10 +65,10 @@ VkResult nvk_queue_init(struct nvk_device *dev, struct nvk_queue *queue, void nvk_queue_finish(struct nvk_device *dev, struct nvk_queue *queue); -VkResult nvk_push_draw_state_init(struct nvk_device *dev, +VkResult nvk_push_draw_state_init(struct nvk_queue *queue, struct nv_push *p); -VkResult nvk_push_dispatch_state_init(struct nvk_device *dev, +VkResult nvk_push_dispatch_state_init(struct nvk_queue *queue, struct nv_push *p); /* this always syncs, so only use when that doesn't matter */