October 2018 - Wine-commits

Józef Kucia : tests: Add test for instance data step rate.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: vkd3d Branch: master Commit: 0cab9e8c9fcdf9849920ccfc2c37bd8fb16ea615 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0cab9e8c9fcdf9849920ccf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 25 11:24:08 2018 +0200 tests: Add test for instance data step rate. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 196 +++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 119 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=0cab9e8c9fcdf984992…

1 0

Józef Kucia : vkd3d: Set the numer of samples for graphics pipelines.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: vkd3d Branch: master Commit: 5d2881716465450c258d18a99f80553ccccdce9b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5d2881716465450c258d18a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 25 11:23:59 2018 +0200 vkd3d: Set the numer of samples for graphics pipelines. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 2 +- libs/vkd3d/state.c | 14 ++++++++------ libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 68c189a..55abd50 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -334,7 +334,7 @@ static VkImageType vk_image_type_from_d3d12_resource_dimension(D3D12_RESOURCE_DI } } -static VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *desc) +VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *desc) { switch (desc->Count) { diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index f6ccb24..0deea28 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1874,6 +1874,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s struct vkd3d_shader_signature input_signature; struct VkSubpassDescription sub_pass_desc; struct VkRenderPassCreateInfo pass_desc; + VkSampleCountFlagBits sample_count; const struct vkd3d_format *format; enum VkVertexInputRate input_rate; unsigned int i, j; @@ -1914,6 +1915,10 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s return E_INVALIDARG; } + sample_count = vk_samples_from_dxgi_sample_desc(&desc->SampleDesc); + if (desc->SampleDesc.Count != 1 && desc->SampleDesc.Quality) + WARN("Ignoring sample quality %u.\n", desc->SampleDesc.Quality); + rt_count = desc->NumRenderTargets; if (rt_count > ARRAY_SIZE(graphics->attachments) - 1) { @@ -1943,7 +1948,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->attachments[0].flags = 0; graphics->attachments[0].format = format->vk_format; - graphics->attachments[0].samples = VK_SAMPLE_COUNT_1_BIT; + graphics->attachments[0].samples = sample_count; if (desc->DepthStencilState.DepthEnable) { graphics->attachments[0].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; @@ -2002,7 +2007,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->attachments[idx].flags = 0; graphics->attachments[idx].format = format->vk_format; - graphics->attachments[idx].samples = VK_SAMPLE_COUNT_1_BIT; + graphics->attachments[idx].samples = sample_count; graphics->attachments[idx].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; graphics->attachments[idx].storeOp = VK_ATTACHMENT_STORE_OP_STORE; graphics->attachments[idx].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; @@ -2202,7 +2207,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->ms_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; graphics->ms_desc.pNext = NULL; graphics->ms_desc.flags = 0; - graphics->ms_desc.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; + graphics->ms_desc.rasterizationSamples = sample_count; graphics->ms_desc.sampleShadingEnable = VK_FALSE; graphics->ms_desc.minSampleShading = 0.0f; graphics->ms_desc.pSampleMask = NULL; @@ -2211,9 +2216,6 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ds_desc_from_d3d12(&graphics->ds_desc, &desc->DepthStencilState); - if (desc->SampleDesc.Count != 1) - FIXME("Ignoring sample desc %u, %u.\n", desc->SampleDesc.Count, desc->SampleDesc.Quality); - graphics->root_signature = root_signature; list_init(&graphics->compiled_pipelines); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index f60dc5f..5f57988 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -848,6 +848,7 @@ static inline unsigned int d3d12_resource_desc_get_layer_count(const D3D12_RESOU } enum VkCompareOp vk_compare_op_from_d3d12(D3D12_COMPARISON_FUNC op) DECLSPEC_HIDDEN; +VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *desc) DECLSPEC_HIDDEN; bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN; bool check_feature_level_support(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN;

1 0

Józef Kucia : vkd3d: Set the numer of samples for clears.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: vkd3d Branch: master Commit: 5e0094f617eeb9f89bfb73f7ccc44030bc285f2d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5e0094f617eeb9f89bfb73f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 25 11:24:00 2018 +0200 vkd3d: Set the numer of samples for clears. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 4 ++-- libs/vkd3d/resource.c | 2 ++ libs/vkd3d/vkd3d_private.h | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 7e7b3ee..542c484 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3677,7 +3677,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearDepthStencilView(ID3D12Gra attachment_desc.flags = 0; attachment_desc.format = dsv_desc->format; - attachment_desc.samples = VK_SAMPLE_COUNT_1_BIT; + attachment_desc.samples = dsv_desc->sample_count; if (flags & D3D12_CLEAR_FLAG_DEPTH) { attachment_desc.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; @@ -3725,7 +3725,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12Gra attachment_desc.flags = 0; attachment_desc.format = rtv_desc->format; - attachment_desc.samples = VK_SAMPLE_COUNT_1_BIT; + attachment_desc.samples = rtv_desc->sample_count; attachment_desc.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; attachment_desc.storeOp = VK_ATTACHMENT_STORE_OP_STORE; attachment_desc.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 55abd50..cb1427f 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2058,6 +2058,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev rtv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_RTV; rtv_desc->format = vkd3d_desc.format->vk_format; + rtv_desc->sample_count = vk_samples_from_dxgi_sample_desc(&resource->desc.SampleDesc); rtv_desc->width = d3d12_resource_desc_get_width(&resource->desc, vkd3d_desc.miplevel_idx); rtv_desc->height = d3d12_resource_desc_get_height(&resource->desc, vkd3d_desc.miplevel_idx); rtv_desc->layer_count = vkd3d_desc.layer_count; @@ -2130,6 +2131,7 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev dsv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_DSV; dsv_desc->format = vkd3d_desc.format->vk_format; + dsv_desc->sample_count = vk_samples_from_dxgi_sample_desc(&resource->desc.SampleDesc); dsv_desc->width = d3d12_resource_desc_get_width(&resource->desc, vkd3d_desc.miplevel_idx); dsv_desc->height = d3d12_resource_desc_get_height(&resource->desc, vkd3d_desc.miplevel_idx); dsv_desc->layer_count = vkd3d_desc.layer_count; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 5f57988..4be160b 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -337,6 +337,7 @@ struct d3d12_rtv_desc { uint32_t magic; VkFormat format; + VkSampleCountFlagBits sample_count; uint64_t width; unsigned int height; unsigned int layer_count; @@ -356,6 +357,7 @@ struct d3d12_dsv_desc { uint32_t magic; VkFormat format; + VkSampleCountFlagBits sample_count; uint64_t width; unsigned int height; unsigned int layer_count;

1 0

Józef Kucia : vkd3d: Implement d3d12_command_list_ResolveSubresource().
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: vkd3d Branch: master Commit: 6d4e661336bc475ea05c5b1e6237f64f30cab9f7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6d4e661336bc475ea05c5b1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 25 11:24:01 2018 +0200 vkd3d: Implement d3d12_command_list_ResolveSubresource(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 65 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 542c484..5ccf492 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1409,6 +1409,7 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, break; case D3D12_RESOURCE_STATE_COPY_SOURCE: + case D3D12_RESOURCE_STATE_RESOLVE_SOURCE: *access_mask = 0; *stage_flags = 0; if (image_layout) @@ -2463,6 +2464,8 @@ static HRESULT d3d12_command_list_allocate_transfer_buffer(struct d3d12_command_ /* In Vulkan, each depth/stencil format is only compatible with itself. * This means that we are not allowed to copy texture regions directly between * depth/stencil and color formats. + * + * FIXME: Implement color <-> depth/stencil blits in shaders. */ static void d3d12_command_list_copy_incompatible_texture_region(struct d3d12_command_list *list, struct d3d12_resource *dst_resource, unsigned int dst_sub_resource_idx, @@ -2736,12 +2739,69 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTiles(ID3D12GraphicsCommand } static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12GraphicsCommandList *iface, - ID3D12Resource *dst_resource, UINT dst_sub_resource, - ID3D12Resource *src_resource, UINT src_sub_resource, DXGI_FORMAT format) + ID3D12Resource *dst, UINT dst_sub_resource_idx, + ID3D12Resource *src, UINT src_sub_resource_idx, DXGI_FORMAT format) { - FIXME("iface %p, dst_resource %p, dst_sub_resource %u, src_resource %p, src_sub_resource %u, " - "format %#x stub!\n", - iface, dst_resource, dst_sub_resource, src_resource, src_sub_resource, format); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_resource *dst_resource, *src_resource; + const struct vkd3d_format *src_format, *dst_format; + const struct vkd3d_vk_device_procs *vk_procs; + VkImageResolve vk_image_resolve; + + TRACE("iface %p, dst_resource %p, dst_sub_resource_idx %u, src_resource %p, src_sub_resource_idx %u, " + "format %#x.\n", iface, dst, dst_sub_resource_idx, src, src_sub_resource_idx, format); + + vk_procs = &list->device->vk_procs; + + dst_resource = unsafe_impl_from_ID3D12Resource(dst); + src_resource = unsafe_impl_from_ID3D12Resource(src); + + assert(d3d12_resource_is_texture(dst_resource)); + assert(d3d12_resource_is_texture(src_resource)); + + d3d12_command_list_track_resource_usage(list, dst_resource); + d3d12_command_list_track_resource_usage(list, src_resource); + + d3d12_command_list_end_current_render_pass(list); + + if (dxgi_format_is_typeless(dst_resource->desc.Format) + || dxgi_format_is_typeless(src_resource->desc.Format)) + { + FIXME("Not implemented for typeless resources.\n"); + return; + } + + if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(&dst_resource->desc, DXGI_FORMAT_UNKNOWN))) + { + WARN("Invalid format %#x.\n", dst_resource->desc.Format); + return; + } + if (!(src_format = vkd3d_format_from_d3d12_resource_desc(&src_resource->desc, DXGI_FORMAT_UNKNOWN))) + { + WARN("Invalid format %#x.\n", src_resource->desc.Format); + return; + } + + /* Resolve of depth/stencil images is not supported in Vulkan. */ + if ((dst_format->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) + || (src_format->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) + { + FIXME("Resolve of depth/stencil images is not implemented yet.\n"); + return; + } + + vk_image_subresource_layers_from_d3d12(&vk_image_resolve.srcSubresource, + src_format, src_sub_resource_idx, src_resource->desc.MipLevels); + memset(&vk_image_resolve.srcOffset, 0, sizeof(vk_image_resolve.srcOffset)); + vk_image_subresource_layers_from_d3d12(&vk_image_resolve.dstSubresource, + dst_format, dst_sub_resource_idx, dst_resource->desc.MipLevels); + memset(&vk_image_resolve.dstOffset, 0, sizeof(vk_image_resolve.dstOffset)); + vk_extent_3d_from_d3d12_miplevel(&vk_image_resolve.extent, + &dst_resource->desc, vk_image_resolve.dstSubresource.mipLevel); + + VK_CALL(vkCmdResolveImage(list->vk_command_buffer, src_resource->u.vk_image, + VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dst_resource->u.vk_image, + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &vk_image_resolve)); } static enum VkPrimitiveTopology vk_topology_from_d3d12_topology(D3D12_PRIMITIVE_TOPOLOGY topology)

1 0

Józef Kucia : tests: Add test for multisample rendering.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: vkd3d Branch: master Commit: 154c48000d7f4cab3efbb895d41b5bec2475f95f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=154c48000d7f4cab3efbb89… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 25 11:24:02 2018 +0200 tests: Add test for multisample rendering. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++ tests/vkd3d_d3d12_test.h | 5 +- 2 files changed, 180 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=154c48000d7f4cab3ef…

1 0

Józef Kucia : vkd3d: Enable VK_EXT_vertex_attribute_divisor.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: vkd3d Branch: master Commit: 5e6b35af8e1a611be579c8811b463596aad10078 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5e6b35af8e1a611be579c88… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 25 11:24:03 2018 +0200 vkd3d: Enable VK_EXT_vertex_attribute_divisor. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 24 ++++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 1 + libs/vkd3d/vulkan_procs.h | 2 ++ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 419b904..fca4461 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -64,6 +64,8 @@ static const char * const required_device_extensions[] = static const struct vkd3d_optional_extension_info optional_device_extensions[] = { {VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_push_descriptor)}, + {VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, + offsetof(struct vkd3d_vulkan_info, EXT_vertex_attribute_divisor)}, }; static bool is_extension_disabled(const char *extension_name) @@ -993,9 +995,11 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, { unsigned int direct_queue_family_index, copy_queue_family_index, compute_queue_family_index; const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; + VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT vertex_divisor_features; + struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; VkQueueFamilyProperties *queue_properties = NULL; VkDeviceQueueCreateInfo *queue_info = NULL; - VkPhysicalDeviceFeatures device_features; + VkPhysicalDeviceFeatures2 features2; VkPhysicalDevice physical_device; VkDeviceCreateInfo device_info; uint32_t queue_family_count; @@ -1082,11 +1086,19 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VK_CALL(vkGetPhysicalDeviceMemoryProperties(physical_device, &device->memory_properties)); - VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &device_features)); - if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &device_features, &extension_count))) + memset(&vertex_divisor_features, 0, sizeof(vertex_divisor_features)); + vertex_divisor_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT; + features2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; + features2.pNext = &vertex_divisor_features; + if (vulkan_info->KHR_get_physical_device_properties2) + VK_CALL(vkGetPhysicalDeviceFeatures2KHR(physical_device, &features2)); + else + VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &features2.features)); + + if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &features2.features, &extension_count))) goto done; - device_features.shaderTessellationAndGeometryPointSize = VK_FALSE; + features2.features.shaderTessellationAndGeometryPointSize = VK_FALSE; if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) { @@ -1096,7 +1108,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, /* Create device */ device_info.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; - device_info.pNext = NULL; + device_info.pNext = &vertex_divisor_features; device_info.flags = 0; device_info.queueCreateInfoCount = queue_family_count; device_info.pQueueCreateInfos = queue_info; @@ -1108,7 +1120,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, create_info->device_extensions, create_info->device_extension_count, NULL, 0, NULL, &device->vk_info); device_info.ppEnabledExtensionNames = extensions; - device_info.pEnabledFeatures = &device_features; + device_info.pEnabledFeatures = &features2.features; vr = VK_CALL(vkCreateDevice(physical_device, &device_info, NULL, &vk_device)); vkd3d_free(extensions); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 4be160b..e4e1e11 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -83,6 +83,7 @@ struct vkd3d_vulkan_info bool EXT_debug_report; /* device extensions */ bool KHR_push_descriptor; + bool EXT_vertex_attribute_divisor; VkPhysicalDeviceLimits device_limits; VkPhysicalDeviceSparseProperties sparse_properties; diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index 690a1a2..e14121c 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -46,6 +46,8 @@ VK_INSTANCE_PFN(vkGetPhysicalDeviceMemoryProperties) VK_INSTANCE_PFN(vkGetPhysicalDeviceProperties) VK_INSTANCE_PFN(vkGetPhysicalDeviceQueueFamilyProperties) VK_INSTANCE_PFN(vkGetPhysicalDeviceSparseImageFormatProperties) +/* VK_KHR_get_physical_device_properties2 */ +VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceFeatures2KHR) /* VK_EXT_debug_report */ VK_INSTANCE_EXT_PFN(vkCreateDebugReportCallbackEXT) VK_INSTANCE_EXT_PFN(vkDestroyDebugReportCallbackEXT)

