May 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d: Implement register spaces.
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: vkd3d Branch: master Commit: 4bf22c6c27331b9569013ca0874d56db256714f9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4bf22c6c27331b9569013ca… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 26 15:16:46 2020 -0500 vkd3d: Implement register spaces. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 40 +++++++++------------------------------- 1 file changed, 9 insertions(+), 31 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 3233654..a7b6251 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -308,13 +308,6 @@ static bool vk_binding_from_d3d12_descriptor_range(struct VkDescriptorSetLayoutB binding_desc->descriptorType = vk_descriptor_type_from_d3d12_range_type(descriptor_range->RangeType, is_buffer); binding_desc->descriptorCount = 1; - - if (descriptor_range->RegisterSpace) - { - FIXME("Unhandled register space %u.\n", descriptor_range->RegisterSpace); - return false; - } - binding_desc->stageFlags = stage_flags_from_visibility(shader_visibility); binding_desc->pImmutableSamplers = NULL; @@ -495,12 +488,6 @@ static HRESULT d3d12_root_signature_init_push_constants(struct d3d12_root_signat if (p->ParameterType != D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS) continue; - if (p->u.Constants.RegisterSpace) - { - FIXME("Unhandled register space %u for parameter %u.\n", p->u.Constants.RegisterSpace, i); - return E_NOTIMPL; - } - idx = push_constant_count == 1 ? 0 : p->ShaderVisibility; offset = push_constants_offset[idx]; push_constants_offset[idx] += p->u.Constants.Num32BitValues * sizeof(uint32_t); @@ -510,7 +497,7 @@ static HRESULT d3d12_root_signature_init_push_constants(struct d3d12_root_signat ? push_constants[0].stageFlags : stage_flags_from_visibility(p->ShaderVisibility); root_constant->offset = offset; - root_signature->root_constants[j].register_space = 0; + root_signature->root_constants[j].register_space = p->u.Constants.RegisterSpace; root_signature->root_constants[j].register_index = p->u.Constants.ShaderRegister; root_signature->root_constants[j].shader_visibility = vkd3d_shader_visibility_from_d3d12(p->ShaderVisibility); @@ -534,7 +521,7 @@ struct vkd3d_descriptor_set_context }; static void d3d12_root_signature_append_vk_binding(struct d3d12_root_signature *root_signature, - enum vkd3d_shader_descriptor_type descriptor_type, unsigned int register_idx, + enum vkd3d_shader_descriptor_type descriptor_type, unsigned int register_space, unsigned int register_idx, bool buffer_descriptor, enum vkd3d_shader_visibility shader_visibility, struct vkd3d_descriptor_set_context *context) { @@ -542,7 +529,7 @@ static void d3d12_root_signature_append_vk_binding(struct d3d12_root_signature * = &root_signature->descriptor_mapping[context->descriptor_index++]; mapping->type = descriptor_type; - mapping->register_space = 0; + mapping->register_space = register_space; mapping->register_index = register_idx; mapping->shader_visibility = shader_visibility; mapping->flags = buffer_descriptor ? VKD3D_SHADER_BINDING_FLAG_BUFFER : VKD3D_SHADER_BINDING_FLAG_IMAGE; @@ -551,7 +538,7 @@ static void d3d12_root_signature_append_vk_binding(struct d3d12_root_signature * } static uint32_t d3d12_root_signature_assign_vk_bindings(struct d3d12_root_signature *root_signature, - enum vkd3d_shader_descriptor_type descriptor_type, unsigned int base_register_idx, + enum vkd3d_shader_descriptor_type descriptor_type, unsigned int register_space, unsigned int base_register_idx, unsigned int binding_count, bool is_buffer_descriptor, bool duplicate_descriptors, enum vkd3d_shader_visibility shader_visibility, struct vkd3d_descriptor_set_context *context) { @@ -567,10 +554,10 @@ static uint32_t d3d12_root_signature_assign_vk_bindings(struct d3d12_root_signat for (i = 0; i < binding_count; ++i) { if (duplicate_descriptors) - d3d12_root_signature_append_vk_binding(root_signature, descriptor_type, + d3d12_root_signature_append_vk_binding(root_signature, descriptor_type, register_space, base_register_idx + i, true, shader_visibility, context); - d3d12_root_signature_append_vk_binding(root_signature, descriptor_type, + d3d12_root_signature_append_vk_binding(root_signature, descriptor_type, register_space, base_register_idx + i, is_buffer_descriptor, shader_visibility, context); } return first_binding; @@ -627,7 +614,7 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo vk_binding = d3d12_root_signature_assign_vk_bindings(root_signature, vkd3d_descriptor_type_from_d3d12_range_type(range->RangeType), - range->BaseShaderRegister, range->NumDescriptors, false, true, + range->RegisterSpace, range->BaseShaderRegister, range->NumDescriptors, false, true, vkd3d_shader_visibility_from_d3d12(p->ShaderVisibility), context); /* Unroll descriptor range. */ @@ -685,15 +672,9 @@ static HRESULT d3d12_root_signature_init_root_descriptors(struct d3d12_root_sign root_signature->push_descriptor_mask |= 1u << i; - if (p->u.Descriptor.RegisterSpace) - { - FIXME("Unhandled register space %u for parameter %u.\n", p->u.Descriptor.RegisterSpace, i); - return E_NOTIMPL; - } - cur_binding->binding = d3d12_root_signature_assign_vk_bindings(root_signature, vkd3d_descriptor_type_from_d3d12_root_parameter_type(p->ParameterType), - p->u.Descriptor.ShaderRegister, 1, true, false, + p->u.Descriptor.RegisterSpace, p->u.Descriptor.ShaderRegister, 1, true, false, vkd3d_shader_visibility_from_d3d12(p->ShaderVisibility), context); cur_binding->descriptorType = vk_descriptor_type_from_d3d12_root_parameter(p->ParameterType); cur_binding->descriptorCount = 1; @@ -723,14 +704,11 @@ static HRESULT d3d12_root_signature_init_static_samplers(struct d3d12_root_signa { const D3D12_STATIC_SAMPLER_DESC *s = &desc->pStaticSamplers[i]; - if (s->RegisterSpace) - FIXME("Unhandled register space %u for static sampler %u.\n", s->RegisterSpace, i); - if (FAILED(hr = vkd3d_create_static_sampler(device, s, &root_signature->static_samplers[i]))) return hr; cur_binding->binding = d3d12_root_signature_assign_vk_bindings(root_signature, - VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, s->ShaderRegister, 1, false, false, + VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, s->RegisterSpace, s->ShaderRegister, 1, false, false, vkd3d_shader_visibility_from_d3d12(s->ShaderVisibility), context); cur_binding->descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER; cur_binding->descriptorCount = 1;

1 0

Zebediah Figura : tests: Test multiple register spaces.
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: vkd3d Branch: master Commit: 6ac880da107b5b83564cdb0ef3a078dede3dad91 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6ac880da107b5b83564cdb0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 26 15:16:47 2020 -0500 tests: Test multiple register spaces. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 212 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 212 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=6ac880da107b5b83564…

1 0

Zebediah Figura : tests: Test multiple register spaces with samplers.
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: vkd3d Branch: master Commit: 5d5a458247cbcc9b4b4a77bb8da4cda751bf52e6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5d5a458247cbcc9b4b4a77b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 26 15:16:48 2020 -0500 tests: Test multiple register spaces with samplers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index dcec8ed..c4ec41a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -33022,6 +33022,131 @@ static void test_register_space(void) destroy_test_context(&context); } +static void test_sampler_register_space(void) +{ + static const struct test_context_desc desc = {.no_root_signature = true}; + ID3D12DescriptorHeap *heap, *sampler_heap, *heaps[2]; + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_SAMPLER_DESC sampler_desc; + D3D12_SUBRESOURCE_DATA data; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Resource *texture; + ID3D12Device *device; + HRESULT hr; + + static const D3D12_DESCRIPTOR_RANGE descriptor_ranges[] = + { + {D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 0, 0, 0}, + }; + + static const D3D12_DESCRIPTOR_RANGE sampler_ranges[] = + { + {D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER, 1, 1, 1, 0}, + {D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER, 1, 1, 2, D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND}, + }; + + static const D3D12_ROOT_PARAMETER root_parameters[] = + { + {D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE, + .DescriptorTable = {ARRAY_SIZE(descriptor_ranges), descriptor_ranges}}, + {D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE, + .DescriptorTable = {ARRAY_SIZE(sampler_ranges), sampler_ranges}}, + }; + + static const DWORD ps_code[] = + { +#if 0 + Texture2D<float> t; + SamplerState s1 : register(s1, space1); + SamplerState s2 : register(s1, space2); + + float4 main() : SV_Target + { + float2 coords = float2(0.5, 0.5); + return float4(t.Sample(s1, coords), t.Sample(s2, coords), 0, 1); + } +#endif + 0x43425844, 0xa29c83c7, 0xd4c8eeff, 0x7b73ff7b, 0x6463d58c, 0x00000001, 0x0000018c, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000114, 0x00000051, 0x00000045, + 0x0100086a, 0x0600005a, 0x00306e46, 0x00000000, 0x00000001, 0x00000001, 0x00000001, 0x0600005a, + 0x00306e46, 0x00000001, 0x00000001, 0x00000001, 0x00000002, 0x07001858, 0x00307e46, 0x00000000, + 0x00000000, 0x00000000, 0x00005555, 0x00000000, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x0e000045, 0x00100012, 0x00000000, 0x00004002, 0x3f000000, 0x3f000000, 0x00000000, + 0x00000000, 0x00207e46, 0x00000000, 0x00000000, 0x00206000, 0x00000000, 0x00000001, 0x0e000045, + 0x00100022, 0x00000000, 0x00004002, 0x3f000000, 0x3f000000, 0x00000000, 0x00000000, 0x00207e16, + 0x00000000, 0x00000000, 0x00206000, 0x00000001, 0x00000001, 0x05000036, 0x00102032, 0x00000000, + 0x00100046, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const float texture_data[4] = {0.0, 1.0, 0.0, 1.0}; + static const float blue[] = {0.0f, 0.0f, 1.0f, 1.0f}; + + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + memset(&root_signature_desc, 0, sizeof(root_signature_desc)); + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); + root_signature_desc.pParameters = root_parameters; + hr = create_root_signature(device, &root_signature_desc, &context.root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, ARRAY_SIZE(descriptor_ranges)); + sampler_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, ARRAY_SIZE(sampler_ranges)); + + texture = create_default_texture(device, 2, 2, DXGI_FORMAT_R32_FLOAT, 0, D3D12_RESOURCE_STATE_COPY_DEST); + data.pData = texture_data; + data.SlicePitch = data.RowPitch = 2 * sizeof(*texture_data); + upload_texture_data(texture, &data, 1, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + ID3D12Device_CreateShaderResourceView(device, texture, NULL, get_cpu_descriptor_handle(&context, heap, 0)); + + memset(&sampler_desc, 0, sizeof(sampler_desc)); + sampler_desc.Filter = D3D12_FILTER_MIN_MAG_MIP_LINEAR; + sampler_desc.AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; + sampler_desc.AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; + sampler_desc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; + ID3D12Device_CreateSampler(device, &sampler_desc, get_cpu_sampler_handle(&context, sampler_heap, 0)); + sampler_desc.Filter = D3D12_FILTER_MIN_MAG_MIP_POINT; + ID3D12Device_CreateSampler(device, &sampler_desc, get_cpu_sampler_handle(&context, sampler_heap, 1)); + + context.pipeline_state = create_pipeline_state(device, context.root_signature, + context.render_target_desc.Format, NULL, &ps, NULL); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, blue, 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); + heaps[0] = heap; heaps[1] = sampler_heap; + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, ARRAY_SIZE(heaps), heaps); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, + 0, get_gpu_descriptor_handle(&context, heap, 0)); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, + 1, get_gpu_sampler_handle(&context, sampler_heap, 0)); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 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, 0x0000ff80, 1); + + ID3D12Resource_Release(texture); + ID3D12DescriptorHeap_Release(heap); + ID3D12DescriptorHeap_Release(sampler_heap); + destroy_test_context(&context); +} + START_TEST(d3d12) { parse_args(argc, argv); @@ -33187,4 +33312,5 @@ START_TEST(d3d12) run_test(test_bufinfo_instruction); run_test(test_write_buffer_immediate); run_test(test_register_space); + run_test(test_sampler_register_space); }

1 0

Zebediah Figura : vkd3d-shader: Do not treat descriptor registers as arrayed.
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: vkd3d Branch: master Commit: e53496f6fd7fe9b302ac459f300e35e1ce8935f6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e53496f6fd7fe9b302ac459… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 26 15:16:44 2020 -0500 vkd3d-shader: Do not treat descriptor registers as arrayed. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d09e0fd..1b2cf3d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2821,6 +2821,21 @@ static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compil return true; } +static bool register_is_descriptor(const struct vkd3d_shader_register *reg) +{ + switch (reg->type) + { + case VKD3DSPR_SAMPLER: + case VKD3DSPR_RESOURCE: + case VKD3DSPR_CONSTBUFFER: + case VKD3DSPR_UAV: + return true; + + default: + return false; + } +} + static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, struct vkd3d_shader_register_info *register_info) { @@ -2868,7 +2883,7 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp FIXME("Relative addressing not implemented.\n"); /* Handle arrayed registers, e.g. v[3][0]. */ - if (reg->idx[1].offset != ~0u) + if (reg->idx[1].offset != ~0u && !register_is_descriptor(reg)) indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[0]); }

1 0

Zebediah Figura : vkd3d-shader: Also match the register space when looking up bindings.
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: vkd3d Branch: master Commit: 87364057dac0bb29bb3ce12ec70e038d9c1d7de9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=87364057dac0bb29bb3ce12… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 26 15:16:45 2020 -0500 vkd3d-shader: Also match the register space when looking up bindings. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 3 +++ libs/vkd3d-shader/spirv.c | 52 ++++++++++++++++++++--------------------------- libs/vkd3d/state.c | 5 +++++ 3 files changed, 30 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=87364057dac0bb29bb3…

1 0

Zebediah Figura : vkd3d-shader: Read the resource index from idx[1] instead of idx[0] when looking up SM5.1 bindings.
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: vkd3d Branch: master Commit: 6dace4a8be7bba174be2dc1acbd495697f07f5af URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6dace4a8be7bba174be2dc1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 26 15:16:41 2020 -0500 vkd3d-shader: Read the resource index from idx[1] instead of idx[0] when looking up SM5.1 bindings. We still use the first index to uniquely identify the register in vkd3d_symbol, only changing which field is used to declare it. This patch does not handle descriptor arrays. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 18 ++++++++++++++++ libs/vkd3d-shader/spirv.c | 35 ++++++++++++++++---------------- libs/vkd3d-shader/vkd3d_shader_private.h | 10 ++++----- 3 files changed, 41 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=6dace4a8be7bba174be…

1 0

Zebediah Figura : vkd3d: Fix a spelling error in vkd3d_init_null_resources_data().
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: vkd3d Branch: master Commit: 2abc6154190d762182d34ff7cf0ffe07a90dd2b6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2abc6154190d762182d34ff… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 26 15:00:17 2020 -0500 vkd3d: Fix a spelling error in vkd3d_init_null_resources_data(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f40d986..a9d4d46 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -3947,7 +3947,7 @@ static HRESULT vkd3d_init_null_resources_data(struct vkd3d_null_resources *null_ vr = VK_CALL(vkWaitForFences(device->vk_device, 1, &vk_fence, VK_FALSE, ~(uint64_t)0)); if (vr != VK_SUCCESS) - WARN("Failed to wait fo fence, vr %d.\n", vr); + WARN("Failed to wait for fence, vr %d.\n", vr); done: VK_CALL(vkDestroyCommandPool(vk_device, vk_command_pool, NULL));

1 0

Louis Lenders : usp10: Add stub for ScriptGetFontAlternateGlyphs.
by Alexandre Julliard May 26, 2020

May 26, 2020

Module: wine Branch: master Commit: 8257fe88fb99ca0bdeec27b47b7cf835bda5c061 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8257fe88fb99ca0bdeec27b4… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sun May 24 21:33:05 2020 +0200 usp10: Add stub for ScriptGetFontAlternateGlyphs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45536 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 12 ++++++++++++ dlls/usp10/usp10.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index c9fe12a544..322091c547 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -4095,3 +4095,15 @@ HRESULT WINAPI ScriptGetFontFeatureTags( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANAL return SHAPE_GetFontFeatureTags(hdc, (ScriptCache *)*psc, psa, tagScript, tagLangSys, cMaxTags, pFeatureTags, pcTags); } + +HRESULT WINAPI ScriptGetFontAlternateGlyphs( HDC hdc, SCRIPT_CACHE *sc, SCRIPT_ANALYSIS *sa, OPENTYPE_TAG tag_script, OPENTYPE_TAG tag_langsys, OPENTYPE_TAG tag_feature, + WORD id, int size, WORD *list, int *count ) +{ + FIXME("(%p, %p, %p, %s, %s, %s, 0x%04x, %d, %p, %p)\n", hdc, sc, sa, debugstr_an((char*)&tag_script,4), debugstr_an((char*)&tag_langsys,4), + debugstr_an((char*)&tag_feature,4), id, size, list, count); + + if(count) + *count = 0; + + return E_NOTIMPL; +} diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index 3e97d919a9..96bf47147a 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -6,7 +6,7 @@ @ stdcall ScriptCacheGetHeight(ptr ptr ptr) @ stdcall ScriptFreeCache(ptr) @ stdcall ScriptGetCMap(ptr ptr ptr long long ptr) -@ stub ScriptGetFontAlternateGlyphs +@ stdcall ScriptGetFontAlternateGlyphs(long ptr ptr long long long long long ptr ptr) @ stdcall ScriptGetFontFeatureTags(long ptr ptr long long long ptr ptr) @ stdcall ScriptGetFontLanguageTags(long ptr ptr long long ptr ptr) @ stdcall ScriptGetFontProperties(long ptr ptr)

1 0

Henri Verbeet : wined3d: Move the swapchain cursor texture blit to wined3d_cs_exec_present().
by Alexandre Julliard May 26, 2020

May 26, 2020

Module: wine Branch: master Commit: c1f09c2461e6dfcf7baff03e70000a9d70e50fa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1f09c2461e6dfcf7baff03e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 20:58:10 2020 +0430 wined3d: Move the swapchain cursor texture blit to wined3d_cs_exec_present(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 27 ++++++++++++++++++++++++++- dlls/wined3d/swapchain.c | 26 -------------------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b5a34a6ab6..ffd00c9b95 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -521,7 +521,7 @@ static void wined3d_cs_exec_nop(struct wined3d_cs *cs, const void *data) static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { - struct wined3d_texture *logo_texture, *back_buffer; + struct wined3d_texture *logo_texture, *cursor_texture, *back_buffer; const struct wined3d_cs_present *op = data; struct wined3d_swapchain *swapchain; unsigned int i; @@ -539,6 +539,31 @@ static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) &rect, WINED3D_BLT_SRC_CKEY, NULL, WINED3D_TEXF_POINT); } + if ((cursor_texture = swapchain->device->cursor_texture) + && swapchain->device->bCursorVisible && !swapchain->device->hardwareCursor) + { + RECT dst_rect = + { + swapchain->device->xScreenSpace - swapchain->device->xHotSpot, + swapchain->device->yScreenSpace - swapchain->device->yHotSpot, + swapchain->device->xScreenSpace + swapchain->device->cursorWidth - swapchain->device->xHotSpot, + swapchain->device->yScreenSpace + swapchain->device->cursorHeight - swapchain->device->yHotSpot, + }; + RECT src_rect = + { + 0, 0, cursor_texture->resource.width, cursor_texture->resource.height + }; + const RECT clip_rect = {0, 0, back_buffer->resource.width, back_buffer->resource.height}; + + TRACE("Rendering the software cursor.\n"); + + if (swapchain->state.desc.windowed) + MapWindowPoints(NULL, swapchain->win_handle, (POINT *)&dst_rect, 2); + if (wined3d_clip_blit(&clip_rect, &dst_rect, &src_rect)) + wined3d_texture_blt(back_buffer, 0, &dst_rect, cursor_texture, 0, + &src_rect, WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); + } + swapchain->swapchain_ops->swapchain_present(swapchain, &op->src_rect, &op->dst_rect, op->swap_interval, op->flags); if (TRACE_ON(fps)) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index a48b98aac3..289013f4e9 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -469,7 +469,6 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; const struct wined3d_fb_state *fb = &swapchain->device->cs->state.fb; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; - struct wined3d_texture *cursor_texture; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; struct wined3d_context *context; @@ -488,31 +487,6 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, swapchain_gl_set_swap_interval(swapchain, context_gl, swap_interval); - if ((cursor_texture = swapchain->device->cursor_texture) - && swapchain->device->bCursorVisible && !swapchain->device->hardwareCursor) - { - RECT dst_rect = - { - swapchain->device->xScreenSpace - swapchain->device->xHotSpot, - swapchain->device->yScreenSpace - swapchain->device->yHotSpot, - swapchain->device->xScreenSpace + swapchain->device->cursorWidth - swapchain->device->xHotSpot, - swapchain->device->yScreenSpace + swapchain->device->cursorHeight - swapchain->device->yHotSpot, - }; - RECT src_rect = - { - 0, 0, cursor_texture->resource.width, cursor_texture->resource.height - }; - const RECT clip_rect = {0, 0, back_buffer->resource.width, back_buffer->resource.height}; - - TRACE("Rendering the software cursor.\n"); - - if (desc->windowed) - MapWindowPoints(NULL, swapchain->win_handle, (POINT *)&dst_rect, 2); - if (wined3d_clip_blit(&clip_rect, &dst_rect, &src_rect)) - wined3d_texture_blt(back_buffer, 0, &dst_rect, cursor_texture, 0, - &src_rect, WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); - } - TRACE("Presenting DC %p.\n", context_gl->dc); if (!(render_to_fbo = swapchain->render_to_fbo)

1 0

Hans Leidekker : wbemprox: Get the disk drive serial number from mountmgr.
by Alexandre Julliard May 26, 2020

May 26, 2020

Module: wine Branch: master Commit: 84857d27067afaa1ae5774afe27086332263bfb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84857d27067afaa1ae5774af… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 26 10:18:43 2020 +0200 wbemprox: Get the disk drive serial number from mountmgr. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49160 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 41 +++++++++++++++++++++++++++++++++++++++-- dlls/wbemprox/tests/query.c | 26 ++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index ddd12d6ebc..466611721a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -44,6 +44,7 @@ #include "ntsecapi.h" #include "winspool.h" #include "setupapi.h" +#include "ntddstor.h" #include "wine/asm.h" #include "wine/debug.h" @@ -140,7 +141,7 @@ static const struct column col_diskdrive[] = { L"MediaType", CIM_STRING }, { L"Model", CIM_STRING }, { L"PNPDeviceID", CIM_STRING }, - { L"SerialNumber", CIM_STRING }, + { L"SerialNumber", CIM_STRING|COL_FLAG_DYNAMIC }, { L"Size", CIM_UINT64 }, }; static const struct column col_diskdrivetodiskpartition[] = @@ -2081,6 +2082,42 @@ static UINT64 get_freespace( const WCHAR *dir, UINT64 *disksize ) } return free.QuadPart; } +static WCHAR *get_diskdrive_serialnumber( WCHAR letter ) +{ + WCHAR *ret = NULL; + STORAGE_DEVICE_DESCRIPTOR *desc; + HANDLE handle = INVALID_HANDLE_VALUE; + STORAGE_PROPERTY_QUERY query = {0}; + WCHAR drive[7]; + DWORD size; + + swprintf( drive, ARRAY_SIZE(drive), L"\\\\.\\%c:", letter ); + handle = CreateFileW( drive, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + if (handle == INVALID_HANDLE_VALUE) goto done; + + query.PropertyId = StorageDeviceProperty; + query.QueryType = PropertyStandardQuery; + + size = sizeof(*desc) + 256; + for (;;) + { + if (!(desc = heap_alloc( size ))) break; + if (DeviceIoControl( handle, IOCTL_STORAGE_QUERY_PROPERTY, &query, sizeof(query), desc, size, NULL, NULL )) + { + if (desc->SerialNumberOffset) ret = heap_strdupAW( (const char *)desc + desc->SerialNumberOffset ); + heap_free( desc ); + break; + } + heap_free( desc ); + if (GetLastError() == ERROR_MORE_DATA) size = desc->Size; + else break; + } + +done: + if (handle != INVALID_HANDLE_VALUE) CloseHandle( handle ); + if (!ret) ret = heap_strdupW( L"WINEHDISK" ); + return ret; +} static enum fill_status fill_diskdrive( struct table *table, const struct expr *cond ) { @@ -2114,7 +2151,7 @@ static enum fill_status fill_diskdrive( struct table *table, const struct expr * rec->mediatype = (type == DRIVE_FIXED) ? L"Fixed hard disk" : L"Removable media"; rec->model = L"Wine Disk Drive"; rec->pnpdevice_id = L"IDE\\Disk\\VEN_WINE"; - rec->serialnumber = L"WINEHDISK"; + rec->serialnumber = get_diskdrive_serialnumber( root[0] ); get_freespace( root, &size ); rec->size = size; if (!match_row( table, row, cond, &status )) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index a9b4910ebf..578e9308df 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1456,6 +1456,31 @@ static void test_Win32_DesktopMonitor( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_DiskDrive( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_DiskDrive" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"DeviceID", VT_BSTR, CIM_STRING ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_Win32_DisplayControllerConfiguration( IWbemServices *services ) { BSTR wql = SysAllocString( L"wql" ); @@ -1561,6 +1586,7 @@ START_TEST(query) test_Win32_ComputerSystemProduct( services ); test_Win32_Bios( services ); test_Win32_DesktopMonitor( services ); + test_Win32_DiskDrive( services ); test_Win32_DisplayControllerConfiguration( services ); test_Win32_IP4RouteTable( services ); test_Win32_OperatingSystem( services );

1 0