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

[PATCH vkd3d 7/7] tests: Add basic test for NULL UAVs.
by Józef Kucia 04 Jun '19

04 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 024a956a4cdd..d6cd4e014660 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -17176,6 +17176,169 @@ static void test_null_srv(void) destroy_test_context(&context); } +static void test_null_uav(void) +{ + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_DESCRIPTOR_RANGE descriptor_ranges[1]; + D3D12_ROOT_PARAMETER root_parameters[2]; + const D3D12_SHADER_BYTECODE *current_ps; + ID3D12GraphicsCommandList *command_list; + D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle; + ID3D12DescriptorHeap *uav_heap; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Device *device; + unsigned int i; + HRESULT hr; + + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD ps_ld_texture_code[] = + { +#if 0 + RWTexture2D<float> u; + + float4 main(float4 position : SV_Position) : SV_Target + { + float2 s; + u.GetDimensions(s.x, s.y); + return u[s * float2(position.x / 640.0f, position.y / 480.0f)]; + } +#endif + 0x43425844, 0x85c096ab, 0x210d7572, 0xdb1951af, 0x4dadced7, 0x00000001, 0x00000194, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000f8, 0x00000050, + 0x0000003e, 0x0100086a, 0x0400189c, 0x0011e000, 0x00000001, 0x00005555, 0x04002064, 0x00101032, + 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x8900003d, + 0x800000c2, 0x00155543, 0x00100032, 0x00000000, 0x00004001, 0x00000000, 0x0011ee46, 0x00000001, + 0x07000038, 0x001000f2, 0x00000000, 0x00100546, 0x00000000, 0x00101546, 0x00000000, 0x0a000038, + 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x3b088889, + 0x3b088889, 0x0500001c, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x890000a3, 0x800000c2, + 0x00155543, 0x00100012, 0x00000000, 0x00100e46, 0x00000000, 0x0011ee46, 0x00000001, 0x05000036, + 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_ld_texture = {ps_ld_texture_code, sizeof(ps_ld_texture_code)}; + static const DWORD ps_ld_buffer_code[] = + { +#if 0 + RWByteAddressBuffer u; + + uint location; + + float4 main(float4 position : SV_Position) : SV_Target + { + return u.Load(4 * location); + } +#endif + 0x43425844, 0xde636789, 0x7bc99233, 0x8b0609b6, 0x4b9a958e, 0x00000001, 0x00000134, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000098, 0x00000050, + 0x00000026, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300009d, 0x0011e000, + 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x08000029, 0x00100012, + 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x00004001, 0x00000002, 0x890000a5, 0x800002c2, + 0x00199983, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x0011e006, 0x00000001, 0x05000056, + 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_ld_buffer = {ps_ld_buffer_code, sizeof(ps_ld_buffer_code)}; + static const struct test + { + const D3D12_SHADER_BYTECODE *ps; + D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc; + uint32_t location; + } + tests[] = + { + {&ps_ld_texture, {DXGI_FORMAT_R32_UINT, D3D12_UAV_DIMENSION_TEXTURE2D}, 0}, + {&ps_ld_buffer, + {DXGI_FORMAT_R32_TYPELESS, D3D12_UAV_DIMENSION_BUFFER, .Buffer = {0, 1024, .Flags = D3D12_BUFFER_UAV_FLAG_RAW}}, + 0}, + {&ps_ld_buffer, + {DXGI_FORMAT_R32_TYPELESS, D3D12_UAV_DIMENSION_BUFFER, .Buffer = {0, 1024, .Flags = D3D12_BUFFER_UAV_FLAG_RAW}}, + 1024}, + }; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV; + descriptor_ranges[0].NumDescriptors = 1; + descriptor_ranges[0].BaseShaderRegister = 1; + descriptor_ranges[0].RegisterSpace = 0; + descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0; + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 1; + root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; + root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS; + root_parameters[1].Constants.ShaderRegister = 0; + root_parameters[1].Constants.RegisterSpace = 0; + root_parameters[1].Constants.Num32BitValues = 1; + root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); + root_signature_desc.pParameters = root_parameters; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; + hr = create_root_signature(device, &root_signature_desc, &context.root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + uav_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + + current_ps = NULL; + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + const struct test *test = &tests[i]; + + vkd3d_test_set_context("Test %u", i); + + if (current_ps != test->ps) + { + if (context.pipeline_state) + ID3D12PipelineState_Release(context.pipeline_state); + current_ps = tests[i].ps; + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, current_ps, NULL); + } + + cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(uav_heap); + ID3D12Device_CreateUnorderedAccessView(device, NULL, NULL, &test->uav_desc, cpu_handle); + + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &uav_heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(uav_heap)); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstant(command_list, 1, test->location, 0); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_sub_resource_state(command_list, context.render_target, 0, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0); + + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, context.render_target, 0, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + vkd3d_test_set_context(NULL); + + ID3D12DescriptorHeap_Release(uav_heap); + destroy_test_context(&context); +} + static void test_null_vbv(void) { ID3D12GraphicsCommandList *command_list; @@ -29510,6 +29673,7 @@ START_TEST(d3d12) run_test(test_create_null_descriptors); run_test(test_null_cbv); run_test(test_null_srv); + run_test(test_null_uav); run_test(test_null_vbv); run_test(test_get_copyable_footprints); run_test(test_depth_clip); -- 2.21.0

2 1

[PATCH vkd3d 6/7] tests: Add test for buffer NULL SRV.
by Józef Kucia 04 Jun '19

04 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5c445632dbc9..024a956a4cdd 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -17007,6 +17007,29 @@ static void test_null_srv(void) 0x001020f2, 0x00000000, 0x00208a46, 0x00000000, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps_ld = {ps_ld_code, sizeof(ps_ld_code)}; + static const DWORD ps_buffer_code[] = + { +#if 0 + ByteAddressBuffer t; + + uint location; + + float4 main(float4 position : SV_Position) : SV_Target + { + return t.Load(location); + } +#endif + 0x43425844, 0x70170f6b, 0x16097169, 0x714f155c, 0x1e3d860f, 0x00000001, 0x00000118, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000007c, 0x00000050, + 0x0000001f, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x030000a1, 0x00107000, + 0x00000000, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x8a0000a5, 0x800002c2, + 0x00199983, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x00107006, 0x00000000, + 0x05000056, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_buffer = {ps_buffer_code, sizeof(ps_buffer_code)}; static const DXGI_FORMAT formats[] = { DXGI_FORMAT_R32_FLOAT, @@ -17112,6 +17135,43 @@ static void test_null_srv(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0); + /* buffer */ + ID3D12PipelineState_Release(context.pipeline_state); + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, &ps_buffer, NULL); + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, context.render_target, 0, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + memset(&srv_desc, 0, sizeof(srv_desc)); + srv_desc.Format = DXGI_FORMAT_R32_TYPELESS; + srv_desc.ViewDimension = D3D12_SRV_DIMENSION_BUFFER; + srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING; + srv_desc.Buffer.FirstElement = 0; + srv_desc.Buffer.NumElements = 1024; + srv_desc.Buffer.Flags = D3D12_BUFFER_SRV_FLAG_RAW; + ID3D12Device_CreateShaderResourceView(device, NULL, &srv_desc, + ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap)); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap)); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + location.x = 0; + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &location, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_sub_resource_state(command_list, context.render_target, 0, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0); + ID3D12DescriptorHeap_Release(heap); destroy_test_context(&context); } -- 2.21.0

2 1

[PATCH vkd3d 5/7] vkd3d: Add partial support for 2D NULL UAV.
by Józef Kucia 04 Jun '19

04 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 93 +++++++++++++++++++++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 3 ++ 2 files changed, 94 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index cd3f57251f3a..c3c92386da08 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2251,7 +2251,9 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, struct d3d12_device *device, const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc) { struct vkd3d_null_resources *null_resources = &device->null_resources; + struct vkd3d_texture_view_desc vkd3d_desc; struct vkd3d_view *view; + VkImage vk_image; if (!desc) { @@ -2262,7 +2264,7 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, switch (desc->ViewDimension) { case D3D12_UAV_DIMENSION_BUFFER: - WARN("Creating NULL UAV %#x.\n", desc->Format); + WARN("Creating NULL buffer UAV %#x.\n", desc->Format); if (vkd3d_create_buffer_view(device, null_resources->vk_storage_buffer, vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false), @@ -2272,12 +2274,41 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; descriptor->u.view = view; } + return; + + case D3D12_UAV_DIMENSION_TEXTURE2D: + vk_image = null_resources->vk_2d_storage_image; + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; + break; + case D3D12_UAV_DIMENSION_TEXTURE2DARRAY: + vk_image = null_resources->vk_2d_storage_image; + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); - break; + return; } + + WARN("Creating NULL UAV %#x.\n", desc->ViewDimension); + + vkd3d_desc.format = vkd3d_get_format(device, VKD3D_NULL_VIEW_FORMAT, false); + vkd3d_desc.miplevel_idx = 0; + vkd3d_desc.miplevel_count = 1; + vkd3d_desc.layer_idx = 0; + vkd3d_desc.layer_count = 1; + vkd3d_desc.components.r = VK_COMPONENT_SWIZZLE_R; + vkd3d_desc.components.g = VK_COMPONENT_SWIZZLE_G; + vkd3d_desc.components.b = VK_COMPONENT_SWIZZLE_B; + vkd3d_desc.components.a = VK_COMPONENT_SWIZZLE_A; + vkd3d_desc.allowed_swizzle = false; + + if (!vkd3d_create_texture_view(device, vk_image, &vkd3d_desc, &view)) + return; + + descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; + descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; + descriptor->u.view = view; } static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_device *device, @@ -3248,6 +3279,7 @@ static HRESULT vkd3d_init_null_resources_data(struct vkd3d_null_resources *null_ struct d3d12_device *device) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + static const VkClearColorValue clear_color = {{0}}; VkCommandBufferAllocateInfo command_buffer_info; VkCommandPool vk_command_pool = VK_NULL_HANDLE; VkCommandPoolCreateInfo command_pool_info; @@ -3255,6 +3287,7 @@ static HRESULT vkd3d_init_null_resources_data(struct vkd3d_null_resources *null_ VkCommandBufferBeginInfo begin_info; VkCommandBuffer vk_command_buffer; VkFence vk_fence = VK_NULL_HANDLE; + VkImageSubresourceRange range; VkImageMemoryBarrier barrier; VkFenceCreateInfo fence_info; struct vkd3d_queue *queue; @@ -3304,6 +3337,35 @@ static HRESULT vkd3d_init_null_resources_data(struct vkd3d_null_resources *null_ /* fill UAV buffer */ VK_CALL(vkCmdFillBuffer(vk_command_buffer, null_resource->vk_storage_buffer, 0, VK_WHOLE_SIZE, 0x00000000)); + /* clear 2D UAV image */ + barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; + barrier.pNext = NULL; + barrier.srcAccessMask = 0; + barrier.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; + barrier.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED; + barrier.newLayout = VK_IMAGE_LAYOUT_GENERAL; + barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.image = null_resource->vk_2d_storage_image; + barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + barrier.subresourceRange.baseMipLevel = 0; + barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS; + barrier.subresourceRange.baseArrayLayer = 0; + barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS; + + VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, + VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, + 0, NULL, 0, NULL, 1, &barrier)); + + range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + range.baseMipLevel = 0; + range.levelCount = 1; + range.baseArrayLayer = 0; + range.layerCount = 1; + + VK_CALL(vkCmdClearColorImage(vk_command_buffer, + null_resource->vk_2d_storage_image, VK_IMAGE_LAYOUT_GENERAL, &clear_color, 1, &range)); + /* transition 2D SRV image */ barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; barrier.pNext = NULL; @@ -3436,6 +3498,26 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_2d_image_memory))) goto fail; + /* 2D UAV */ + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Alignment = 0; + resource_desc.Width = 1; + resource_desc.Height = 1; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = VKD3D_NULL_VIEW_FORMAT; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS; + + if (FAILED(hr = vkd3d_create_image(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, &null_resources->vk_2d_storage_image))) + goto fail; + if (FAILED(hr = vkd3d_allocate_image_memory(device, null_resources->vk_2d_storage_image, + &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_2d_storage_image_memory))) + goto fail; + /* set Vulkan object names */ vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_buffer, VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT, "NULL buffer"); @@ -3449,6 +3531,10 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, "NULL 2D SRV image"); vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_2d_image_memory, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL 2D SRV memory"); + vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_2d_storage_image, + VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, "NULL 2D UAV image"); + vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_2d_storage_image_memory, + VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL 2D UAV memory"); return vkd3d_init_null_resources_data(null_resources, device); @@ -3472,5 +3558,8 @@ void vkd3d_destroy_null_resources(struct vkd3d_null_resources *null_resources, VK_CALL(vkDestroyImage(device->vk_device, null_resources->vk_2d_image, NULL)); VK_CALL(vkFreeMemory(device->vk_device, null_resources->vk_2d_image_memory, NULL)); + VK_CALL(vkDestroyImage(device->vk_device, null_resources->vk_2d_storage_image, NULL)); + VK_CALL(vkFreeMemory(device->vk_device, null_resources->vk_2d_storage_image_memory, NULL)); + memset(null_resources, 0, sizeof(*null_resources)); } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9a73ab4eedac..71e05b245230 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -968,6 +968,9 @@ struct vkd3d_null_resources VkImage vk_2d_image; VkDeviceMemory vk_2d_image_memory; + + VkImage vk_2d_storage_image; + VkDeviceMemory vk_2d_storage_image_memory; }; HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, -- 2.21.0