1 0

Józef Kucia : vkd3d: Do not trace features for all available physical devices.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: vkd3d Branch: master Commit: 2e8b3863f3027de4d75df81070ae3b72dbb8fc9f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2e8b3863f3027de4d75df81… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 25 11:24:04 2018 +0200 vkd3d: Do not trace features for all available physical devices. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 119 +++++++++++++++++++++++++++------------------------- 1 file changed, 62 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=2e8b3863f3027de4d75…

1 0

Józef Kucia : vkd3d: Trace VK_EXT_vertex_attribute_divisor features.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: vkd3d Branch: master Commit: db2788374089993f86036004ea7478376eb19a27 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=db2788374089993f8603600… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 25 13:41:10 2018 +0200 vkd3d: Trace VK_EXT_vertex_attribute_divisor features. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 87 ++++++++++++++++++++++++++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 2 ++ 2 files changed, 78 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index be8c15e..e9a3963 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -41,6 +41,26 @@ static const void *vkd3d_find_struct_(const struct vkd3d_struct *chain, return NULL; } +struct vk_struct +{ + VkStructureType sType; + struct vk_struct *pNext; +}; + +#define vk_find_struct(c, t) vk_find_struct_(c, VK_STRUCTURE_TYPE_##t) +static const void *vk_find_struct_(struct vk_struct *chain, VkStructureType sType) +{ + while (chain) + { + if (chain->sType == sType) + return chain; + + chain = chain->pNext; + } + + return NULL; +} + struct vkd3d_optional_extension_info { const char *extension_name; @@ -68,6 +88,19 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = offsetof(struct vkd3d_vulkan_info, EXT_vertex_attribute_divisor)}, }; +static unsigned int get_spec_version(const VkExtensionProperties *extensions, + unsigned int count, const char *extension_name) +{ + unsigned int i; + + for (i = 0; i < count; ++i) + { + if (!strcmp(extensions[i].extensionName, extension_name)) + return extensions[i].specVersion; + } + return 0; +} + static bool is_extension_disabled(const char *extension_name) { const char *disabled_extensions; @@ -705,6 +738,7 @@ static void vkd3d_trace_physical_device(VkPhysicalDevice device, static void vkd3d_trace_physical_device_features(const VkPhysicalDeviceFeatures2KHR *features2) { + const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *divisor_features; const VkPhysicalDeviceFeatures *features = &features2->features; TRACE("Device features:\n"); @@ -763,16 +797,26 @@ static void vkd3d_trace_physical_device_features(const VkPhysicalDeviceFeatures2 TRACE(" sparseResidencyAliased: %#x.\n", features->sparseResidencyAliased); TRACE(" variableMultisampleRate: %#x.\n", features->variableMultisampleRate); TRACE(" inheritedQueries: %#x.\n", features->inheritedQueries); + + divisor_features = vk_find_struct(features2->pNext, PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT); + if (divisor_features) + { + TRACE(" VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT:\n"); + TRACE(" vertexAttributeInstanceRateDivisor: %#x.\n", + divisor_features->vertexAttributeInstanceRateDivisor); + TRACE(" vertexAttributeInstanceRateZeroDivisor: %#x.\n", + divisor_features->vertexAttributeInstanceRateZeroDivisor); + } } -static void vkd3d_check_feature_level_11_requirements(const VkPhysicalDeviceLimits *limits, +static void vkd3d_check_feature_level_11_requirements(const struct vkd3d_vulkan_info *vk_info, const VkPhysicalDeviceFeatures *features) { #define CHECK_MIN_REQUIREMENT(name, value) \ - if (limits->name < value) \ + if (vk_info->device_limits.name < value) \ WARN(#name " does not meet feature level 11_0 requirements.\n"); #define CHECK_MAX_REQUIREMENT(name, value) \ - if (limits->name > value) \ + if (vk_info->device_limits.name > value) \ WARN(#name " does not meet feature level 11_0 requirements.\n"); #define CHECK_FEATURE(name) \ if (!features->name) \ @@ -807,6 +851,11 @@ static void vkd3d_check_feature_level_11_requirements(const VkPhysicalDeviceLimi CHECK_FEATURE(shaderClipDistance); CHECK_FEATURE(shaderCullDistance); + if (!vk_info->EXT_vertex_attribute_divisor) + WARN("Vertex attribute instance rate divisor is not supported.\n"); + else if (!vk_info->vertex_attrib_zero_divisor) + WARN("Vertex attribute instance rate zero divisor is not supported.\n"); + #undef CHECK_MIN_REQUIREMENT #undef CHECK_MAX_REQUIREMENT #undef CHECK_FEATURE @@ -814,10 +863,12 @@ static void vkd3d_check_feature_level_11_requirements(const VkPhysicalDeviceLimi static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, const struct vkd3d_device_create_info *create_info, - const VkPhysicalDeviceFeatures *features, uint32_t *device_extension_count) + VkPhysicalDeviceFeatures2KHR *features2, uint32_t *device_extension_count) { const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; + const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *divisor_features; VkPhysicalDevice physical_device = device->vk_physical_device; + VkPhysicalDeviceFeatures *features = &features2->features; struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; VkPhysicalDeviceProperties device_properties; VkExtensionProperties *vk_extensions; @@ -826,12 +877,12 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, *device_extension_count = 0; + vkd3d_trace_physical_device_features(features2); + VK_CALL(vkGetPhysicalDeviceProperties(physical_device, &device_properties)); vulkan_info->device_limits = device_properties.limits; vulkan_info->sparse_properties = device_properties.sparseProperties; - vkd3d_check_feature_level_11_requirements(&device_properties.limits, features); - device->feature_options.DoublePrecisionFloatShaderOps = features->shaderFloat64; device->feature_options.OutputMergerLogicOp = features->logicOp; /* SPV_KHR_16bit_storage */ @@ -894,7 +945,25 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, create_info->device_extensions, create_info->device_extension_count, NULL, 0, NULL, vulkan_info, "device"); + divisor_features = vk_find_struct(features2->pNext, PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT); + if (get_spec_version(vk_extensions, count, VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME) >= 3 + && divisor_features) + { + if (!divisor_features->vertexAttributeInstanceRateDivisor) + vulkan_info->EXT_vertex_attribute_divisor = false; + vulkan_info->vertex_attrib_zero_divisor = divisor_features->vertexAttributeInstanceRateZeroDivisor; + } + else + { + vulkan_info->vertex_attrib_zero_divisor = false; + } + + vkd3d_check_feature_level_11_requirements(vulkan_info, features); + + features->shaderTessellationAndGeometryPointSize = VK_FALSE; + vkd3d_free(vk_extensions); + return S_OK; } @@ -1098,13 +1167,9 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, else VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &features2.features)); - vkd3d_trace_physical_device_features(&features2); - - if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &features2.features, &extension_count))) + if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &features2, &extension_count))) goto done; - features2.features.shaderTessellationAndGeometryPointSize = VK_FALSE; - if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) { hr = E_OUTOFMEMORY; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index e4e1e11..3f53980 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -85,6 +85,8 @@ struct vkd3d_vulkan_info bool KHR_push_descriptor; bool EXT_vertex_attribute_divisor; + bool vertex_attrib_zero_divisor; + VkPhysicalDeviceLimits device_limits; VkPhysicalDeviceSparseProperties sparse_properties; };

