June 2019 - Wine-devel - list.winehq.org

[PATCH vkd3d 6/7] vkd3d: Implement D3D12_RESOURCE_STATE_PREDICATION resource barriers.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 5a5b6a220437..6423640ed4ae 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1861,7 +1861,7 @@ static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *li } static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, - const struct d3d12_resource *resource, VkQueueFlags vk_queue_flags, + const struct d3d12_resource *resource, VkQueueFlags vk_queue_flags, const struct vkd3d_vulkan_info *vk_info, VkAccessFlags *access_mask, VkPipelineStageFlags *stage_flags, VkImageLayout *image_layout) { bool is_swapchain_image = resource && (resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION); @@ -1900,7 +1900,7 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, else if (resource->present_state != D3D12_RESOURCE_STATE_COMMON) { vk_barrier_parameters_from_d3d12_resource_state(resource->present_state, - resource, vk_queue_flags, access_mask, stage_flags, image_layout); + resource, vk_queue_flags, vk_info, access_mask, stage_flags, image_layout); return true; } } @@ -2035,6 +2035,11 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, { *access_mask |= VK_ACCESS_INDIRECT_COMMAND_READ_BIT; *stage_flags |= VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT; + if (vk_info->EXT_conditional_rendering) + { + *access_mask |= VK_ACCESS_CONDITIONAL_RENDERING_READ_BIT_EXT; + *stage_flags |= VK_PIPELINE_STAGE_CONDITIONAL_RENDERING_BIT_EXT; + } state &= ~D3D12_RESOURCE_STATE_INDIRECT_ARGUMENT; } @@ -2057,6 +2062,7 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 struct d3d12_resource *resource) { const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + const struct vkd3d_vulkan_info *vk_info = &list->device->vk_info; VkPipelineStageFlags src_stage_mask, dst_stage_mask; const struct vkd3d_format *format; VkImageMemoryBarrier barrier; @@ -2079,7 +2085,7 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 VK_IMAGE_LAYOUT_PREINITIALIZED : VK_IMAGE_LAYOUT_UNDEFINED; if (!vk_barrier_parameters_from_d3d12_resource_state(resource->initial_state, - resource, list->vk_queue_flags, &barrier.dstAccessMask, &dst_stage_mask, &barrier.newLayout)) + resource, list->vk_queue_flags, vk_info, &barrier.dstAccessMask, &dst_stage_mask, &barrier.newLayout)) { FIXME("Unhandled state %#x.\n", resource->initial_state); return; @@ -3701,11 +3707,13 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); bool have_aliasing_barriers = false, have_split_barriers = false; const struct vkd3d_vk_device_procs *vk_procs; + const struct vkd3d_vulkan_info *vk_info; unsigned int i; TRACE("iface %p, barrier_count %u, barriers %p.\n", iface, barrier_count, barriers); vk_procs = &list->device->vk_procs; + vk_info = &list->device->vk_info; d3d12_command_list_end_current_render_pass(list); @@ -3749,13 +3757,13 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC sub_resource_idx = transition->Subresource; if (!vk_barrier_parameters_from_d3d12_resource_state(transition->StateBefore, - resource, list->vk_queue_flags, &src_access_mask, &src_stage_mask, &layout_before)) + resource, list->vk_queue_flags, vk_info, &src_access_mask, &src_stage_mask, &layout_before)) { FIXME("Unhandled state %#x.\n", transition->StateBefore); continue; } if (!vk_barrier_parameters_from_d3d12_resource_state(transition->StateAfter, - resource, list->vk_queue_flags, &dst_access_mask, &dst_stage_mask, &layout_after)) + resource, list->vk_queue_flags, vk_info, &dst_access_mask, &dst_stage_mask, &layout_after)) { FIXME("Unhandled state %#x.\n", transition->StateAfter); continue; @@ -3775,7 +3783,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC resource = unsafe_impl_from_ID3D12Resource(uav->pResource); vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, - resource, list->vk_queue_flags, &access_mask, &stage_mask, &image_layout); + resource, list->vk_queue_flags, vk_info, &access_mask, &stage_mask, &image_layout); src_access_mask = dst_access_mask = access_mask; src_stage_mask = dst_stage_mask = stage_mask; layout_before = layout_after = image_layout; @@ -4645,6 +4653,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); const struct vkd3d_vk_device_procs *vk_procs; + const struct vkd3d_vulkan_info *vk_info; const struct d3d12_desc *cpu_descriptor; struct d3d12_resource *resource_impl; VkBufferMemoryBarrier buffer_barrier; @@ -4657,6 +4666,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID iface, gpu_handle.ptr, cpu_handle.ptr, resource, values, rect_count, rects); vk_procs = &list->device->vk_procs; + vk_info = &list->device->vk_info; resource_impl = unsafe_impl_from_ID3D12Resource(resource); @@ -4693,7 +4703,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID buffer_barrier.size = cpu_descriptor->uav.buffer.size; vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, - resource_impl, list->vk_queue_flags, &buffer_barrier.dstAccessMask, &stage_mask, NULL); + resource_impl, list->vk_queue_flags, vk_info, &buffer_barrier.dstAccessMask, &stage_mask, NULL); VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, stage_mask, 0, @@ -4726,7 +4736,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID image_barrier.subresourceRange = range; vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, - resource_impl, list->vk_queue_flags, &image_barrier.dstAccessMask, &stage_mask, NULL); + resource_impl, list->vk_queue_flags, vk_info, &image_barrier.dstAccessMask, &stage_mask, NULL); VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, stage_mask, 0, -- 2.21.0