2 1

[PATCH vkd3d 4/7] vkd3d: Add partial support for buffer NULL UAVs.
by Józef Kucia 04 Jun '19

04 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 57 +++++++++++++++++++++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 3 ++ 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 6602a129e42d..cd3f57251f3a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2247,6 +2247,39 @@ static unsigned int vkd3d_view_flags_from_d3d12_buffer_uav_flags(D3D12_BUFFER_UA return 0; } +static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, + struct d3d12_device *device, const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc) +{ + struct vkd3d_null_resources *null_resources = &device->null_resources; + struct vkd3d_view *view; + + if (!desc) + { + WARN("View desc is required for NULL view.\n"); + return; + } + + switch (desc->ViewDimension) + { + case D3D12_UAV_DIMENSION_BUFFER: + WARN("Creating NULL UAV %#x.\n", desc->Format); + + if (vkd3d_create_buffer_view(device, null_resources->vk_storage_buffer, + vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false), + 0, VKD3D_NULL_BUFFER_SIZE, &view)) + { + descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; + descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; + descriptor->u.view = view; + } + break; + + default: + FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); + break; + } +} + static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_device *device, struct d3d12_resource *resource, struct d3d12_resource *counter_resource, const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc) @@ -2373,7 +2406,9 @@ void d3d12_desc_create_uav(struct d3d12_desc *descriptor, struct d3d12_device *d if (!resource) { - FIXME("NULL resource UAV not implemented.\n"); + if (counter_resource) + FIXME("Ignoring counter resource %p.\n", counter_resource); + vkd3d_create_null_uav(descriptor, device, desc); return; } @@ -3266,6 +3301,9 @@ static HRESULT vkd3d_init_null_resources_data(struct vkd3d_null_resources *null_ /* fill buffer */ VK_CALL(vkCmdFillBuffer(vk_command_buffer, null_resource->vk_buffer, 0, VK_WHOLE_SIZE, 0x00000000)); + /* fill UAV buffer */ + VK_CALL(vkCmdFillBuffer(vk_command_buffer, null_resource->vk_storage_buffer, 0, VK_WHOLE_SIZE, 0x00000000)); + /* transition 2D SRV image */ barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; barrier.pNext = NULL; @@ -3368,6 +3406,16 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_buffer_memory))) goto fail; + /* buffer UAV */ + resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS; + + if (FAILED(hr = vkd3d_create_buffer(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, &null_resources->vk_storage_buffer))) + goto fail; + if (FAILED(hr = vkd3d_allocate_buffer_memory(device, null_resources->vk_storage_buffer, + &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_storage_buffer_memory))) + goto fail; + /* 2D SRV */ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; resource_desc.Alignment = 0; @@ -3393,6 +3441,10 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT, "NULL buffer"); vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_buffer_memory, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL memory"); + vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_storage_buffer, + VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT, "NULL UAV buffer"); + vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_storage_buffer_memory, + VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL UAV buffer memory"); vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_2d_image, VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, "NULL 2D SRV image"); vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_2d_image_memory, @@ -3414,6 +3466,9 @@ void vkd3d_destroy_null_resources(struct vkd3d_null_resources *null_resources, VK_CALL(vkDestroyBuffer(device->vk_device, null_resources->vk_buffer, NULL)); VK_CALL(vkFreeMemory(device->vk_device, null_resources->vk_buffer_memory, NULL)); + VK_CALL(vkDestroyBuffer(device->vk_device, null_resources->vk_storage_buffer, NULL)); + VK_CALL(vkFreeMemory(device->vk_device, null_resources->vk_storage_buffer_memory, NULL)); + VK_CALL(vkDestroyImage(device->vk_device, null_resources->vk_2d_image, NULL)); VK_CALL(vkFreeMemory(device->vk_device, null_resources->vk_2d_image_memory, NULL)); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 036b9eba96cf..9a73ab4eedac 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -963,6 +963,9 @@ struct vkd3d_null_resources VkBuffer vk_buffer; VkDeviceMemory vk_buffer_memory; + VkBuffer vk_storage_buffer; + VkDeviceMemory vk_storage_buffer_memory; + VkImage vk_2d_image; VkDeviceMemory vk_2d_image_memory; }; -- 2.21.0

