From 5a43a5031925d65b99bb93cc9089f3d8cf347e78 Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Wed, 24 May 2023 10:54:08 -0700 Subject: [PATCH] dzn: Don't expose copy queues Vulkan says you can do things like image resolves or blits on transfer queues, but D3D only allows literal copies. We could try to emulate a Vulkan transfer-only queue backed by multiple D3D queues, where we use the copy queue when possible but fall back to compute when needed, but let's wait until there's a good reason to do that... Part-of: --- src/microsoft/vulkan/dzn_device.c | 12 ------------ src/microsoft/vulkan/dzn_private.h | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/microsoft/vulkan/dzn_device.c b/src/microsoft/vulkan/dzn_device.c index 4fabddacd79..16d946718b7 100644 --- a/src/microsoft/vulkan/dzn_device.c +++ b/src/microsoft/vulkan/dzn_device.c @@ -530,18 +530,6 @@ dzn_physical_device_cache_caps(struct dzn_physical_device *pdev) }, }; - pdev->queue_families[pdev->queue_family_count++] = (struct dzn_queue_family) { - .props = { - .queueFlags = VK_QUEUE_TRANSFER_BIT, - .queueCount = 1, - .timestampValidBits = 0, - .minImageTransferGranularity = { 0, 0, 0 }, - }, - .desc = { - .Type = D3D12_COMMAND_LIST_TYPE_COPY, - }, - }; - assert(pdev->queue_family_count <= ARRAY_SIZE(pdev->queue_families)); D3D12_COMMAND_QUEUE_DESC queue_desc = { diff --git a/src/microsoft/vulkan/dzn_private.h b/src/microsoft/vulkan/dzn_private.h index 3e4777bf101..328d4fbfeb1 100644 --- a/src/microsoft/vulkan/dzn_private.h +++ b/src/microsoft/vulkan/dzn_private.h @@ -176,7 +176,7 @@ dzn_meta_blits_get_context(struct dzn_device *device, const struct dzn_meta_blit_key *key); #define MAX_SYNC_TYPES 3 -#define MAX_QUEUE_FAMILIES 3 +#define MAX_QUEUE_FAMILIES 2 struct dzn_physical_device { struct vk_physical_device vk;