September 2018 - Wine-devel

[PATCH vkd3d 07/11] vkd3d: Set pointer to NULL if heap creation fails.
by Józef Kucia 12 Sep '18

12 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 3 +++ tests/d3d12.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index e8bf7c957b58..d39eef2c2499 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1946,7 +1946,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateHeap(ID3D12Device *iface, iface, desc, debugstr_guid(iid), heap); if (FAILED(hr = d3d12_heap_create(device, desc, &object))) + { + *heap = NULL; return hr; + } return return_interface(&object->ID3D12Heap_iface, &IID_ID3D12Heap, iid, heap); } diff --git a/tests/d3d12.c b/tests/d3d12.c index 5a39f0c1dfa1..221157faa53f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1854,9 +1854,12 @@ static void test_create_heap(void) desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_NON_RT_DS_TEXTURES | D3D12_HEAP_FLAG_ALLOW_DISPLAY; hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + heap = (void *)0xdeadbeef; desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_RT_DS_TEXTURES | D3D12_HEAP_FLAG_ALLOW_DISPLAY; hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!heap, "Got unexpected pointer %p.\n", heap); for (i = 0; i < ARRAY_SIZE(tests); ++i) { -- 2.16.4

2 1

[PATCH vkd3d 10/11] vkd3d: Simplify d3d12_device_init().
by Józef Kucia 12 Sep '18

12 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index d39eef2c2499..cfb17ea17d99 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2282,6 +2282,7 @@ struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface) static HRESULT d3d12_device_init(struct d3d12_device *device, struct vkd3d_instance *instance, const struct vkd3d_device_create_info *create_info) { + const struct vkd3d_vk_device_procs *vk_procs; HRESULT hr; device->ID3D12Device_iface.lpVtbl = &d3d12_device_vtbl; @@ -2295,30 +2296,22 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, device->wchar_size = instance->wchar_size; device->adapter_luid = create_info->adapter_luid; + device->removed_reason = S_OK; + + device->vk_device = VK_NULL_HANDLE; + device->vk_dummy_sampler = VK_NULL_HANDLE; if (FAILED(hr = vkd3d_create_vk_device(device, create_info))) - { - vkd3d_instance_decref(device->vkd3d_instance); - return hr; - } + goto out_free_instance; if (FAILED(hr = d3d12_device_create_dummy_sampler(device))) { - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; ERR("Failed to create dummy sampler, hr %#x.\n", hr); - VK_CALL(vkDestroyDevice(device->vk_device, NULL)); - vkd3d_instance_decref(device->vkd3d_instance); - return hr; + goto out_free_vk_resources; } if (FAILED(hr = vkd3d_fence_worker_start(&device->fence_worker, device))) - { - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - VK_CALL(vkDestroySampler(device->vk_device, device->vk_dummy_sampler, NULL)); - VK_CALL(vkDestroyDevice(device->vk_device, NULL)); - vkd3d_instance_decref(device->vkd3d_instance); - return hr; - } + goto out_free_vk_resources; vkd3d_gpu_va_allocator_init(&device->gpu_va_allocator); @@ -2327,9 +2320,15 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, if ((device->parent = create_info->parent)) IUnknown_AddRef(device->parent); - device->removed_reason = S_OK; - return S_OK; + +out_free_vk_resources: + vk_procs = &device->vk_procs; + VK_CALL(vkDestroySampler(device->vk_device, device->vk_dummy_sampler, NULL)); + VK_CALL(vkDestroyDevice(device->vk_device, NULL)); +out_free_instance: + vkd3d_instance_decref(device->vkd3d_instance); + return hr; } HRESULT d3d12_device_create(struct vkd3d_instance *instance, -- 2.16.4

2 1

[PATCH vkd3d 11/11] vkd3d: Implement simple pipeline cache.
by Józef Kucia 12 Sep '18

12 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Ideally, we would like to introduce a Vulkan extension to make vertex buffer strides and primitive topology dynamic in Vulkan. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Such extension should be quite easy to implement in RADV and Anvil. --- libs/vkd3d/command.c | 53 +++++++--------- libs/vkd3d/device.c | 151 ++++++++++++++++++++++++++++++++++++++++++--- libs/vkd3d/state.c | 12 +++- libs/vkd3d/vkd3d_private.h | 31 ++++++++-- 4 files changed, 201 insertions(+), 46 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 2fc564312f8e..5e67e6674e95 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -725,17 +725,6 @@ static bool d3d12_command_allocator_add_framebuffer(struct d3d12_command_allocat return true; } -static bool d3d12_command_allocator_add_pipeline(struct d3d12_command_allocator *allocator, VkPipeline pipeline) -{ - if (!vkd3d_array_reserve((void **)&allocator->pipelines, &allocator->pipelines_size, - allocator->pipeline_count + 1, sizeof(*allocator->pipelines))) - return false; - - allocator->pipelines[allocator->pipeline_count++] = pipeline; - - return true; -} - static bool d3d12_command_allocator_add_descriptor_pool(struct d3d12_command_allocator *allocator, VkDescriptorPool pool) { @@ -951,12 +940,6 @@ static void d3d12_command_allocator_free_resources(struct d3d12_command_allocato } allocator->descriptor_pool_count = 0; - for (i = 0; i < allocator->pipeline_count; ++i) - { - VK_CALL(vkDestroyPipeline(device->vk_device, allocator->pipelines[i], NULL)); - } - allocator->pipeline_count = 0; - for (i = 0; i < allocator->framebuffer_count; ++i) { VK_CALL(vkDestroyFramebuffer(device->vk_device, allocator->framebuffers[i], NULL)); @@ -1029,7 +1012,6 @@ static ULONG STDMETHODCALLTYPE d3d12_command_allocator_Release(ID3D12CommandAllo vkd3d_free(allocator->views); vkd3d_free(allocator->descriptor_pools); vkd3d_free(allocator->free_descriptor_pools); - vkd3d_free(allocator->pipelines); vkd3d_free(allocator->framebuffers); vkd3d_free(allocator->passes); @@ -1214,10 +1196,6 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo allocator->framebuffers_size = 0; allocator->framebuffer_count = 0; - allocator->pipelines = NULL; - allocator->pipelines_size = 0; - allocator->pipeline_count = 0; - allocator->descriptor_pools = NULL; allocator->descriptor_pools_size = 0; allocator->descriptor_pool_count = 0; @@ -1837,8 +1815,8 @@ static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_l return true; } -static VkPipeline d3d12_command_list_create_graphics_pipeline(struct d3d12_command_list *list, - const struct d3d12_graphics_pipeline_state *state) +static VkPipeline d3d12_command_list_get_or_create_pipeline(struct d3d12_command_list *list, + struct d3d12_graphics_pipeline_state *state) { struct VkVertexInputBindingDescription bindings[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; @@ -1846,7 +1824,8 @@ static VkPipeline d3d12_command_list_create_graphics_pipeline(struct d3d12_comma struct VkPipelineInputAssemblyStateCreateInfo ia_desc; struct VkPipelineColorBlendStateCreateInfo blend_desc; struct VkGraphicsPipelineCreateInfo pipeline_desc; - const struct d3d12_device *device = list->device; + struct d3d12_device *device = list->device; + struct vkd3d_pipeline_key pipeline_key; size_t binding_count = 0; VkPipeline vk_pipeline; unsigned int i; @@ -1878,6 +1857,10 @@ static VkPipeline d3d12_command_list_create_graphics_pipeline(struct d3d12_comma .pDynamicStates = dynamic_states, }; + memset(&pipeline_key, 0, sizeof(pipeline_key)); + pipeline_key.state = state; + pipeline_key.topology = list->primitive_topology; + for (i = 0, mask = 0; i < state->attribute_count; ++i) { struct VkVertexInputBindingDescription *b; @@ -1902,9 +1885,14 @@ static VkPipeline d3d12_command_list_create_graphics_pipeline(struct d3d12_comma if (!b->stride) FIXME("Invalid stride for input slot %u.\n", binding); + pipeline_key.strides[binding_count] = list->strides[binding]; + ++binding_count; } + if ((vk_pipeline = d3d12_device_find_cached_pipeline(device, &pipeline_key))) + return vk_pipeline; + input_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO; input_desc.pNext = NULL; input_desc.flags = 0; @@ -1957,13 +1945,14 @@ static VkPipeline d3d12_command_list_create_graphics_pipeline(struct d3d12_comma return VK_NULL_HANDLE; } - if (!d3d12_command_allocator_add_pipeline(list->allocator, vk_pipeline)) - { - WARN("Failed to add pipeline.\n"); - VK_CALL(vkDestroyPipeline(device->vk_device, vk_pipeline, NULL)); - return VK_NULL_HANDLE; - } + if (d3d12_device_put_pipeline_to_cache(device, &pipeline_key, vk_pipeline, &state->compiled_pipelines)) + return vk_pipeline; + /* Other thread compiled the pipeline before us. */ + VK_CALL(vkDestroyPipeline(device->vk_device, vk_pipeline, NULL)); + vk_pipeline = d3d12_device_find_cached_pipeline(device, &pipeline_key); + if (!vk_pipeline) + ERR("Could not get the pipeline compiled by other thread from the cache.\n"); return vk_pipeline; } @@ -1981,7 +1970,7 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list return false; } - if (!(vk_pipeline = d3d12_command_list_create_graphics_pipeline(list, &list->state->u.graphics))) + if (!(vk_pipeline = d3d12_command_list_get_or_create_pipeline(list, &list->state->u.graphics))) return false; VK_CALL(vkCmdBindPipeline(list->vk_command_buffer, list->state->vk_bind_point, vk_pipeline)); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index cfb17ea17d99..c1db7d30a9e8 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1169,11 +1169,116 @@ static HRESULT d3d12_device_create_dummy_sampler(struct d3d12_device *device) return vkd3d_create_static_sampler(device, &sampler_desc, &device->vk_dummy_sampler); } -static void d3d12_device_init_pipeline_cache(struct d3d12_device *device) +static void destroy_compiled_pipeline(struct vkd3d_compiled_pipeline *pipeline, + struct d3d12_device *device) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + + VK_CALL(vkDestroyPipeline(device->vk_device, pipeline->vk_pipeline, NULL)); + vkd3d_free(pipeline); +} + +static int compare_pipeline_cache_entry(const void *key, const struct rb_entry *entry) +{ + const struct vkd3d_compiled_pipeline *compiled_pipeline; + const struct vkd3d_pipeline_key *pipeline_key; + + pipeline_key = key; + compiled_pipeline = RB_ENTRY_VALUE(entry, const struct vkd3d_compiled_pipeline, entry); + return memcmp(&compiled_pipeline->key, pipeline_key, sizeof(*pipeline_key)); +} + +static void destroy_pipeline_cache_entry(struct rb_entry *entry, void *context) +{ + struct vkd3d_compiled_pipeline *pipeline; + struct d3d12_device *device = context; + + pipeline = RB_ENTRY_VALUE(entry, struct vkd3d_compiled_pipeline, entry); + destroy_compiled_pipeline(pipeline, device); +} + +VkPipeline d3d12_device_find_cached_pipeline(struct d3d12_device *device, + const struct vkd3d_pipeline_key *key) +{ + VkPipeline vk_pipeline = VK_NULL_HANDLE; + struct rb_entry *entry; + int rc; + + if (!(rc = pthread_mutex_lock(&device->pipeline_cache_mutex))) + { + if ((entry = rb_get(&device->pipeline_cache, key))) + vk_pipeline = RB_ENTRY_VALUE(entry, struct vkd3d_compiled_pipeline, entry)->vk_pipeline; + pthread_mutex_unlock(&device->pipeline_cache_mutex); + } + else + { + ERR("Failed to lock mutex, error %d.\n", rc); + } + + return vk_pipeline; +} + +bool d3d12_device_put_pipeline_to_cache(struct d3d12_device *device, + const struct vkd3d_pipeline_key *key, VkPipeline vk_pipeline, struct list *list) +{ + struct vkd3d_compiled_pipeline *compiled_pipeline; + bool ret = true; + int rc; + + if (!(compiled_pipeline = vkd3d_malloc(sizeof(*compiled_pipeline)))) + return false; + + compiled_pipeline->key = *key; + compiled_pipeline->vk_pipeline = vk_pipeline; + + if ((rc = pthread_mutex_lock(&device->pipeline_cache_mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + vkd3d_free(compiled_pipeline); + return false; + } + + if (rb_put(&device->pipeline_cache, key, &compiled_pipeline->entry) >= 0) + { + list_add_tail(list, &compiled_pipeline->list); + } + else + { + WARN("Failed to put pipeline to cache.\n"); + vkd3d_free(compiled_pipeline); + ret = false; + } + + pthread_mutex_unlock(&device->pipeline_cache_mutex); + return ret; +} + +void d3d12_device_destroy_compiled_pipelines(struct d3d12_device *device, struct list *list) +{ + struct vkd3d_compiled_pipeline *pipeline, *cursor; + int rc; + + if ((rc = pthread_mutex_lock(&device->pipeline_cache_mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return; + } + + LIST_FOR_EACH_ENTRY_SAFE(pipeline, cursor, list, struct vkd3d_compiled_pipeline, list) + { + rb_remove(&device->pipeline_cache, &pipeline->entry); + destroy_compiled_pipeline(pipeline, device); + } + + pthread_mutex_unlock(&device->pipeline_cache_mutex); +} + +static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkPipelineCacheCreateInfo cache_info; VkResult vr; + int rc; cache_info.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO; cache_info.pNext = NULL; @@ -1183,9 +1288,39 @@ static void d3d12_device_init_pipeline_cache(struct d3d12_device *device) if ((vr = VK_CALL(vkCreatePipelineCache(device->vk_device, &cache_info, NULL, &device->vk_pipeline_cache))) < 0) { - ERR("Failed to create pipeline cache, vr %d.\n", vr); + ERR("Failed to create Vulkan pipeline cache, vr %d.\n", vr); device->vk_pipeline_cache = VK_NULL_HANDLE; } + + rb_init(&device->pipeline_cache, compare_pipeline_cache_entry); + + if ((rc = pthread_mutex_init(&device->pipeline_cache_mutex, NULL))) + { + ERR("Failed to initialize mutex, error %d.\n", rc); + return E_FAIL; + } + + return S_OK; +} + +static void d3d12_device_destroy_pipeline_cache(struct d3d12_device *device) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + int rc; + + if (device->vk_pipeline_cache) + VK_CALL(vkDestroyPipelineCache(device->vk_device, device->vk_pipeline_cache, NULL)); + + if ((rc = pthread_mutex_lock(&device->pipeline_cache_mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return; + } + + rb_destroy(&device->pipeline_cache, destroy_pipeline_cache_entry, device); + + pthread_mutex_unlock(&device->pipeline_cache_mutex); + pthread_mutex_destroy(&device->pipeline_cache_mutex); } D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_allocator *allocator, @@ -1357,8 +1492,7 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) vkd3d_gpu_va_allocator_cleanup(&device->gpu_va_allocator); vkd3d_fence_worker_stop(&device->fence_worker, device); VK_CALL(vkDestroySampler(device->vk_device, device->vk_dummy_sampler, NULL)); - if (device->vk_pipeline_cache) - VK_CALL(vkDestroyPipelineCache(device->vk_device, device->vk_pipeline_cache, NULL)); + d3d12_device_destroy_pipeline_cache(device); d3d12_device_destroy_vkd3d_queues(device); VK_CALL(vkDestroyDevice(device->vk_device, NULL)); if (device->parent) @@ -2310,18 +2444,21 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, goto out_free_vk_resources; } - if (FAILED(hr = vkd3d_fence_worker_start(&device->fence_worker, device))) + if (FAILED(hr = d3d12_device_init_pipeline_cache(device))) goto out_free_vk_resources; - vkd3d_gpu_va_allocator_init(&device->gpu_va_allocator); + if (FAILED(hr = vkd3d_fence_worker_start(&device->fence_worker, device))) + goto out_free_pipeline_cache; - d3d12_device_init_pipeline_cache(device); + vkd3d_gpu_va_allocator_init(&device->gpu_va_allocator); if ((device->parent = create_info->parent)) IUnknown_AddRef(device->parent); return S_OK; +out_free_pipeline_cache: + d3d12_device_destroy_pipeline_cache(device); out_free_vk_resources: vk_procs = &device->vk_procs; VK_CALL(vkDestroySampler(device->vk_device, device->vk_dummy_sampler, NULL)); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 446e1a65029d..b60cebf26654 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1095,11 +1095,15 @@ static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState if (state->vk_bind_point == VK_PIPELINE_BIND_POINT_GRAPHICS) { - for (i = 0; i < state->u.graphics.stage_count; ++i) + struct d3d12_graphics_pipeline_state *graphics = &state->u.graphics; + + for (i = 0; i < graphics->stage_count; ++i) { - VK_CALL(vkDestroyShaderModule(device->vk_device, state->u.graphics.stages[i].module, NULL)); + VK_CALL(vkDestroyShaderModule(device->vk_device, graphics->stages[i].module, NULL)); } - VK_CALL(vkDestroyRenderPass(device->vk_device, state->u.graphics.render_pass, NULL)); + VK_CALL(vkDestroyRenderPass(device->vk_device, graphics->render_pass, NULL)); + + d3d12_device_destroy_compiled_pipelines(device, &graphics->compiled_pipelines); } else if (state->vk_bind_point == VK_PIPELINE_BIND_POINT_COMPUTE) { @@ -2185,6 +2189,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->root_signature = root_signature; + list_init(&graphics->compiled_pipelines); + state->vk_bind_point = VK_PIPELINE_BIND_POINT_GRAPHICS; state->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 37ad13c132cd..5461cc3d36e1 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -25,6 +25,8 @@ #include "vkd3d_common.h" #include "vkd3d_memory.h" +#include "list.h" +#include "rbtree.h" #include "vkd3d.h" #include "vkd3d_shader.h" @@ -489,6 +491,8 @@ struct d3d12_graphics_pipeline_state struct VkPipelineDepthStencilStateCreateInfo ds_desc; const struct d3d12_root_signature *root_signature; + + struct list compiled_pipelines; }; struct d3d12_compute_pipeline_state @@ -532,6 +536,21 @@ bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_ const struct d3d12_pipeline_state *state_b) DECLSPEC_HIDDEN; struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12PipelineState *iface) DECLSPEC_HIDDEN; +struct vkd3d_pipeline_key +{ + const struct d3d12_graphics_pipeline_state *state; + VkPrimitiveTopology topology; + uint32_t strides[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; +}; + +struct vkd3d_compiled_pipeline +{ + struct rb_entry entry; + struct vkd3d_pipeline_key key; + VkPipeline vk_pipeline; + struct list list; +}; + struct vkd3d_buffer { VkBuffer vk_buffer; @@ -562,10 +581,6 @@ struct d3d12_command_allocator size_t framebuffers_size; size_t framebuffer_count; - VkPipeline *pipelines; - size_t pipelines_size; - size_t pipeline_count; - VkDescriptorPool *descriptor_pools; size_t descriptor_pools_size; size_t descriptor_pool_count; @@ -701,6 +716,8 @@ struct d3d12_device struct vkd3d_gpu_va_allocator gpu_va_allocator; 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. */ @@ -733,6 +750,12 @@ void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason, const char *message, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface) DECLSPEC_HIDDEN; +void d3d12_device_destroy_compiled_pipelines(struct d3d12_device *device, struct list *list) DECLSPEC_HIDDEN; +VkPipeline d3d12_device_find_cached_pipeline(struct d3d12_device *device, + const struct vkd3d_pipeline_key *key) DECLSPEC_HIDDEN; +bool d3d12_device_put_pipeline_to_cache(struct d3d12_device *device, + const struct vkd3d_pipeline_key *key, VkPipeline vk_pipeline, struct list *list) DECLSPEC_HIDDEN; + HRESULT vkd3d_create_buffer(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, VkBuffer *vk_buffer) DECLSPEC_HIDDEN; -- 2.16.4

2 1

[PATCH vkd3d 06/11] vkd3d: Set pointer to NULL if committed resource creation fails.
by Józef Kucia 12 Sep '18

12 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 11 +++++++---- tests/d3d12.c | 9 +++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index c11f474a28d2..e8bf7c957b58 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1914,22 +1914,25 @@ static D3D12_HEAP_PROPERTIES * STDMETHODCALLTYPE d3d12_device_GetCustomHeapPrope static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommittedResource(ID3D12Device *iface, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value, REFIID riid, void **resource) + const D3D12_CLEAR_VALUE *optimized_clear_value, REFIID iid, void **resource) { struct d3d12_device *device = impl_from_ID3D12Device(iface); struct d3d12_resource *object; HRESULT hr; TRACE("iface %p, heap_properties %p, heap_flags %#x, desc %p, initial_state %#x, " - "optimized_clear_value %p, riid %s, resource %p.\n", + "optimized_clear_value %p, iid %s, resource %p.\n", iface, heap_properties, heap_flags, desc, initial_state, - optimized_clear_value, debugstr_guid(riid), resource); + optimized_clear_value, debugstr_guid(iid), resource); if (FAILED(hr = d3d12_committed_resource_create(device, heap_properties, heap_flags, desc, initial_state, optimized_clear_value, &object))) + { + *resource = NULL; return hr; + } - return return_interface(&object->ID3D12Resource_iface, &IID_ID3D12Resource, riid, resource); + return return_interface(&object->ID3D12Resource_iface, &IID_ID3D12Resource, iid, resource); } static HRESULT STDMETHODCALLTYPE d3d12_device_CreateHeap(ID3D12Device *iface, diff --git a/tests/d3d12.c b/tests/d3d12.c index 34b4fdf101fb..5a39f0c1dfa1 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1656,10 +1656,19 @@ static void test_create_committed_resource(void) /* A texture cannot be created on a UPLOAD heap. */ heap_properties.Type = D3D12_HEAP_TYPE_UPLOAD; + resource = (void *)0xdeadbeef; hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, NULL, &IID_ID3D12Resource, (void **)&resource); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!resource, "Got unexpected pointer %p.\n", resource); + + resource = (void *)0xdeadbeef; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, NULL, + &IID_ID3D12Device, (void **)&resource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!resource, "Got unexpected pointer %p.\n", resource); /* A texture cannot be created on a READBACK heap. */ heap_properties.Type = D3D12_HEAP_TYPE_READBACK; -- 2.16.4

2 1

[PATCH vkd3d 09/11] vkd3d: Reset command list state in d3d12_command_list_Reset().
by Józef Kucia 12 Sep '18

12 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 61 +++++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d5bbee966ecd..2fc564312f8e 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1713,15 +1713,39 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Close(ID3D12GraphicsCommandL return S_OK; } +static void d3d12_command_list_reset_state(struct d3d12_command_list *list, + ID3D12PipelineState *initial_pipeline_state) +{ + ID3D12GraphicsCommandList *iface = &list->ID3D12GraphicsCommandList_iface; + + memset(list->strides, 0, sizeof(list->strides)); + list->primitive_topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST; + + memset(list->views, 0, sizeof(list->views)); + list->fb_width = 0; + list->fb_height = 0; + list->fb_layer_count = 0; + + list->current_framebuffer = VK_NULL_HANDLE; + list->current_pipeline = VK_NULL_HANDLE; + list->current_render_pass = VK_NULL_HANDLE; + + memset(list->pipeline_bindings, 0, sizeof(list->pipeline_bindings)); + + list->state = NULL; + + ID3D12GraphicsCommandList_SetPipelineState(iface, initial_pipeline_state); +} + static HRESULT STDMETHODCALLTYPE d3d12_command_list_Reset(ID3D12GraphicsCommandList *iface, - ID3D12CommandAllocator *allocator, ID3D12PipelineState *initial_state) + ID3D12CommandAllocator *allocator, ID3D12PipelineState *initial_pipeline_state) { struct d3d12_command_allocator *allocator_impl = unsafe_impl_from_ID3D12CommandAllocator(allocator); struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); HRESULT hr; - TRACE("iface %p, allocator %p, initial_state %p.\n", - iface, allocator, initial_state); + TRACE("iface %p, allocator %p, initial_pipeline_state %p.\n", + iface, allocator, initial_pipeline_state); if (!allocator_impl) { @@ -1738,12 +1762,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Reset(ID3D12GraphicsCommandL if (SUCCEEDED(hr = d3d12_command_allocator_allocate_command_buffer(allocator_impl, list))) { list->allocator = allocator_impl; - - ID3D12GraphicsCommandList_SetPipelineState(&list->ID3D12GraphicsCommandList_iface, initial_state); + d3d12_command_list_reset_state(list, initial_pipeline_state); } - memset(list->pipeline_bindings, 0, sizeof(list->pipeline_bindings)); - return hr; } @@ -4239,30 +4260,12 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d list->allocator = allocator; - memset(list->strides, 0, sizeof(list->strides)); - list->primitive_topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST; - - memset(list->views, 0, sizeof(list->views)); - list->fb_width = 0; - list->fb_height = 0; - list->fb_layer_count = 0; - - list->current_framebuffer = VK_NULL_HANDLE; - list->current_pipeline = VK_NULL_HANDLE; - list->current_render_pass = VK_NULL_HANDLE; - memset(list->pipeline_bindings, 0, sizeof(list->pipeline_bindings)); - - list->state = NULL; - - if (FAILED(hr = d3d12_command_allocator_allocate_command_buffer(allocator, list))) - { + if (SUCCEEDED(hr = d3d12_command_allocator_allocate_command_buffer(allocator, list))) + d3d12_command_list_reset_state(list, initial_pipeline_state); + else ID3D12Device_Release(&device->ID3D12Device_iface); - return hr; - } - - ID3D12GraphicsCommandList_SetPipelineState(&list->ID3D12GraphicsCommandList_iface, initial_pipeline_state); - return S_OK; + return hr; } HRESULT d3d12_command_list_create(struct d3d12_device *device, -- 2.16.4

2 1

[PATCH vkd3d 08/11] vkd3d: Fix initial pipeline state.
by Józef Kucia 12 Sep '18

12 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> d3d12_command_list_begin_command_buffer() was using the previous initial pipeline state when called from d3d12_command_list_Reset(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 8 ++++---- libs/vkd3d/vkd3d_private.h | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f338707391bc..d5bbee966ecd 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -634,8 +634,6 @@ static HRESULT d3d12_command_list_begin_command_buffer(struct d3d12_command_list list->is_recording = true; list->is_valid = true; - ID3D12GraphicsCommandList_SetPipelineState(&list->ID3D12GraphicsCommandList_iface, list->pipeline_state); - return S_OK; } @@ -1740,7 +1738,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Reset(ID3D12GraphicsCommandL if (SUCCEEDED(hr = d3d12_command_allocator_allocate_command_buffer(allocator_impl, list))) { list->allocator = allocator_impl; - list->pipeline_state = initial_state; + + ID3D12GraphicsCommandList_SetPipelineState(&list->ID3D12GraphicsCommandList_iface, initial_state); } memset(list->pipeline_bindings, 0, sizeof(list->pipeline_bindings)); @@ -4239,7 +4238,6 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d ID3D12Device_AddRef(&device->ID3D12Device_iface); list->allocator = allocator; - list->pipeline_state = initial_pipeline_state; memset(list->strides, 0, sizeof(list->strides)); list->primitive_topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST; @@ -4262,6 +4260,8 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d return hr; } + ID3D12GraphicsCommandList_SetPipelineState(&list->ID3D12GraphicsCommandList_iface, initial_pipeline_state); + return S_OK; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index cb11866de66e..37ad13c132cd 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -614,7 +614,6 @@ struct d3d12_command_list LONG refcount; D3D12_COMMAND_LIST_TYPE type; - ID3D12PipelineState *pipeline_state; VkCommandBuffer vk_command_buffer; bool is_recording; -- 2.16.4

2 1

[PATCH vkd3d 05/11] vkd3d: Factor out d3d12_command_list_create_graphics_pipeline().
by Józef Kucia 12 Sep '18

12 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> In preparation for pipeline cache. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 09402699bfca..f338707391bc 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1817,7 +1817,8 @@ static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_l return true; } -static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list *list) +static VkPipeline d3d12_command_list_create_graphics_pipeline(struct d3d12_command_list *list, + const struct d3d12_graphics_pipeline_state *state) { struct VkVertexInputBindingDescription bindings[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; @@ -1826,7 +1827,6 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list struct VkPipelineColorBlendStateCreateInfo blend_desc; struct VkGraphicsPipelineCreateInfo pipeline_desc; const struct d3d12_device *device = list->device; - struct d3d12_graphics_pipeline_state *state; size_t binding_count = 0; VkPipeline vk_pipeline; unsigned int i; @@ -1858,17 +1858,6 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list .pDynamicStates = dynamic_states, }; - if (list->current_pipeline != VK_NULL_HANDLE) - return true; - - if (list->state->vk_bind_point != VK_PIPELINE_BIND_POINT_GRAPHICS) - { - WARN("Pipeline state %p has bind point %#x.\n", list->state, list->state->vk_bind_point); - return false; - } - - state = &list->state->u.graphics; - for (i = 0, mask = 0; i < state->attribute_count; ++i) { struct VkVertexInputBindingDescription *b; @@ -1945,16 +1934,36 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list 1, &pipeline_desc, NULL, &vk_pipeline))) < 0) { WARN("Failed to create Vulkan graphics pipeline, vr %d.\n", vr); - return false; + return VK_NULL_HANDLE; } if (!d3d12_command_allocator_add_pipeline(list->allocator, vk_pipeline)) { WARN("Failed to add pipeline.\n"); VK_CALL(vkDestroyPipeline(device->vk_device, vk_pipeline, NULL)); + return VK_NULL_HANDLE; + } + + return vk_pipeline; +} + +static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list *list) +{ + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + VkPipeline vk_pipeline; + + if (list->current_pipeline != VK_NULL_HANDLE) + return true; + + if (list->state->vk_bind_point != VK_PIPELINE_BIND_POINT_GRAPHICS) + { + WARN("Pipeline state %p has bind point %#x.\n", list->state, list->state->vk_bind_point); return false; } + if (!(vk_pipeline = d3d12_command_list_create_graphics_pipeline(list, &list->state->u.graphics))) + return false; + VK_CALL(vkCmdBindPipeline(list->vk_command_buffer, list->state->vk_bind_point, vk_pipeline)); list->current_pipeline = vk_pipeline; -- 2.16.4

2 1

[PATCH vkd3d 04/11] vkd3d: Reuse descriptor pools.
by Józef Kucia 12 Sep '18

12 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 68 ++++++++++++++++++++++++++++++++++++---------- libs/vkd3d/vkd3d_private.h | 4 +++ 2 files changed, 58 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 609edea1c9fb..09402699bfca 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -806,16 +806,25 @@ static VkDescriptorPool d3d12_command_allocator_allocate_descriptor_pool( VkDescriptorPool vk_pool; VkResult vr; - pool_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO; - pool_desc.pNext = NULL; - pool_desc.flags = 0; - pool_desc.maxSets = 512; - pool_desc.poolSizeCount = ARRAY_SIZE(pool_sizes); - pool_desc.pPoolSizes = pool_sizes; - if ((vr = VK_CALL(vkCreateDescriptorPool(vk_device, &pool_desc, NULL, &vk_pool))) < 0) - { - ERR("Failed to create descriptor pool, vr %d.\n", vr); - return VK_NULL_HANDLE; + if (allocator->free_descriptor_pool_count > 0) + { + vk_pool = allocator->free_descriptor_pools[allocator->free_descriptor_pool_count - 1]; + allocator->free_descriptor_pools[allocator->free_descriptor_pool_count - 1] = VK_NULL_HANDLE; + --allocator->free_descriptor_pool_count; + } + else + { + pool_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO; + pool_desc.pNext = NULL; + pool_desc.flags = 0; + pool_desc.maxSets = 512; + pool_desc.poolSizeCount = ARRAY_SIZE(pool_sizes); + pool_desc.pPoolSizes = pool_sizes; + if ((vr = VK_CALL(vkCreateDescriptorPool(vk_device, &pool_desc, NULL, &vk_pool))) < 0) + { + ERR("Failed to create descriptor pool, vr %d.\n", vr); + return VK_NULL_HANDLE; + } } if (!(d3d12_command_allocator_add_descriptor_pool(allocator, vk_pool))) @@ -886,14 +895,40 @@ static void vkd3d_buffer_destroy(struct vkd3d_buffer *buffer, struct d3d12_devic VK_CALL(vkDestroyBuffer(device->vk_device, buffer->vk_buffer, NULL)); } -static void d3d12_command_allocator_free_resources(struct d3d12_command_allocator *allocator) +static void d3d12_command_allocator_free_resources(struct d3d12_command_allocator *allocator, + bool keep_reusable_resources) { struct d3d12_device *device = allocator->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - unsigned int i; + unsigned int i, j; allocator->vk_descriptor_pool = VK_NULL_HANDLE; + if (keep_reusable_resources) + { + if (vkd3d_array_reserve((void **)&allocator->free_descriptor_pools, + &allocator->free_descriptor_pools_size, + allocator->free_descriptor_pool_count + allocator->descriptor_pool_count, + sizeof(*allocator->free_descriptor_pools))) + { + for (i = 0, j = allocator->free_descriptor_pool_count; i < allocator->descriptor_pool_count; ++i, ++j) + { + VK_CALL(vkResetDescriptorPool(device->vk_device, allocator->descriptor_pools[i], 0)); + allocator->free_descriptor_pools[j] = allocator->descriptor_pools[i]; + } + allocator->free_descriptor_pool_count += allocator->descriptor_pool_count; + allocator->descriptor_pool_count = 0; + } + } + else + { + for (i = 0; i < allocator->free_descriptor_pool_count; ++i) + { + VK_CALL(vkDestroyDescriptorPool(device->vk_device, allocator->free_descriptor_pools[i], NULL)); + } + allocator->free_descriptor_pool_count = 0; + } + for (i = 0; i < allocator->transfer_buffer_count; ++i) { vkd3d_buffer_destroy(&allocator->transfer_buffers[i], device); @@ -990,11 +1025,12 @@ static ULONG STDMETHODCALLTYPE d3d12_command_allocator_Release(ID3D12CommandAllo if (allocator->current_command_list) d3d12_command_list_allocator_destroyed(allocator->current_command_list); - d3d12_command_allocator_free_resources(allocator); + d3d12_command_allocator_free_resources(allocator, false); vkd3d_free(allocator->transfer_buffers); vkd3d_free(allocator->buffer_views); vkd3d_free(allocator->views); vkd3d_free(allocator->descriptor_pools); + vkd3d_free(allocator->free_descriptor_pools); vkd3d_free(allocator->pipelines); vkd3d_free(allocator->framebuffers); vkd3d_free(allocator->passes); @@ -1078,7 +1114,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_Reset(ID3D12CommandAllo device = allocator->device; vk_procs = &device->vk_procs; - d3d12_command_allocator_free_resources(allocator); + d3d12_command_allocator_free_resources(allocator, true); if (allocator->command_buffer_count) { VK_CALL(vkFreeCommandBuffers(device->vk_device, allocator->vk_command_pool, @@ -1168,6 +1204,10 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo allocator->vk_descriptor_pool = VK_NULL_HANDLE; + allocator->free_descriptor_pools = NULL; + allocator->free_descriptor_pools_size = 0; + allocator->free_descriptor_pool_count = 0; + allocator->passes = NULL; allocator->passes_size = 0; allocator->pass_count = 0; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 286186b46757..cb11866de66e 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -550,6 +550,10 @@ struct d3d12_command_allocator VkDescriptorPool vk_descriptor_pool; + VkDescriptorPool *free_descriptor_pools; + size_t free_descriptor_pools_size; + size_t free_descriptor_pool_count; + VkRenderPass *passes; size_t passes_size; size_t pass_count; -- 2.16.4

2 1

[PATCH vkd3d 03/11] vkd3d: Use bigger descriptor pools.
by Józef Kucia 12 Sep '18

12 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 150 ++++++++++++++++++++++++++++----------------- libs/vkd3d/vkd3d_private.h | 2 + 2 files changed, 95 insertions(+), 57 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 16c61352ed76..609edea1c9fb 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -787,6 +787,89 @@ static bool d3d12_command_allocator_add_transfer_buffer(struct d3d12_command_all return true; } +static VkDescriptorPool d3d12_command_allocator_allocate_descriptor_pool( + struct d3d12_command_allocator *allocator) +{ + static const VkDescriptorPoolSize pool_sizes[] = + { + {VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1024}, + {VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, 1024}, + {VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, 1024}, + {VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, 1024}, + {VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, 1024}, + {VK_DESCRIPTOR_TYPE_SAMPLER, 1024}, + }; + struct d3d12_device *device = allocator->device; + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + struct VkDescriptorPoolCreateInfo pool_desc; + VkDevice vk_device = device->vk_device; + VkDescriptorPool vk_pool; + VkResult vr; + + pool_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO; + pool_desc.pNext = NULL; + pool_desc.flags = 0; + pool_desc.maxSets = 512; + pool_desc.poolSizeCount = ARRAY_SIZE(pool_sizes); + pool_desc.pPoolSizes = pool_sizes; + if ((vr = VK_CALL(vkCreateDescriptorPool(vk_device, &pool_desc, NULL, &vk_pool))) < 0) + { + ERR("Failed to create descriptor pool, vr %d.\n", vr); + return VK_NULL_HANDLE; + } + + if (!(d3d12_command_allocator_add_descriptor_pool(allocator, vk_pool))) + { + ERR("Failed to add descriptor pool.\n"); + VK_CALL(vkDestroyDescriptorPool(vk_device, vk_pool, NULL)); + return VK_NULL_HANDLE; + } + + return vk_pool; +} + +static VkDescriptorSet d3d12_command_allocator_allocate_descriptor_set( + struct d3d12_command_allocator *allocator, VkDescriptorSetLayout vk_set_layout) +{ + struct d3d12_device *device = allocator->device; + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + struct VkDescriptorSetAllocateInfo set_desc; + VkDevice vk_device = device->vk_device; + VkDescriptorSet vk_descriptor_set; + VkResult vr; + + if (!allocator->vk_descriptor_pool) + allocator->vk_descriptor_pool = d3d12_command_allocator_allocate_descriptor_pool(allocator); + if (!allocator->vk_descriptor_pool) + return VK_NULL_HANDLE; + + set_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; + set_desc.pNext = NULL; + set_desc.descriptorPool = allocator->vk_descriptor_pool; + set_desc.descriptorSetCount = 1; + set_desc.pSetLayouts = &vk_set_layout; + if ((vr = VK_CALL(vkAllocateDescriptorSets(vk_device, &set_desc, &vk_descriptor_set))) >= 0) + return vk_descriptor_set; + + allocator->vk_descriptor_pool = VK_NULL_HANDLE; + if (vr == VK_ERROR_FRAGMENTED_POOL || vr == VK_ERROR_OUT_OF_POOL_MEMORY_KHR) + allocator->vk_descriptor_pool = d3d12_command_allocator_allocate_descriptor_pool(allocator); + if (!allocator->vk_descriptor_pool) + { + ERR("Failed to allocate descriptor set, vr %d.\n", vr); + return VK_NULL_HANDLE; + } + + set_desc.descriptorPool = allocator->vk_descriptor_pool; + if ((vr = VK_CALL(vkAllocateDescriptorSets(vk_device, &set_desc, &vk_descriptor_set))) < 0) + { + FIXME("Failed to allocate descriptor set from a new pool, vr %d.\n", vr); + return VK_NULL_HANDLE; + } + + return vk_descriptor_set; +} + static void d3d12_command_list_allocator_destroyed(struct d3d12_command_list *list) { TRACE("list %p.\n", list); @@ -809,6 +892,8 @@ static void d3d12_command_allocator_free_resources(struct d3d12_command_allocato const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; unsigned int i; + allocator->vk_descriptor_pool = VK_NULL_HANDLE; + for (i = 0; i < allocator->transfer_buffer_count; ++i) { vkd3d_buffer_destroy(&allocator->transfer_buffers[i], device); @@ -1081,6 +1166,8 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo return hresult_from_vk_result(vr); } + allocator->vk_descriptor_pool = VK_NULL_HANDLE; + allocator->passes = NULL; allocator->passes_size = 0; allocator->pass_count = 0; @@ -1834,55 +1921,6 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list return true; } -static VkDescriptorSet d3d12_command_list_allocate_descriptor_set(struct d3d12_command_list *list, - const VkDescriptorPoolSize *pool_sizes, unsigned int pool_size_count, - VkDescriptorSetLayout vk_set_layout) -{ - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; - VkDevice vk_device = list->device->vk_device; - struct VkDescriptorSetAllocateInfo set_desc; - struct VkDescriptorPoolCreateInfo pool_desc; - VkDescriptorSet vk_descriptor_set; - VkDescriptorPool vk_pool; - VkResult vr; - - if (!pool_size_count) - return VK_NULL_HANDLE; - - pool_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO; - pool_desc.pNext = NULL; - pool_desc.flags = 0; - pool_desc.maxSets = 1; - pool_desc.poolSizeCount = pool_size_count; - pool_desc.pPoolSizes = pool_sizes; - if ((vr = VK_CALL(vkCreateDescriptorPool(vk_device, &pool_desc, NULL, &vk_pool))) < 0) - { - ERR("Failed to create descriptor pool, vr %d.\n", vr); - return VK_NULL_HANDLE; - } - - set_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; - set_desc.pNext = NULL; - set_desc.descriptorPool = vk_pool; - set_desc.descriptorSetCount = 1; - set_desc.pSetLayouts = &vk_set_layout; - if ((vr = VK_CALL(vkAllocateDescriptorSets(vk_device, &set_desc, &vk_descriptor_set))) < 0) - { - ERR("Failed to allocate descriptor set, vr %d.\n", vr); - VK_CALL(vkDestroyDescriptorPool(vk_device, vk_pool, NULL)); - return VK_NULL_HANDLE; - } - - if (!(d3d12_command_allocator_add_descriptor_pool(list->allocator, vk_pool))) - { - ERR("Failed to add descriptor pool.\n"); - VK_CALL(vkDestroyDescriptorPool(vk_device, vk_pool, NULL)); - return VK_NULL_HANDLE; - } - - return vk_descriptor_set; -} - static void d3d12_command_list_copy_descriptors(struct d3d12_command_list *list, const struct vkd3d_pipeline_bindings *bindings, VkDescriptorSet src_set) { @@ -2010,8 +2048,8 @@ static void d3d12_command_list_prepare_descriptors(struct d3d12_command_list *li * by an update command, or freed) between when the command is recorded * and when the command completes executing on the queue." */ - bindings->descriptor_set = d3d12_command_list_allocate_descriptor_set(list, - root_signature->pool_sizes, root_signature->pool_size_count, root_signature->vk_set_layout); + bindings->descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, + root_signature->vk_set_layout); bindings->in_use = false; if (previous_descriptor_set) @@ -2175,7 +2213,6 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma VkDevice vk_device = list->device->vk_device; VkWriteDescriptorSet *vk_descriptor_writes; VkDescriptorSet vk_descriptor_set; - VkDescriptorPoolSize pool_size; unsigned int uav_counter_count; unsigned int i; @@ -2184,10 +2221,9 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma uav_counter_count = vkd3d_popcount(state->uav_counter_mask); - pool_size.type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; - pool_size.descriptorCount = uav_counter_count; - vk_descriptor_set = d3d12_command_list_allocate_descriptor_set(list, - &pool_size, 1, state->vk_set_layout); + vk_descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, state->vk_set_layout); + if (!vk_descriptor_set) + return; if (!(vk_descriptor_writes = vkd3d_calloc(uav_counter_count, sizeof(*vk_descriptor_writes)))) return; @@ -2205,7 +2241,7 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma vk_descriptor_writes[i].dstBinding = uav_counter->binding.binding; vk_descriptor_writes[i].dstArrayElement = 0; vk_descriptor_writes[i].descriptorCount = 1; - vk_descriptor_writes[i].descriptorType = pool_size.type; + vk_descriptor_writes[i].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; vk_descriptor_writes[i].pImageInfo = NULL; vk_descriptor_writes[i].pBufferInfo = NULL; vk_descriptor_writes[i].pTexelBufferView = &vk_uav_counter_views[uav_counter->register_index]; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index df444471cf5b..286186b46757 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -548,6 +548,8 @@ struct d3d12_command_allocator VkCommandPool vk_command_pool; + VkDescriptorPool vk_descriptor_pool; + VkRenderPass *passes; size_t passes_size; size_t pass_count; -- 2.16.4

2 1

[PATCH vkd3d 02/11] vkd3d: Factor out d3d12_resource_init().
by Józef Kucia 12 Sep '18

12 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> In preparation for placed resources. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 53 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 37c8dff21073..88ab64552bb5 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -893,7 +893,7 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) return S_OK; } -static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, struct d3d12_device *device, +static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, const D3D12_CLEAR_VALUE *optimized_clear_value) @@ -941,6 +941,7 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st WARN("Ignoring optimized clear value.\n"); resource->gpu_address = 0; + resource->vk_memory = VK_NULL_HANDLE; resource->flags = 0; if (FAILED(hr = d3d12_resource_validate_desc(&resource->desc))) @@ -959,12 +960,6 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st d3d12_resource_destroy(resource, device); return E_OUTOFMEMORY; } - if (FAILED(hr = vkd3d_allocate_buffer_memory(device, resource->u.vk_buffer, - heap_properties, heap_flags, &resource->vk_memory))) - { - d3d12_resource_destroy(resource, device); - return hr; - } break; case D3D12_RESOURCE_DIMENSION_TEXTURE1D: @@ -975,12 +970,6 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st resource->flags |= VKD3D_RESOURCE_INITIAL_STATE_TRANSITION; if (FAILED(hr = vkd3d_create_image(resource, device, heap_properties, heap_flags))) return hr; - if (FAILED(hr = vkd3d_allocate_image_memory(device, resource->u.vk_image, - heap_properties, heap_flags, &resource->vk_memory))) - { - d3d12_resource_destroy(resource, device); - return hr; - } break; default: @@ -1001,7 +990,7 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st return S_OK; } -HRESULT d3d12_committed_resource_create(struct d3d12_device *device, +static HRESULT d3d12_resource_create(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) @@ -1012,13 +1001,47 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d12_committed_resource_init(object, device, heap_properties, heap_flags, + if (FAILED(hr = d3d12_resource_init(object, device, heap_properties, heap_flags, desc, initial_state, optimized_clear_value))) { vkd3d_free(object); return hr; } + *resource = object; + + return hr; +} + +HRESULT d3d12_committed_resource_create(struct d3d12_device *device, + const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, + const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, + const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) +{ + struct d3d12_resource *object; + HRESULT hr; + + if (FAILED(hr = d3d12_resource_create(device, heap_properties, heap_flags, + desc, initial_state, optimized_clear_value, &object))) + return hr; + + if (d3d12_resource_is_buffer(object)) + { + hr = vkd3d_allocate_buffer_memory(device, object->u.vk_buffer, + heap_properties, heap_flags, &object->vk_memory); + } + else + { + hr = vkd3d_allocate_image_memory(device, object->u.vk_image, + heap_properties, heap_flags, &object->vk_memory); + } + + if (FAILED(hr)) + { + d3d12_resource_Release(&object->ID3D12Resource_iface); + return hr; + } + TRACE("Created committed resource %p.\n", object); *resource = object; -- 2.16.4

2 1