2 1

[PATCH vkd3d 3/7] vkd3d: Add partial support for buffer NULL SRVs.
by Józef Kucia 04 Jun '19

04 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 79d4fef04607..6602a129e42d 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2054,6 +2054,19 @@ static void vkd3d_create_null_srv(struct d3d12_desc *descriptor, switch (desc->ViewDimension) { + case D3D12_SRV_DIMENSION_BUFFER: + WARN("Creating NULL buffer SRV %#x.\n", desc->Format); + + if (vkd3d_create_buffer_view(device, null_resources->vk_buffer, + vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false), + 0, VKD3D_NULL_BUFFER_SIZE, &view)) + { + descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; + descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; + descriptor->u.view = view; + } + return; + case D3D12_SRV_DIMENSION_TEXTURE2D: vk_image = null_resources->vk_2d_image; vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; @@ -2070,7 +2083,7 @@ static void vkd3d_create_null_srv(struct d3d12_desc *descriptor, WARN("Creating NULL SRV %#x.\n", desc->ViewDimension); - vkd3d_desc.format = vkd3d_get_format(device, VKD3D_NULL_VIEW_FORMAT, 0); + vkd3d_desc.format = vkd3d_get_format(device, VKD3D_NULL_VIEW_FORMAT, false); vkd3d_desc.miplevel_idx = 0; vkd3d_desc.miplevel_count = 1; vkd3d_desc.layer_idx = 0; @@ -3250,7 +3263,7 @@ static HRESULT vkd3d_init_null_resources_data(struct vkd3d_null_resources *null_ goto done; } - /* fill CBV buffer */ + /* fill buffer */ VK_CALL(vkCmdFillBuffer(vk_command_buffer, null_resource->vk_buffer, 0, VK_WHOLE_SIZE, 0x00000000)); /* transition 2D SRV image */ @@ -3335,7 +3348,7 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, memset(&heap_properties, 0, sizeof(heap_properties)); heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; - /* CBV */ + /* buffer */ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; resource_desc.Alignment = 0; resource_desc.Width = VKD3D_NULL_BUFFER_SIZE; @@ -3346,7 +3359,7 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, resource_desc.SampleDesc.Count = 1; resource_desc.SampleDesc.Quality = 0; resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; - resource_desc.Flags = D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE; + resource_desc.Flags = D3D12_RESOURCE_FLAG_NONE; if (FAILED(hr = vkd3d_create_buffer(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, &null_resources->vk_buffer))) -- 2.21.0

2 1

[PATCH vkd3d 1/7] vkd3d: Check texel buffer view alignment requirements.
by Józef Kucia 04 Jun '19

04 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 4a6af7fe102a..70a04ebac721 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1663,6 +1663,7 @@ static bool vkd3d_create_vk_buffer_view(struct d3d12_device *device, VkDeviceSize offset, VkDeviceSize range, VkBufferView *vk_view) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + const struct vkd3d_vulkan_info *vk_info = &device->vk_info; struct VkBufferViewCreateInfo view_desc; VkResult vr; @@ -1674,6 +1675,12 @@ static bool vkd3d_create_vk_buffer_view(struct d3d12_device *device, return false; } + if (offset % vk_info->device_limits.minTexelBufferOffsetAlignment) + { + FIXME("Offset %#"PRIx64" violates the minimum required alignment %#"PRIx64".\n", + offset, vk_info->device_limits.minTexelBufferOffsetAlignment); + } + view_desc.sType = VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO; view_desc.pNext = NULL; view_desc.flags = 0; -- 2.21.0

2 1

[PATCH v3 3/4] gdi32: Implement D3DKMTCreateDevice.
by Zhiyi Zhang 04 Jun '19

04 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 46 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 2 +- include/ddk/d3dkmthk.h | 1 + include/wine/gdi_driver.h | 6 +++ 7 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index 43186e8fcc..cb7935bbbc 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -12,7 +12,7 @@ @ stub D3DKMTCreateAllocation2 @ stub D3DKMTCreateContext @ stdcall D3DKMTCreateDCFromMemory(ptr) gdi32.D3DKMTCreateDCFromMemory -@ stub D3DKMTCreateDevice +@ stdcall D3DKMTCreateDevice(ptr) gdi32.D3DKMTCreateDevice @ stub D3DKMTCreateKeyedMutex @ stub D3DKMTCreateKeyedMutex2 @ stub D3DKMTCreateOutputDupl diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 87304b7c13..e4692ace9c 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -8,7 +8,7 @@ @ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateContext -@ stub D3DKMTCreateDevice +@ stdcall D3DKMTCreateDevice(ptr) gdi32.D3DKMTCreateDevice @ stub D3DKMTCreateSynchronizationObject @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e20621f873..0518f1e65f 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -56,6 +56,7 @@ static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; static struct list d3dkmt_adapters = LIST_INIT( d3dkmt_adapters ); +static struct list d3dkmt_devices = LIST_INIT( d3dkmt_devices ); const struct gdi_dc_funcs *font_driver = NULL; @@ -1332,3 +1333,48 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI LeaveCriticalSection( &driver_section ); return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTCreateDevice [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) +{ + static D3DKMT_HANDLE handle_start = 0; + struct d3dkmt_adapter *adapter; + struct d3dkmt_device *device; + BOOL found = FALSE; + + TRACE("(%p)\n", desc); + + if (!desc) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) + { + if (adapter->handle == desc->hAdapter) + { + found = TRUE; + break; + } + } + LeaveCriticalSection( &driver_section ); + + if (!found) + return STATUS_INVALID_PARAMETER; + + if (desc->Flags.LegacyMode || desc->Flags.RequestVSync || desc->Flags.DisableGpuTimeout) + WARN("Flags unsupported.\n"); + + device = heap_alloc_zero( sizeof( *device ) ); + if (!device) + return STATUS_NO_MEMORY; + + device->handle = ++handle_start; + desc->hDevice = device->handle; + + EnterCriticalSection( &driver_section ); + list_add_tail( &d3dkmt_devices, &device->entry ); + LeaveCriticalSection( &driver_section ); + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 5c17ed9ee8..88fe846eb8 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -82,6 +82,7 @@ @ stdcall CreateSolidBrush(long) @ stdcall D3DKMTCloseAdapter(ptr) @ stdcall D3DKMTCreateDCFromMemory(ptr) +@ stdcall D3DKMTCreateDevice(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index caded27aef..f5c23dad76 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -194,7 +194,7 @@ static void test_D3DKMTCreateDevice(void) D3DKMT_DESTROYDEVICE destroy_device_desc; NTSTATUS status; - if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) + if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND || !pD3DKMTDestroyDevice) { skip("D3DKMTCreateDevice() or D3DKMTDestroyDevice() is unavailable.\n"); return; diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 5436cb6612..90bf907e30 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -166,6 +166,7 @@ extern "C" #endif /* __cplusplus */ NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); +NTSTATUS WINAPI D3DKMTCreateDevice(D3DKMT_CREATEDEVICE *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 5d09462774..2da25cc2f5 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -72,6 +72,12 @@ struct d3dkmt_adapter struct list entry; /* List entry */ }; +struct d3dkmt_device +{ + D3DKMT_HANDLE handle; /* Kernel mode graphics device handle*/ + struct list entry; /* List entry */ +}; + struct gdi_dc_funcs { INT (*pAbortDoc)(PHYSDEV); -- 2.20.1

2 1

[PATCH] dinput: Handle case where IOHIDDeviceGetValue fails
by Aric Stewart 04 Jun '19

04 Jun '19

This prevents crashes if a controller disconnects from OS/X Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/dinput/joystick_osx.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)

1 0

[PATCH v3 2/4] gdi32: Implement D3DKMTCloseAdapter.
by Zhiyi Zhang 04 Jun '19

04 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 24 ++++++++++++++++++++++-- dlls/gdi32/tests/driver.c | 4 ++-- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 365e5d7c0c..87304b7c13 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -5,7 +5,7 @@ @ stdcall D3D11CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) @ stdcall D3D11CreateDeviceAndSwapChain(ptr long ptr long ptr long long ptr ptr ptr ptr ptr) @ stdcall D3D11On12CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) -@ stub D3DKMTCloseAdapter +@ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateContext @ stub D3DKMTCreateDevice diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 047209a938..e20621f873 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1272,8 +1272,28 @@ NTSTATUS WINAPI D3DKMTEscape( const void *pData ) */ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) { - FIXME("(%p): stub\n", desc); - return STATUS_SUCCESS; + NTSTATUS status = STATUS_INVALID_PARAMETER; + struct d3dkmt_adapter *adapter; + + TRACE("(%p)\n", desc); + + if (!desc || !desc->hAdapter) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) + { + if (adapter->handle == desc->hAdapter) + { + list_remove( &adapter->entry ); + heap_free( adapter ); + status = STATUS_SUCCESS; + break; + } + } + LeaveCriticalSection( &driver_section ); + + return status; } /****************************************************************************** diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 067c162838..caded27aef 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -179,11 +179,11 @@ static void test_D3DKMTCloseAdapter(void) /* Invalid parameters */ status = pD3DKMTCloseAdapter(NULL); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); memset(&close_adapter_desc, 0, sizeof(close_adapter_desc)); status = pD3DKMTCloseAdapter(&close_adapter_desc); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); } static void test_D3DKMTCreateDevice(void) -- 2.20.1