2 1

[PATCH vkd3d 2/7] tests: Fix test failures in conditional rendering tests.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 9 ++++++++- tests/d3d12_crosstest.h | 27 +++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 79c30ec2465f..b75cd996a2ff 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -30553,6 +30553,13 @@ static void test_conditional_rendering(void) command_list = context.list; queue = context.queue; + if (is_intel_windows_device(context.device)) + { + skip("Predicated rendering is broken on Intel.\n"); + destroy_test_context(&context); + return; + } + conditions = create_default_buffer(context.device, sizeof(predicate_args), D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); upload_buffer_data(conditions, 0, sizeof(predicate_args), &predicate_args, queue, command_list); @@ -30587,7 +30594,7 @@ static void test_conditional_rendering(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0); + todo check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, context.render_target, diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 4a490628e483..22844ab398e7 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -323,14 +323,15 @@ static void init_adapter_info(void) IDXGIAdapter_Release(dxgi_adapter); } -static inline bool is_amd_windows_device(ID3D12Device *device) +static inline bool get_adapter_desc(ID3D12Device *device, DXGI_ADAPTER_DESC *desc) { - DXGI_ADAPTER_DESC desc = {0}; IDXGIFactory4 *factory; IDXGIAdapter *adapter; HRESULT hr; LUID luid; + memset(desc, 0, sizeof(*desc)); + if (!vkd3d_test_platform_is_windows()) return false; @@ -342,14 +343,27 @@ static inline bool is_amd_windows_device(ID3D12Device *device) hr = IDXGIFactory4_EnumAdapterByLuid(factory, luid, &IID_IDXGIAdapter, (void **)&adapter); if (SUCCEEDED(hr)) { - hr = IDXGIAdapter_GetDesc(adapter, &desc); + hr = IDXGIAdapter_GetDesc(adapter, desc); ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); IDXGIAdapter_Release(adapter); } IDXGIFactory4_Release(factory); + return SUCCEEDED(hr); +} + +static inline bool is_amd_windows_device(ID3D12Device *device) +{ + DXGI_ADAPTER_DESC desc; + + return get_adapter_desc(device, &desc) && desc.VendorId == 0x1002; +} + +static inline bool is_intel_windows_device(ID3D12Device *device) +{ + DXGI_ADAPTER_DESC desc; - return desc.VendorId == 0x1002; + return get_adapter_desc(device, &desc) && desc.VendorId == 0x8086; } static inline bool is_mesa_device(ID3D12Device *device) @@ -566,6 +580,11 @@ static inline bool is_amd_windows_device(ID3D12Device *device) return false; } +static inline bool is_intel_windows_device(ID3D12Device *device) +{ + return false; +} + static inline bool is_mesa_device(ID3D12Device *device) { VkPhysicalDeviceDriverPropertiesKHR properties; -- 2.21.0

2 1

[PATCH vkd3d 7/7] tests: Add test to confirm predicate must not be read before every rendering command.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> In Vulkan both behaviors are allowed. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index b75cd996a2ff..f8a4f94c5036 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -30668,6 +30668,39 @@ static void test_conditional_rendering(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + /* Direct3D latches the value of the predicate upon beginning predicated rendering. */ + buffer = create_default_buffer(context.device, sizeof(predicate_args), + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + transition_resource_state(command_list, conditions, + D3D12_RESOURCE_STATE_PREDICATION, D3D12_RESOURCE_STATE_COPY_SOURCE); + ID3D12GraphicsCommandList_CopyResource(command_list, buffer, conditions); + transition_resource_state(command_list, + buffer, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PREDICATION); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + prepare_instanced_draw(&context); + ID3D12GraphicsCommandList_SetPredication(command_list, buffer, 0, D3D12_PREDICATION_OP_NOT_EQUAL_ZERO); + + transition_resource_state(command_list, buffer, + D3D12_RESOURCE_STATE_PREDICATION, D3D12_RESOURCE_STATE_COPY_DEST); + ID3D12GraphicsCommandList_CopyBufferRegion(command_list, buffer, 0, conditions, sizeof(uint64_t), sizeof(uint64_t)); + transition_resource_state(command_list, + buffer, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PREDICATION); + transition_resource_state(command_list, + conditions, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_PREDICATION); + + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + ID3D12GraphicsCommandList_SetPredication(command_list, NULL, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + ID3D12Resource_Release(buffer); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + /* ExecuteIndirect(). */ buffer = create_upload_buffer(context.device, sizeof(draw_args), &draw_args); -- 2.21.0

2 1

[PATCH vkd3d 4/7] vkd3d: End conditional rendering before ending command buffer.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 133c23328201..5a5b6a220437 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2245,6 +2245,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Close(ID3D12GraphicsCommandL vk_procs = &list->device->vk_procs; d3d12_command_list_end_current_render_pass(list); + if (list->is_predicated) + VK_CALL(vkCmdEndConditionalRenderingEXT(list->vk_command_buffer)); if ((vr = VK_CALL(vkEndCommandBuffer(list->vk_command_buffer))) < 0) { -- 2.21.0

2 1

[PATCH vkd3d 5/7] vkd3d: Set VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT for buffers.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index d005fa8865aa..bcf523e47d75 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -523,10 +523,16 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; - if (heap_type == D3D12_HEAP_TYPE_DEFAULT && device->vk_info.EXT_transform_feedback) + if (heap_type == D3D12_HEAP_TYPE_DEFAULT) { - buffer_info.usage |= VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT - | VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT; + if (device->vk_info.EXT_conditional_rendering) + buffer_info.usage |= VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT; + + if (device->vk_info.EXT_transform_feedback) + { + buffer_info.usage |= VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT + | VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT; + } } if (heap_type == D3D12_HEAP_TYPE_UPLOAD) -- 2.21.0

2 1

[PATCH vkd3d 3/7] vkd3d: Begin and end conditional rendering outside render passes.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> The Vulkan spec says: "Conditional rendering must also either begin and end inside the same subpass of a render pass instance, or must both begin and end outside of a render pass instance (i.e. contain entire render pass instances)." Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4723e7969012..133c23328201 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4928,11 +4928,14 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPredication(ID3D12GraphicsCo vk_procs = &list->device->vk_procs; + /* FIXME: Add support for conditional rendering in render passes. */ + d3d12_command_list_end_current_render_pass(list); + if (resource) { VkConditionalRenderingBeginInfoEXT cond_info; - if (aligned_buffer_offset & (sizeof(UINT64) - 1)) + if (aligned_buffer_offset & (sizeof(uint64_t) - 1)) { WARN("Unaligned predicate argument buffer offset %#"PRIx64".\n", aligned_buffer_offset); return; @@ -4944,7 +4947,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPredication(ID3D12GraphicsCo return; } - FIXME("Predication doesn't support clear and copy commands, " + FIXME_ONCE("Predication doesn't support clear and copy commands, " "and predication values are treated as 32-bit values.\n"); cond_info.sType = VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT; -- 2.21.0

2 1

[PATCH vkd3d 1/7] tests: Fix test_conditional_rendering().
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Fixes crashes, Vulkan and Direct3D validation errors. * Fix state transitions. * Use a multisample texture with ResolveSubresource(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 42 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 0c70d5f4a856..79c30ec2465f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -30489,8 +30489,11 @@ static void test_conditional_rendering(void) ID3D12GraphicsCommandList *command_list; D3D12_ROOT_PARAMETER root_parameters[2]; ID3D12Resource *texture, *texture_copy; + D3D12_RENDER_TARGET_VIEW_DESC rtv_desc; + D3D12_HEAP_PROPERTIES heap_properties; ID3D12PipelineState *pipeline_state; ID3D12RootSignature *root_signature; + D3D12_RESOURCE_DESC resource_desc; struct test_context context; ID3D12Resource *buffer, *cb; struct resource_readback rb; @@ -30505,6 +30508,7 @@ static void test_conditional_rendering(void) static const D3D12_DRAW_ARGUMENTS draw_args = {3, 1, 0, 0}; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + static const float ms_color[] = {0.345f, 0.282f, 0.219f, 0.156f}; static const uint32_t init_value = 0xdeadbeef; static const D3D12_SUBRESOURCE_DATA copy_data[] = { @@ -30654,6 +30658,8 @@ static void test_conditional_rendering(void) todo check_readback_data_uint(&rb, NULL, 0xffffffff, 0); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); /* ExecuteIndirect(). */ buffer = create_upload_buffer(context.device, sizeof(draw_args), &draw_args); @@ -30730,17 +30736,43 @@ static void test_conditional_rendering(void) check_sub_resource_uint(texture_copy, 0, queue, command_list, r8g8b8a8_data[0], 0); - /* ResolveSubresource(). */ + /* Multisample texture. */ + ID3D12Resource_Release(texture); + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; + + memset(&resource_desc, 0, sizeof(resource_desc)); + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Width = 1; + resource_desc.Height = 1; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 4; + resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + hr = ID3D12Device_CreateCommittedResource(context.device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, NULL, &IID_ID3D12Resource, (void **)&texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + memset(&rtv_desc, 0, sizeof(rtv_desc)); + rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DMS; + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + ID3D12Device_CreateRenderTargetView(context.device, texture, &rtv_desc, + get_cpu_rtv_handle(&context, context.rtv_heap, 0)); + reset_command_list(command_list, context.allocator); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, ms_color, 0, NULL); + + /* ResolveSubresource(). */ transition_resource_state(command_list, texture_copy, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST); upload_texture_data(texture_copy, &copy_data[1], 1, queue, command_list); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, texture_copy, - D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RESOLVE_DEST); + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_RESOLVE_DEST); transition_resource_state(command_list, texture, - D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RESOLVE_SOURCE); + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_RESOLVE_SOURCE); /* Skip. */ ID3D12GraphicsCommandList_SetPredication(command_list, conditions, 0, D3D12_PREDICATION_OP_EQUAL_ZERO); @@ -30768,7 +30800,7 @@ static void test_conditional_rendering(void) transition_resource_state(command_list, texture_copy, D3D12_RESOURCE_STATE_RESOLVE_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_uint(texture_copy, 0, queue, command_list, r8g8b8a8_data[0], 0); + check_sub_resource_uint(texture_copy, 0, queue, command_list, r8g8b8a8_data[0], 2); reset_command_list(command_list, context.allocator); @@ -30777,7 +30809,7 @@ static void test_conditional_rendering(void) buffer = create_default_buffer(context.device, 512, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); - upload_buffer_data(buffer, 0, sizeof(uint32_t), &init_value, queue, command_list); + upload_buffer_data(buffer, 0, sizeof(init_value), &init_value, queue, command_list); reset_command_list(command_list, context.allocator); transition_sub_resource_state(command_list, buffer, 0, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); -- 2.21.0

2 1

[PATCH vkd3d 5/8] vkd3d: Use vkd3d_waiting_fence structure in more places.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 17 +++++++---------- libs/vkd3d/vkd3d_private.h | 21 ++++++++++----------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index b145413efdc3..fd7f32231280 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -247,6 +247,7 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, VkFence vk_fence, struct d3d12_fence *fence, uint64_t value, struct vkd3d_queue *queue, uint64_t queue_sequence_number) { + struct vkd3d_waiting_fence *waiting_fence; int rc; TRACE("worker %p, fence %p, value %#"PRIx64".\n", worker, fence, value); @@ -266,10 +267,11 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, } worker->enqueued_fences[worker->enqueued_fence_count].vk_fence = vk_fence; - worker->enqueued_fences[worker->enqueued_fence_count].fence = fence; - worker->enqueued_fences[worker->enqueued_fence_count].value = value; - worker->enqueued_fences[worker->enqueued_fence_count].queue = queue; - worker->enqueued_fences[worker->enqueued_fence_count].queue_sequence_number = queue_sequence_number; + waiting_fence = &worker->enqueued_fences[worker->enqueued_fence_count].waiting_fence; + waiting_fence->fence = fence; + waiting_fence->value = value; + waiting_fence->queue = queue; + waiting_fence->queue_sequence_number = queue_sequence_number; ++worker->enqueued_fence_count; InterlockedIncrement(&fence->pending_worker_operation_count); @@ -337,12 +339,7 @@ static void vkd3d_fence_worker_move_enqueued_fences_locked(struct vkd3d_fence_wo struct vkd3d_enqueued_fence *current = &worker->enqueued_fences[i]; worker->vk_fences[worker->fence_count] = current->vk_fence; - - worker->fences[worker->fence_count].fence = current->fence; - worker->fences[worker->fence_count].value = current->value; - worker->fences[worker->fence_count].queue = current->queue; - worker->fences[worker->fence_count].queue_sequence_number = current->queue_sequence_number; - + worker->fences[worker->fence_count] = current->waiting_fence; ++worker->fence_count; } assert(worker->fence_count == count); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index e22549d5055d..f31c250fedfd 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -151,6 +151,14 @@ HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN; HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN; +struct vkd3d_waiting_fence +{ + struct d3d12_fence *fence; + uint64_t value; + struct vkd3d_queue *queue; + uint64_t queue_sequence_number; +}; + struct vkd3d_fence_worker { union vkd3d_thread_handle thread; @@ -164,23 +172,14 @@ struct vkd3d_fence_worker struct vkd3d_enqueued_fence { VkFence vk_fence; - struct d3d12_fence *fence; - uint64_t value; - struct vkd3d_queue *queue; - uint64_t queue_sequence_number; + struct vkd3d_waiting_fence waiting_fence; } *enqueued_fences; size_t enqueued_fences_size; size_t fence_count; VkFence *vk_fences; size_t vk_fences_size; - struct vkd3d_waiting_fence - { - struct d3d12_fence *fence; - uint64_t value; - struct vkd3d_queue *queue; - uint64_t queue_sequence_number; - } *fences; + struct vkd3d_waiting_fence *fences; size_t fences_size; struct d3d12_device *device; -- 2.21.0

2 1

[PATCH vkd3d 8/8] include/vkd3d_utils: Declare all exported functions.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- demos/demo.h | 1 - demos/demo_xcb.h | 1 + include/vkd3d_utils.h | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/demos/demo.h b/demos/demo.h index 2869ea7b5eba..b2b931728241 100644 --- a/demos/demo.h +++ b/demos/demo.h @@ -141,7 +141,6 @@ static inline HRESULT demo_create_root_signature(ID3D12Device *device, #ifdef _WIN32 #include "demo_win32.h" #else -#include <vkd3d_utils.h> #define INFINITE VKD3D_INFINITE #include "demo_xcb.h" #endif diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index 40e25340b3f1..6fae7909769c 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -19,6 +19,7 @@ #define VK_USE_PLATFORM_XCB_KHR #include <vkd3d.h> +#include <vkd3d_utils.h> #include <xcb/xcb_event.h> #include <xcb/xcb_icccm.h> #include <xcb/xcb_keysyms.h> diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index 8a5689a80c3d..4a5ee5dd6ae7 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -19,6 +19,8 @@ #ifndef __VKD3D_UTILS_H #define __VKD3D_UTILS_H +#include <vkd3d.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -34,6 +36,18 @@ HRESULT vkd3d_signal_event(HANDLE event); unsigned int vkd3d_wait_event(HANDLE event, unsigned int milliseconds); void vkd3d_destroy_event(HANDLE event); +HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL feature_level, REFIID iid, void **device); +HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); +HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug); +HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *desc, + D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); + +/* 1.2 */ +HRESULT WINAPI D3D12CreateVersionedRootSignatureDeserializer(const void *data, + SIZE_T data_size, REFIID iid, void **deserializer); +HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **blob, ID3DBlob **error_blob); + #ifdef __cplusplus } #endif /* __cplusplus */ -- 2.21.0

2 1

[PATCH vkd3d 7/8] tests: Add test for parsing version.
by Józef Kucia 18 Jun '19

18 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 1 + include/private/vkd3d_common.h | 14 ++++++++++ libs/vkd3d/device.c | 15 +---------- tests/vkd3d_common.c | 49 ++++++++++++++++++++++++++++++++++ 4 files changed, 65 insertions(+), 14 deletions(-) create mode 100644 tests/vkd3d_common.c diff --git a/Makefile.am b/Makefile.am index 299ec2603b46..fe3a363977c2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,6 +36,7 @@ vkd3d_demos_shaders = \ vkd3d_tests = \ tests/vkd3d_api \ + tests/vkd3d_common \ tests/vkd3d_shader_api vkd3d_cross_tests = \ diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 16c31e633ab1..c696f8858cd3 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -22,6 +22,8 @@ #include "config.h" #include "vkd3d_windows.h" +#include <ctype.h> + #ifndef ARRAY_SIZE # define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) #endif @@ -137,4 +139,16 @@ static inline LONG InterlockedDecrement(LONG volatile *x) # error "atomic_add_fetch() not implemented for this platform" #endif /* HAVE_SYNC_ADD_AND_FETCH */ +static inline void vkd3d_parse_version(const char *version, int *major, int *minor) +{ + *major = atoi(version); + + while (isdigit(*version)) + ++version; + if (*version == '.') + ++version; + + *minor = atoi(version); +} + #endif /* __VKD3D_COMMON_H */ diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index c93e6785ed01..9f8c0ac65916 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -18,8 +18,6 @@ #include "vkd3d_private.h" -#include <ctype.h> - #ifdef HAVE_DLFCN_H #include <dlfcn.h> @@ -94,20 +92,9 @@ struct vk_struct static uint32_t vkd3d_get_vk_version(void) { - const char *ptr = PACKAGE_VERSION; int major, minor; - major = atoi(ptr); - - while (isdigit(*ptr)) - ++ptr; - if (*ptr == '.') - ++ptr; - - minor = atoi(ptr); - - TRACE("Version %d.%d.\n", major, minor); - + vkd3d_parse_version(PACKAGE_VERSION, &major, &minor); return VK_MAKE_VERSION(major, minor, 0); } diff --git a/tests/vkd3d_common.c b/tests/vkd3d_common.c new file mode 100644 index 000000000000..379c8b06e3c7 --- /dev/null +++ b/tests/vkd3d_common.c @@ -0,0 +1,49 @@ +/* + * Copyright 2019 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "vkd3d_common.h" +#include "vkd3d_test.h" + +static void check_version(const char *v, int expected_major, int expected_minor) +{ + int major, minor; + + vkd3d_parse_version(v, &major, &minor); + ok(major == expected_major && minor == expected_minor, + "Got %d.%d, expected %d.%d for %s.\n", + major, minor, expected_major, expected_minor, v); +} + +static void test_parse_version(void) +{ + check_version("", 0, 0); + check_version(".3", 0, 3); + check_version(".4.5", 0, 4); + + check_version("1", 1, 0); + check_version("2", 2, 0); + + check_version("1.0", 1, 0); + check_version("1.1", 1, 1); + check_version("2.3.0", 2, 3); +} + +START_TEST(vkd3d_common) +{ + run_test(test_parse_version); +} -- 2.21.0

2 1