1 0

Józef Kucia : vkd3d: Trace VK_EXT_vertex_attribute_divisor properties.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: vkd3d Branch: master Commit: b2dc48c61126edb0be68f47b8797fa91ceb15111 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b2dc48c61126edb0be68f47… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 25 11:24:06 2018 +0200 vkd3d: Trace VK_EXT_vertex_attribute_divisor properties. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 35 +++++++++++++++++++++++++++++------ libs/vkd3d/vulkan_procs.h | 1 + 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index e9a3963..0adebcf 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -575,7 +575,6 @@ static void vkd3d_trace_physical_device(VkPhysicalDevice device, VkPhysicalDeviceMemoryProperties memory_properties; VkPhysicalDeviceProperties device_properties; VkQueueFamilyProperties *queue_properties; - VkPhysicalDeviceLimits *limits; unsigned int i, j; uint32_t count; @@ -616,8 +615,13 @@ static void vkd3d_trace_physical_device(VkPhysicalDevice device, TRACE(" Memory type [%u]: flags %s.\n", j, debug_vk_memory_property_flags(type->propertyFlags)); } } +} + +static void vkd3d_trace_physical_device_limits(const VkPhysicalDeviceProperties2KHR *properties2) +{ + const VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *divisor_properties; + const VkPhysicalDeviceLimits *limits = &properties2->properties.limits; - limits = &device_properties.limits; TRACE("Device limits:\n"); TRACE(" maxImageDimension1D: %u.\n", limits->maxImageDimension1D); TRACE(" maxImageDimension2D: %u.\n", limits->maxImageDimension2D); @@ -734,6 +738,14 @@ static void vkd3d_trace_physical_device(VkPhysicalDevice device, TRACE(" optimalBufferCopyOffsetAlignment: %#"PRIx64".\n", limits->optimalBufferCopyOffsetAlignment); TRACE(" optimalBufferCopyRowPitchAlignment: %#"PRIx64".\n", limits->optimalBufferCopyRowPitchAlignment); TRACE(" nonCoherentAtomSize: %#"PRIx64".\n", limits->nonCoherentAtomSize); + + divisor_properties + = vk_find_struct(properties2->pNext, PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT); + if (divisor_properties) + { + TRACE(" VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT:\n"); + TRACE(" maxVertexAttribDivisor: %u.\n", divisor_properties->maxVertexAttribDivisor); + } } static void vkd3d_trace_physical_device_features(const VkPhysicalDeviceFeatures2KHR *features2) @@ -866,11 +878,12 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, VkPhysicalDeviceFeatures2KHR *features2, uint32_t *device_extension_count) { const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; + VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT vertex_divisor_properties; const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *divisor_features; VkPhysicalDevice physical_device = device->vk_physical_device; VkPhysicalDeviceFeatures *features = &features2->features; struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; - VkPhysicalDeviceProperties device_properties; + VkPhysicalDeviceProperties2KHR device_properties2; VkExtensionProperties *vk_extensions; uint32_t count; VkResult vr; @@ -879,9 +892,19 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vkd3d_trace_physical_device_features(features2); - VK_CALL(vkGetPhysicalDeviceProperties(physical_device, &device_properties)); - vulkan_info->device_limits = device_properties.limits; - vulkan_info->sparse_properties = device_properties.sparseProperties; + memset(&vertex_divisor_properties, 0, sizeof(vertex_divisor_properties)); + vertex_divisor_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT; + device_properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; + device_properties2.pNext = &vertex_divisor_properties; + if (vulkan_info->KHR_get_physical_device_properties2) + VK_CALL(vkGetPhysicalDeviceProperties2KHR(physical_device, &device_properties2)); + else + VK_CALL(vkGetPhysicalDeviceProperties(physical_device, &device_properties2.properties)); + + vkd3d_trace_physical_device_limits(&device_properties2); + + vulkan_info->device_limits = device_properties2.properties.limits; + vulkan_info->sparse_properties = device_properties2.properties.sparseProperties; device->feature_options.DoublePrecisionFloatShaderOps = features->shaderFloat64; device->feature_options.OutputMergerLogicOp = features->logicOp; diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index e14121c..ac03b3f 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -48,6 +48,7 @@ VK_INSTANCE_PFN(vkGetPhysicalDeviceQueueFamilyProperties) VK_INSTANCE_PFN(vkGetPhysicalDeviceSparseImageFormatProperties) /* VK_KHR_get_physical_device_properties2 */ VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceFeatures2KHR) +VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceProperties2KHR) /* VK_EXT_debug_report */ VK_INSTANCE_EXT_PFN(vkCreateDebugReportCallbackEXT) VK_INSTANCE_EXT_PFN(vkDestroyDebugReportCallbackEXT)

