mirrors
/
vkd3d-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vkd3d: Move vkd3d_queue_family into header. 

And get rid of the somewhat redundant VKD3D_QUEUE_MAX_FAMILY_COUNT.

Signed-off-by: Philip Rebohle <philip.rebohle@tu-dortmund.de>
This commit is contained in:
Philip Rebohle 2020-05-06 12:51:06 +02:00 committed by Hans-Kristian Arntzen
parent d386a473c2
commit 8edfa29542
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/vkd3d/device.c
View File

@ -1549,15 +1549,6 @@ static HRESULT vkd3d_select_physical_device(struct vkd3d_instance *instance,
}
/* Vulkan queues */
enum vkd3d_queue_family
{
VKD3D_QUEUE_FAMILY_GRAPHICS,
VKD3D_QUEUE_FAMILY_COMPUTE,
VKD3D_QUEUE_FAMILY_TRANSFER,
VKD3D_QUEUE_FAMILY_COUNT,
};
struct vkd3d_device_queue_info
{
unsigned int family_index[VKD3D_QUEUE_FAMILY_COUNT];

12
libs/vkd3d/vkd3d_private.h
View File

@ -53,7 +53,6 @@
#define VKD3D_DESCRIPTOR_MAGIC_RTV MAKE_MAGIC('R', 'T', 'V', 0)
#define VKD3D_MAX_COMPATIBLE_FORMAT_COUNT 6u
#define VKD3D_MAX_QUEUE_FAMILY_COUNT 3u
#define VKD3D_MAX_SHADER_EXTENSIONS 1u
#define VKD3D_MAX_SHADER_STAGES 5u
#define VKD3D_MAX_VK_SYNC_OBJECTS 4u
@ -1545,6 +1544,15 @@ struct d3d12_caps
D3D_SHADER_MODEL max_shader_model;
};
enum vkd3d_queue_family
{
VKD3D_QUEUE_FAMILY_GRAPHICS,
VKD3D_QUEUE_FAMILY_COMPUTE,
VKD3D_QUEUE_FAMILY_TRANSFER,
VKD3D_QUEUE_FAMILY_COUNT
};
/* ID3D12Device */
typedef ID3D12Device6 d3d12_device_iface;
@ -1575,7 +1583,7 @@ struct d3d12_device
struct vkd3d_queue *direct_queue;
struct vkd3d_queue *compute_queue;
struct vkd3d_queue *copy_queue;
uint32_t queue_family_indices[VKD3D_MAX_QUEUE_FAMILY_COUNT];
uint32_t queue_family_indices[VKD3D_QUEUE_FAMILY_COUNT];
unsigned int queue_family_count;
struct vkd3d_instance *vkd3d_instance;