mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

nvk: Pass the queue to draw/dispatch_state_init() 

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29591>
This commit is contained in:
Faith Ekstrand 2024-05-14 17:51:33 -05:00 committed by Marge Bot
parent b2d85ca36f
commit f716bab6b7
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nouveau/vulkan/nvk_cmd_dispatch.c
View File

@ -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);

3
src/nouveau/vulkan/nvk_cmd_draw.c
View File

@ -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 */

4
src/nouveau/vulkan/nvk_queue.c
View File

@ -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;
}

4
src/nouveau/vulkan/nvk_queue.h
View File

@ -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 */