1 0

Józef Kucia : vkd3d: Implement instance data step rate.
by Alexandre Julliard 25 Oct '18

25 Oct '18

Module: vkd3d Branch: master Commit: ebde6bd229d21af2ca732f2e8c1e8699d1bb9c9e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ebde6bd229d21af2ca732f2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 25 11:24:07 2018 +0200 vkd3d: Implement instance data step rate. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 1 + libs/vkd3d/state.c | 45 +++++++++++++++++++++++++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 4 +++- 3 files changed, 43 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 0adebcf..4f5cdd6 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -905,6 +905,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->device_limits = device_properties2.properties.limits; vulkan_info->sparse_properties = device_properties2.properties.sparseProperties; + vulkan_info->max_vertex_attrib_divisor = max(vertex_divisor_properties.maxVertexAttribDivisor, 1); device->feature_options.DoublePrecisionFloatShaderOps = features->shaderFloat64; device->feature_options.OutputMergerLogicOp = features->logicOp; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 0deea28..7e0b1ee 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1866,7 +1866,10 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s unsigned int ps_output_swizzle[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT]; struct d3d12_graphics_pipeline_state *graphics = &state->u.graphics; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkVertexInputBindingDivisorDescriptionEXT *binding_divisor; + const struct vkd3d_vulkan_info *vk_info = &device->vk_info; const struct vkd3d_shader_compile_arguments *compile_args; + uint32_t instance_divisors[D3D12_VS_INPUT_REGISTER_COUNT]; uint32_t aligned_offsets[D3D12_VS_INPUT_REGISTER_COUNT]; struct vkd3d_shader_compile_arguments ps_compile_args; const struct d3d12_root_signature *root_signature; @@ -1877,6 +1880,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s VkSampleCountFlagBits sample_count; const struct vkd3d_format *format; enum VkVertexInputRate input_rate; + unsigned int instance_divisor; unsigned int i, j; size_t rt_count; uint32_t mask; @@ -2106,6 +2110,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (FAILED(hr = compute_input_layout_offsets(&desc->InputLayout, aligned_offsets))) goto fail; + graphics->instance_divisor_count = 0; for (i = 0, j = 0, mask = 0; i < graphics->attribute_count; ++i) { const D3D12_INPUT_ELEMENT_DESC *e = &desc->InputLayout.pInputElementDescs[i]; @@ -2118,7 +2123,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } - if (e->InputSlot >= ARRAY_SIZE(graphics->input_rates)) + if (e->InputSlot >= ARRAY_SIZE(graphics->input_rates) + || e->InputSlot >= ARRAY_SIZE(instance_divisors)) { WARN("Invalid input slot %#x.\n", e->InputSlot); hr = E_INVALIDARG; @@ -2145,12 +2151,18 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s { case D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA: input_rate = VK_VERTEX_INPUT_RATE_VERTEX; + instance_divisor = 1; break; case D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA: - if (e->InstanceDataStepRate != 1) - FIXME("Ignoring step rate %#x on input element %u.\n", e->InstanceDataStepRate, i); input_rate = VK_VERTEX_INPUT_RATE_INSTANCE; + instance_divisor = e->InstanceDataStepRate; + if (instance_divisor > vk_info->max_vertex_attrib_divisor + || (!instance_divisor && !vk_info->vertex_attrib_zero_divisor)) + { + FIXME("Instance divisor %u not supported by Vulkan implementation.\n", instance_divisor); + instance_divisor = 1; + } break; default: @@ -2159,14 +2171,25 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } - if (mask & (1u << e->InputSlot) && graphics->input_rates[e->InputSlot] != input_rate) + if (mask & (1u << e->InputSlot) && (graphics->input_rates[e->InputSlot] != input_rate + || instance_divisors[e->InputSlot] != instance_divisor)) { - FIXME("Input slot class %#x on input element %u conflicts with earlier input slot class %#x.\n", - e->InputSlotClass, e->InputSlot, graphics->input_rates[e->InputSlot]); + FIXME("Input slot rate %#x, instance divisor %u on input element %u conflicts " + "with earlier input slot rate %#x, instance divisor %u.\n", + input_rate, instance_divisor, e->InputSlot, + graphics->input_rates[e->InputSlot], instance_divisors[e->InputSlot]); hr = E_INVALIDARG; goto fail; } + graphics->input_rates[e->InputSlot] = input_rate; + instance_divisors[e->InputSlot] = instance_divisor; + if (instance_divisor != 1 && !(mask & (1u << e->InputSlot))) + { + binding_divisor = &graphics->instance_divisors[graphics->instance_divisor_count++]; + binding_divisor->binding = e->InputSlot; + binding_divisor->divisor = instance_divisor; + } mask |= 1u << e->InputSlot; } graphics->attribute_count = j; @@ -2331,6 +2354,7 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta struct VkVertexInputBindingDescription bindings[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; const struct vkd3d_vk_device_procs *vk_procs = &state->device->vk_procs; struct d3d12_graphics_pipeline_state *graphics = &state->u.graphics; + VkPipelineVertexInputDivisorStateCreateInfoEXT input_divisor_info; struct VkPipelineVertexInputStateCreateInfo input_desc; struct VkPipelineInputAssemblyStateCreateInfo ia_desc; struct VkPipelineColorBlendStateCreateInfo blend_desc; @@ -2414,6 +2438,15 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta input_desc.vertexAttributeDescriptionCount = graphics->attribute_count; input_desc.pVertexAttributeDescriptions = graphics->attributes; + if (graphics->instance_divisor_count) + { + input_desc.pNext = &input_divisor_info; + input_divisor_info.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT; + input_divisor_info.pNext = NULL; + input_divisor_info.vertexBindingDivisorCount = graphics->instance_divisor_count; + input_divisor_info.pVertexBindingDivisors = graphics->instance_divisors; + } + ia_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; ia_desc.pNext = NULL; ia_desc.flags = 0; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 3f53980..a2bf404 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -86,6 +86,7 @@ struct vkd3d_vulkan_info bool EXT_vertex_attribute_divisor; bool vertex_attrib_zero_divisor; + unsigned int max_vertex_attrib_divisor; VkPhysicalDeviceLimits device_limits; VkPhysicalDeviceSparseProperties sparse_properties; @@ -513,6 +514,8 @@ struct d3d12_graphics_pipeline_state struct VkVertexInputAttributeDescription attributes[D3D12_VS_INPUT_REGISTER_COUNT]; enum VkVertexInputRate input_rates[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; + VkVertexInputBindingDivisorDescriptionEXT instance_divisors[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; + size_t instance_divisor_count; size_t attribute_count; struct VkAttachmentDescription attachments[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; @@ -767,7 +770,6 @@ struct d3d12_device struct vkd3d_fence_worker fence_worker; pthread_mutex_t pipeline_cache_mutex; - struct rb_tree pipeline_cache; VkPipelineCache vk_pipeline_cache; /* A sampler used for SpvOpImageFetch. */

1 0