2 1

[PATCH v3 1/4] gdi32: Implement D3DKMTOpenAdapterFromGdiDisplayName.
by Zhiyi Zhang 04 Jun '19

04 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Use non-safe list iteration macros. Supersede 165931~165934 v3: Fix intermediate test crash. Supersede 165950~165953. .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 1 + dlls/gdi32/driver.c | 40 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 2 +- include/ddk/d3dkmthk.h | 1 + include/wine/gdi_driver.h | 9 +++++ 7 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index e8aa38edf4..43186e8fcc 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -46,7 +46,7 @@ @ stub D3DKMTLock @ stub D3DKMTOfferAllocations @ stub D3DKMTOpenAdapterFromDeviceName -@ stub D3DKMTOpenAdapterFromGdiDisplayName +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) gdi32.D3DKMTOpenAdapterFromGdiDisplayName @ stdcall D3DKMTOpenAdapterFromHdc(ptr) gdi32.D3DKMTOpenAdapterFromHdc @ stub D3DKMTOpenKeyedMutex @ stub D3DKMTOpenKeyedMutex2 diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 267778ab14..365e5d7c0c 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -22,6 +22,7 @@ @ stub D3DKMTGetRuntimeData @ stub D3DKMTGetSharedPrimaryHandle @ stub D3DKMTLock +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) gdi32.D3DKMTOpenAdapterFromGdiDisplayName @ stub D3DKMTOpenAdapterFromHdc @ stub D3DKMTOpenResource @ stub D3DKMTPresent diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 88f49a03b6..047209a938 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -41,6 +41,7 @@ #include "wine/unicode.h" #include "wine/list.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(driver); @@ -54,6 +55,8 @@ struct graphics_driver static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; +static struct list d3dkmt_adapters = LIST_INIT( d3dkmt_adapters ); + const struct gdi_dc_funcs *font_driver = NULL; static CRITICAL_SECTION driver_section; @@ -1272,3 +1275,40 @@ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) FIXME("(%p): stub\n", desc); return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTOpenAdapterFromGdiDisplayName [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc ) +{ + static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; + static D3DKMT_HANDLE handle_start = 0; + struct d3dkmt_adapter *adapter; + + TRACE("(%p) semi-stub\n", desc); + + /* FIXME: + * 1. Multiple monitor support. + * 2. AdapterLuid + */ + if (!desc || lstrcmpiW( desc->DeviceName, display1W )) + return STATUS_UNSUCCESSFUL; + + adapter = heap_alloc( sizeof( *adapter ) ); + if (!adapter) + return STATUS_NO_MEMORY; + + /* D3DKMT_HANDLE is UINT, so we can't use pointer as handle */ + adapter->handle = ++handle_start; + adapter->ordinal = 0; + + desc->hAdapter = handle_start; + desc->AdapterLuid.LowPart = 0; + desc->AdapterLuid.HighPart = 0; + desc->VidPnSourceId = 0; + + EnterCriticalSection( &driver_section ); + list_add_tail( &d3dkmt_adapters, &adapter->entry ); + LeaveCriticalSection( &driver_section ); + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 2d158e0f1b..5c17ed9ee8 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -84,6 +84,7 @@ @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) @ stdcall DPtoLP(long ptr long) @ stdcall DeleteColorSpace(long) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 3b8953b4c3..067c162838 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -56,7 +56,7 @@ static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) if (!pD3DKMTOpenAdapterFromGdiDisplayName || pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTOpenAdapterFromGdiDisplayName() is unavailable.\n"); + win_skip("D3DKMTOpenAdapterFromGdiDisplayName() is unavailable.\n"); return; } diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index c87321058c..5436cb6612 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -168,6 +168,7 @@ extern "C" NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); +NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); #ifdef __cplusplus } diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index d3e5bcefb4..5d09462774 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -21,6 +21,8 @@ #ifndef __WINE_WINE_GDI_DRIVER_H #define __WINE_WINE_GDI_DRIVER_H +#include "winternl.h" +#include "ddk/d3dkmthk.h" #include "wine/list.h" struct gdi_dc_funcs; @@ -63,6 +65,13 @@ struct brush_pattern UINT usage; /* color usage for DIB info */ }; +struct d3dkmt_adapter +{ + D3DKMT_HANDLE handle; /* Kernel mode graphics adapter handle */ + INT ordinal; /* Graphics adapter ordinal */ + struct list entry; /* List entry */ +}; + struct gdi_dc_funcs { INT (*pAbortDoc)(PHYSDEV); -- 2.20.1

2 1