April 2019 - Wine-Devel - list.winehq.org

[PATCH vkd3d 6/6] vkd3d: Add helpers for getting root signature parameters.
by Józef Kucia April 1, 2019

April 1, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 52 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 8868a72c5b89..936e96598f9c 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -334,6 +334,39 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, return S_OK; } +static const struct d3d12_root_parameter *root_signature_get_parameter( + const struct d3d12_root_signature *root_signature, unsigned int index) +{ + assert(index < root_signature->parameter_count); + return &root_signature->parameters[index]; +} + +static const struct d3d12_root_descriptor_table *root_signature_get_descriptor_table( + const struct d3d12_root_signature *root_signature, unsigned int index) +{ + const struct d3d12_root_parameter *p = root_signature_get_parameter(root_signature, index); + assert(p->parameter_type == D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE); + return &p->u.descriptor_table; +} + +static const struct d3d12_root_constant *root_signature_get_32bit_constants( + const struct d3d12_root_signature *root_signature, unsigned int index) +{ + const struct d3d12_root_parameter *p = root_signature_get_parameter(root_signature, index); + assert(p->parameter_type == D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS); + return &p->u.constant; +} + +static const struct d3d12_root_parameter *root_signature_get_root_descriptor( + const struct d3d12_root_signature *root_signature, unsigned int index) +{ + const struct d3d12_root_parameter *p = root_signature_get_parameter(root_signature, index); + assert(p->parameter_type == D3D12_ROOT_PARAMETER_TYPE_CBV + || p->parameter_type == D3D12_ROOT_PARAMETER_TYPE_SRV + || p->parameter_type == D3D12_ROOT_PARAMETER_TYPE_UAV); + return p; +} + /* ID3D12Fence */ static struct d3d12_fence *impl_from_ID3D12Fence(ID3D12Fence *iface) { @@ -2037,8 +2070,7 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list unsigned int i, j, descriptor_count; struct d3d12_desc *descriptor; - assert(root_signature->parameters[index].parameter_type == D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE); - descriptor_table = &root_signature->parameters[index].u.descriptor_table; + descriptor_table = root_signature_get_descriptor_table(root_signature, index); descriptor_count = 0; for (i = 0; i < descriptor_table->range_count; ++i) @@ -2120,7 +2152,7 @@ static bool vk_write_descriptor_set_from_root_descriptor(VkWriteDescriptorSet *v vk_descriptor_write->descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; break; default: - ERR("Invalid root descriptor.\n"); + ERR("Invalid root descriptor %#x.\n", root_parameter->parameter_type); return false; } @@ -2172,7 +2204,7 @@ static void d3d12_command_list_update_push_descriptors(struct d3d12_command_list if (!(bindings->push_descriptor_dirty_mask & (1u << i))) continue; - root_parameter = &root_signature->parameters[i]; + root_parameter = root_signature_get_root_descriptor(root_signature, i); push_descriptor = &bindings->push_descriptors[i]; if (root_parameter->parameter_type == D3D12_ROOT_PARAMETER_TYPE_CBV) @@ -3385,7 +3417,7 @@ static void d3d12_command_list_set_descriptor_table(struct d3d12_command_list *l struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; const struct d3d12_root_signature *root_signature = bindings->root_signature; - assert(root_signature->parameters[index].parameter_type == D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE); + assert(root_signature_get_descriptor_table(root_signature, index)); assert(index < ARRAY_SIZE(bindings->descriptor_tables)); bindings->descriptor_tables[index] = base_descriptor; @@ -3425,8 +3457,7 @@ static void d3d12_command_list_set_root_constants(struct d3d12_command_list *lis const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const struct d3d12_root_constant *c; - assert(root_signature->parameters[index].parameter_type == D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS); - c = &root_signature->parameters[index].u.constant; + c = root_signature_get_32bit_constants(root_signature, index); VK_CALL(vkCmdPushConstants(list->vk_command_buffer, root_signature->vk_pipeline_layout, c->stage_flags, c->offset + offset * sizeof(uint32_t), count * sizeof(uint32_t), data)); } @@ -3491,7 +3522,7 @@ static void d3d12_command_list_set_root_cbv(struct d3d12_command_list *list, struct VkDescriptorBufferInfo buffer_info; struct d3d12_resource *resource; - root_parameter = &root_signature->parameters[index]; + root_parameter = root_signature_get_root_descriptor(root_signature, index); assert(root_parameter->parameter_type == D3D12_ROOT_PARAMETER_TYPE_CBV); resource = vkd3d_gpu_va_allocator_dereference(&list->device->gpu_va_allocator, gpu_address); @@ -3556,9 +3587,8 @@ static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *li VkDevice vk_device = list->device->vk_device; VkBufferView vk_buffer_view; - root_parameter = &root_signature->parameters[index]; - assert(root_parameter->parameter_type == D3D12_ROOT_PARAMETER_TYPE_SRV - || root_parameter->parameter_type == D3D12_ROOT_PARAMETER_TYPE_UAV); + root_parameter = root_signature_get_root_descriptor(root_signature, index); + assert(root_parameter->parameter_type != D3D12_ROOT_PARAMETER_TYPE_CBV); /* FIXME: Re-use buffer views. */ if (!vkd3d_create_raw_buffer_view(list->device, gpu_address, &vk_buffer_view)) -- 2.19.2

2 1

[PATCH vkd3d 4/6] tests: Skip some tests when VKD3D_VULKAN_DEVICE is set.
by Józef Kucia April 1, 2019

April 1, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Allows running tests with VKD3D_VULKAN_DEVICE. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/vkd3d_api.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 89b388fdf510..0bc481775f77 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -559,18 +559,25 @@ static void test_physical_device(void) vr = vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices); ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); - for (i = 0; i < count; ++i) + if (!getenv("VKD3D_VULKAN_DEVICE")) + { + for (i = 0; i < count; ++i) + { + trace("Creating device for Vulkan physical device %p.\n", vk_physical_devices[i]); + + create_info.vk_physical_device = vk_physical_devices[i]; + hr = vkd3d_create_device(&create_info, &IID_ID3D12Device, (void **)&device); + ok(hr == S_OK, "Failed to create device, hr %#x.\n", hr); + vk_physical_device = vkd3d_get_vk_physical_device(device); + ok(vk_physical_device == vk_physical_devices[i], + "Got unexpected Vulkan physical device %p.\n", vk_physical_device); + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } + } + else { - trace("Creating device for Vulkan physical device %p.\n", vk_physical_devices[i]); - - create_info.vk_physical_device = vk_physical_devices[i]; - hr = vkd3d_create_device(&create_info, &IID_ID3D12Device, (void **)&device); - ok(hr == S_OK, "Failed to create device, hr %#x.\n", hr); - vk_physical_device = vkd3d_get_vk_physical_device(device); - ok(vk_physical_device == vk_physical_devices[i], - "Got unexpected Vulkan physical device %p.\n", vk_physical_device); - refcount = ID3D12Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + skip("VKD3D_VULKAN_DEVICE is set.\n"); } free(vk_physical_devices); -- 2.19.2

2 1

[PATCH vkd3d 2/6] tests: Add test for fragment w coordinate.
by Józef Kucia April 1, 2019

April 1, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 148 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 123 insertions(+), 25 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1eca3b9c6063..68df96f52db8 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5012,12 +5012,35 @@ static void test_fragment_coords(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; ID3D12GraphicsCommandList *command_list; + D3D12_INPUT_LAYOUT_DESC input_layout; struct test_context_desc desc; + D3D12_VERTEX_BUFFER_VIEW vbv; struct test_context context; struct resource_readback rb; + const struct vec4 *v = NULL; + struct vec4 expected = {0}; ID3D12CommandQueue *queue; - unsigned int x, y; + unsigned int i, x = 0, y; + ID3D12Resource *vb; + bool all_match; + static const DWORD vs_code[] = + { +#if 0 + void main(float4 in_position : POSITION, out float4 out_position : SV_POSITION) + { + out_position = in_position; + } +#endif + 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; static const DWORD ps_code[] = { #if 0 @@ -5035,46 +5058,121 @@ static void test_fragment_coords(void) 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const struct vec4 vertices[] = + { + {-1.0f, -1.0f, 0.00f, 1.00f}, + {-1.0f, 1.0f, 0.00f, 1.00f}, + { 1.0f, -1.0f, 0.00f, 1.00f}, + { 1.0f, 1.0f, 0.00f, 1.00f}, + + {-1.0f, -1.0f, 0.25f, 1.00f}, + {-1.0f, 1.0f, 0.25f, 1.00f}, + { 1.0f, -1.0f, 0.25f, 1.00f}, + { 1.0f, 1.0f, 0.25f, 1.00f}, + + {-1.0f, -1.0f, 0.50f, 1.00f}, + {-1.0f, 1.0f, 0.50f, 1.00f}, + { 1.0f, -1.0f, 0.50f, 1.00f}, + { 1.0f, 1.0f, 0.50f, 1.00f}, + + {-1.0f, -1.0f, 0.75f, 1.00f}, + {-1.0f, 1.0f, 0.75f, 1.00f}, + { 1.0f, -1.0f, 0.75f, 1.00f}, + { 1.0f, 1.0f, 0.75f, 1.00f}, + + {-1.0f, -1.0f, 1.00f, 1.00f}, + {-1.0f, 1.0f, 1.00f, 1.00f}, + { 1.0f, -1.0f, 1.00f, 1.00f}, + { 1.0f, 1.0f, 1.00f, 1.00f}, + + {-1.0f, -1.0f, 1.00f, 0.50f}, + {-1.0f, 1.0f, 1.00f, 0.50f}, + { 1.0f, -1.0f, 1.00f, 0.50f}, + { 1.0f, 1.0f, 1.00f, 0.50f}, + + {-1.0f, -1.0f, 1.00f, 0.25f}, + {-1.0f, 1.0f, 1.00f, 0.25f}, + { 1.0f, -1.0f, 1.00f, 0.25f}, + { 1.0f, 1.0f, 1.00f, 0.25f}, + }; memset(&desc, 0, sizeof(desc)); desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT; - desc.ps = &ps; + desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT; + desc.no_pipeline = true; if (!init_test_context(&context, &desc)) return; command_list = context.list; queue = context.queue; - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout); - ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); - ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); - ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); - 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); + vb = create_upload_buffer(context.device, sizeof(vertices), vertices); + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); + vbv.StrideInBytes = sizeof(*vertices); + vbv.SizeInBytes = sizeof(vertices); - set_viewport(&context.viewport, 10.0f, 10.0f, 20.0f, 30.0f, 0.0f, 1.0f); - ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); - ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + for (i = 0; i < ARRAY_SIZE(vertices) / 4; ++i) + { + vkd3d_test_set_context("Test %u", i); - transition_resource_state(command_list, context.render_target, - D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); - get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - for (y = 0; y < rb.height; ++y) - { - for (x = 0; x < rb.width; ++x) + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.0f, 1.0f); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 4 * i, 0); + + set_viewport(&context.viewport, 10.0f, 10.0f, 20.0f, 30.0f, 0.0f, 1.0f); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 4 * i, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); + all_match = true; + for (y = 0; y < rb.height; ++y) { - const struct vec4 *v = get_readback_vec4(&rb, x, y); - struct vec4 expected = {x + 0.5f, y + 0.5f, 0.0f, 1.0f}; - ok(compare_vec4(v, &expected, 0), - "Got %.8e, %.8e, %.8e, %.8e expected %.8e, %.8e, %.8e, %.8e.\n", - v->x, v->y, v->z, v->w, expected.x, expected.y, expected.z, expected.w); + for (x = 0; x < rb.width; ++x) + { + v = get_readback_vec4(&rb, x, y); + expected.x = x + 0.5f; + expected.y = y + 0.5f; + expected.z = vertices[4 * i].z / vertices[4 * i].w; + expected.w = vertices[4 * i].w; + if (!compare_vec4(v, &expected, 2)) + { + all_match = false; + break; + } + } + if (!all_match) + break; } + ok(all_match, "Got {%.8e, %.8e, %.8e, %.8e} expected {%.8e, %.8e, %.8e, %.8e} at (%u, %u).\n", + v->x, v->y, v->z, v->w, expected.x, expected.y, expected.z, expected.w, x, y); + 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); } - release_resource_readback(&rb); + vkd3d_test_set_context(NULL); + ID3D12Resource_Release(vb); destroy_test_context(&context); } -- 2.19.2

2 1

[PATCH vkd3d 1/6] vkd3d-shader: Fix SV_Position.w in pixel shaders.
by Józef Kucia April 1, 2019

April 1, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f8ba598ffbf0..6cacf7c4b8d3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1158,6 +1158,12 @@ static uint32_t vkd3d_spirv_build_op_composite_insert(struct vkd3d_spirv_builder result_type, object_id, composite_id, indexes, index_count); } +static uint32_t vkd3d_spirv_build_op_composite_insert1(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t object_id, uint32_t composite_id, uint32_t index) +{ + return vkd3d_spirv_build_op_composite_insert(builder, result_type, object_id, composite_id, &index, 1); +} + static uint32_t vkd3d_spirv_build_op_load(struct vkd3d_spirv_builder *builder, uint32_t result_type, uint32_t pointer_id, uint32_t memory_access) { @@ -3215,6 +3221,21 @@ static uint32_t sv_front_face_fixup(struct vkd3d_dxbc_compiler *compiler, return vkd3d_dxbc_compiler_emit_bool_to_int(compiler, 1, front_facing_id); } +/* frag_coord.w = 1.0f / frag_coord.w */ +static uint32_t frag_coord_fixup(struct vkd3d_dxbc_compiler *compiler, + uint32_t frag_coord_id) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t type_id, w_id; + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); + w_id = vkd3d_spirv_build_op_composite_extract1(builder, type_id, frag_coord_id, 3); + w_id = vkd3d_spirv_build_op_fdiv(builder, type_id, + vkd3d_dxbc_compiler_get_constant_float(compiler, 1.0f), w_id); + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); + return vkd3d_spirv_build_op_composite_insert1(builder, type_id, w_id, frag_coord_id, 3); +} + struct vkd3d_spirv_builtin { enum vkd3d_component_type component_type; @@ -3273,7 +3294,7 @@ vkd3d_system_value_builtins[] = }; static const struct vkd3d_spirv_builtin vkd3d_pixel_shader_position_builtin = { - VKD3D_TYPE_FLOAT, 4, SpvBuiltInFragCoord, + VKD3D_TYPE_FLOAT, 4, SpvBuiltInFragCoord, frag_coord_fixup, }; static const struct { @@ -6906,8 +6927,8 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil dref_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[3], VKD3DSP_WRITEMASK_0); /* XXX: Nvidia is broken and expects that the D_ref is packed together with coordinates. */ type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); - coordinate_id = vkd3d_spirv_build_op_composite_insert(builder, - type_id, dref_id, coordinate_id, &image.resource_type_info->coordinate_component_count, 1); + coordinate_id = vkd3d_spirv_build_op_composite_insert1(builder, + type_id, dref_id, coordinate_id, image.resource_type_info->coordinate_component_count); val_id = vkd3d_spirv_build_op_image_sample_dref(builder, op, sampled_type_id, image.sampled_image_id, coordinate_id, dref_id, operands_mask, image_operands, image_operand_count); -- 2.19.2

2 1

[PATCH] wined3d: Introduce a Vulkan based adapter implementation.
by Henri Verbeet April 1, 2019

April 1, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/adapter_vk.c | 105 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/directx.c | 3 ++ dlls/wined3d/utils.c | 5 ++ dlls/wined3d/wined3d_main.c | 27 +++++++---- dlls/wined3d/wined3d_private.h | 24 +++++++++- 6 files changed, 156 insertions(+), 9 deletions(-) create mode 100644 dlls/wined3d/adapter_vk.c diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index 39fed381d97..7ebd0106502 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = opengl32 user32 gdi32 advapi32 C_SRCS = \ adapter_gl.c \ + adapter_vk.c \ arb_program_shader.c \ ati_fragment_shader.c \ buffer.c \ diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c new file mode 100644 index 00000000000..e2c940dae9d --- /dev/null +++ b/dlls/wined3d/adapter_vk.c @@ -0,0 +1,105 @@ +/* + * Copyright 2018 Henri Verbeet 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 "config.h" +#include "wine/port.h" +#include "wined3d_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d); + +static void adapter_vk_destroy(struct wined3d_adapter *adapter) +{ + wined3d_adapter_cleanup(adapter); + heap_free(adapter); +} + +static BOOL adapter_vk_create_context(struct wined3d_context *context, + struct wined3d_texture *target, const struct wined3d_format *ds_format) +{ + return TRUE; +} + +static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, struct wined3d_caps *caps) +{ +} + +static BOOL adapter_vk_check_format(const struct wined3d_adapter *adapter, + const struct wined3d_format *adapter_format, const struct wined3d_format *rt_format, + const struct wined3d_format *ds_format) +{ + return TRUE; +} + +static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = +{ + adapter_vk_destroy, + adapter_vk_create_context, + adapter_vk_get_wined3d_caps, + adapter_vk_check_format, +}; + +static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, + unsigned int ordinal, unsigned int wined3d_creation_flags) +{ + const struct wined3d_gpu_description *gpu_description; + struct wined3d_adapter *adapter = &adapter_vk->a; + + TRACE("adapter_vk %p, ordinal %u, wined3d_creation_flags %#x.\n", + adapter_vk, ordinal, wined3d_creation_flags); + + if (!wined3d_adapter_init(adapter, ordinal)) + return FALSE; + + if (!(gpu_description = wined3d_get_gpu_description(HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA))) + { + ERR("Failed to get GPU description.\n"); + return FALSE; + } + wined3d_driver_info_init(&adapter->driver_info, gpu_description, wined3d_settings.emulated_textureram); + + if (!wined3d_adapter_vk_init_format_info(adapter)) + return FALSE; + + adapter->vertex_pipe = &none_vertex_pipe; + adapter->fragment_pipe = &none_fragment_pipe; + adapter->shader_backend = &none_shader_backend; + adapter->adapter_ops = &wined3d_adapter_vk_ops; + + adapter->d3d_info.wined3d_creation_flags = wined3d_creation_flags; + + return TRUE; +} + +struct wined3d_adapter *wined3d_adapter_vk_create(unsigned int ordinal, + unsigned int wined3d_creation_flags) +{ + struct wined3d_adapter_vk *adapter_vk; + + if (!(adapter_vk = heap_alloc_zero(sizeof(*adapter_vk)))) + return NULL; + + if (!wined3d_adapter_vk_init(adapter_vk, ordinal, wined3d_creation_flags)) + { + heap_free(adapter_vk); + return NULL; + } + + TRACE("Created adapter %p.\n", adapter_vk); + + return &adapter_vk->a; +} diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 83fa47a779b..49e56e0c847 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2314,6 +2314,9 @@ static struct wined3d_adapter *wined3d_adapter_create(unsigned int ordinal, DWOR if (wined3d_creation_flags & WINED3D_NO3D) return wined3d_adapter_no3d_create(ordinal, wined3d_creation_flags); + if (wined3d_settings.renderer == WINED3D_RENDERER_VULKAN) + return wined3d_adapter_vk_create(ordinal, wined3d_creation_flags); + return wined3d_adapter_gl_create(ordinal, wined3d_creation_flags); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a2422839e04..be76dbbfc1a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4067,6 +4067,11 @@ fail: return FALSE; } +BOOL wined3d_adapter_vk_init_format_info(struct wined3d_adapter *adapter) +{ + return wined3d_adapter_init_format_info(adapter, sizeof(struct wined3d_format)); +} + const struct wined3d_format *wined3d_get_format(const struct wined3d_adapter *adapter, enum wined3d_format_id format_id, unsigned int bind_flags) { diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 5ca58ae2403..d2e4978ee79 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -89,7 +89,7 @@ struct wined3d_settings wined3d_settings = ~0U, /* No GS shader model limit by default. */ ~0U, /* No PS shader model limit by default. */ ~0u, /* No CS shader model limit by default. */ - FALSE, /* 3D support enabled by default. */ + WINED3D_RENDERER_AUTO, WINED3D_SHADER_BACKEND_AUTO, }; @@ -104,11 +104,10 @@ struct wined3d * CDECL wined3d_create(DWORD flags) return NULL; } - if (wined3d_settings.no_3d) + if (wined3d_settings.renderer == WINED3D_RENDERER_NO3D) flags |= WINED3D_NO3D; - hr = wined3d_init(object, flags); - if (FAILED(hr)) + if (FAILED(hr = wined3d_init(object, flags))) { WARN("Failed to initialize wined3d object, hr %#x.\n", hr); heap_free(object); @@ -327,12 +326,24 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) TRACE("Limiting PS shader model to %u.\n", wined3d_settings.max_sm_ps); if (!get_config_key_dword(hkey, appkey, "MaxShaderModelCS", &wined3d_settings.max_sm_cs)) TRACE("Limiting CS shader model to %u.\n", wined3d_settings.max_sm_cs); - if ((!get_config_key(hkey, appkey, "renderer", buffer, size) + if (!get_config_key(hkey, appkey, "renderer", buffer, size) || !get_config_key(hkey, appkey, "DirectDrawRenderer", buffer, size)) - && !strcmp(buffer, "gdi")) { - TRACE("Disabling 3D support.\n"); - wined3d_settings.no_3d = TRUE; + if (!strcmp(buffer, "vulkan")) + { + ERR_(winediag)("Using the Vulkan renderer.\n"); + wined3d_settings.renderer = WINED3D_RENDERER_VULKAN; + } + else if (!strcmp(buffer, "gl")) + { + ERR_(winediag)("Using the OpenGL renderer.\n"); + wined3d_settings.renderer = WINED3D_RENDERER_OPENGL; + } + else if (!strcmp(buffer, "gdi") || !strcmp(buffer, "no3d")) + { + ERR_(winediag)("Disabling 3D support.\n"); + wined3d_settings.renderer = WINED3D_RENDERER_NO3D; + } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f482bb92189..5a455edb0c2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -379,6 +379,14 @@ static inline void wined3d_pause(void) #define PCI_VENDOR_NONE 0xffff /* e.g. 0x8086 for Intel and 0x10de for Nvidia */ #define PCI_DEVICE_NONE 0xffff /* e.g. 0x14f for a Geforce6200 */ +enum wined3d_renderer +{ + WINED3D_RENDERER_AUTO, + WINED3D_RENDERER_VULKAN, + WINED3D_RENDERER_OPENGL, + WINED3D_RENDERER_NO3D, +}; + enum wined3d_shader_backend { WINED3D_SHADER_BACKEND_AUTO, @@ -409,7 +417,7 @@ struct wined3d_settings unsigned int max_sm_gs; unsigned int max_sm_ps; unsigned int max_sm_cs; - BOOL no_3d; + enum wined3d_renderer renderer; enum wined3d_shader_backend shader_backend; }; @@ -2741,6 +2749,19 @@ struct wined3d_adapter *wined3d_adapter_gl_create(unsigned int ordinal, unsigned BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, struct wined3d_texture *target, const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; +struct wined3d_adapter_vk +{ + struct wined3d_adapter a; +}; + +static inline struct wined3d_adapter_vk *wined3d_adapter_vk(struct wined3d_adapter *adapter) +{ + return CONTAINING_RECORD(adapter, struct wined3d_adapter_vk, a); +} + +struct wined3d_adapter *wined3d_adapter_vk_create(unsigned int ordinal, + unsigned int wined3d_creation_flags) DECLSPEC_HIDDEN; + struct wined3d_caps_gl_ctx { HDC dc; @@ -2757,6 +2778,7 @@ struct wined3d_caps_gl_ctx BOOL wined3d_adapter_gl_init_format_info(struct wined3d_adapter *adapter, struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; BOOL wined3d_adapter_no3d_init_format_info(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; +BOOL wined3d_adapter_vk_init_format_info(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) DECLSPEC_HIDDEN; BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH v2 1/4] shell32/autocomplete: Forward to the original listbox proc outside the switch
by Gabriel Ivăncescu April 1, 2019

April 1, 2019

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Split the owner-drawn patch into two patches. dlls/shell32/autocomplete.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index bd9b872..ed8b270 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -801,23 +801,21 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, case WM_MOUSEMOVE: sel = SendMessageW(hwnd, LB_ITEMFROMPOINT, 0, lParam); SendMessageW(hwnd, LB_SETCURSEL, sel, 0); - break; + return 0; case WM_LBUTTONDOWN: sel = SendMessageW(hwnd, LB_GETCURSEL, 0, 0); if (sel < 0) - break; + return 0; len = SendMessageW(hwnd, LB_GETTEXTLEN, sel, 0); if (!(msg = heap_alloc((len + 1) * sizeof(WCHAR)))) - break; + return 0; len = SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg); set_text_and_selection(This, This->hwndEdit, msg, 0, len); hide_listbox(This, hwnd, TRUE); heap_free(msg); - break; - default: - return CallWindowProcW(This->wpOrigLBoxProc, hwnd, uMsg, wParam, lParam); + return 0; } - return 0; + return CallWindowProcW(This->wpOrigLBoxProc, hwnd, uMsg, wParam, lParam); } static void create_listbox(IAutoCompleteImpl *This) -- 2.20.1

3 9

[PATCH] ntoskrnl:improve stub for MmAllocateContiguousMemorySpecifyCache
by Louis Lenders April 1, 2019

April 1, 2019

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=46760 This let`s Nox player run tiny bit further to run into another unimplemented function ..... Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 77a610d7db..67e8bd38b9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2665,8 +2665,24 @@ PVOID WINAPI MmAllocateContiguousMemorySpecifyCache( SIZE_T size, PHYSICAL_ADDRESS BoundaryAddressMultiple, MEMORY_CACHING_TYPE CacheType ) { - FIXME(": stub\n"); - return NULL; + DWORD protect; + + FIXME( "%lu, %s %s %s %d stub\n", size, wine_dbgstr_longlong(lowest_valid_address.QuadPart), + wine_dbgstr_longlong(highest_valid_address.QuadPart), + wine_dbgstr_longlong(BoundaryAddressMultiple.QuadPart), CacheType ); + + protect = PAGE_READWRITE; + + switch( CacheType ) + { + case MmNonCached: + protect |= PAGE_NOCACHE; + break; + default: + break; + } + + return VirtualAlloc( NULL, size, MEM_RESERVE|MEM_COMMIT, protect ); } /*********************************************************************** -- 2.20.1

1 0

[PATCH] taskmgr: Use system font instead of special bitmap font.
by Vijay Kiran Kamuju April 1, 2019

April 1, 2019

From: Michael Müller <michael(a)fds-team.de> From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- programs/taskmgr/font.bmp | Bin 646 -> 0 bytes programs/taskmgr/graph.c | 14 ++++++++++++-- programs/taskmgr/resource.h | 1 - programs/taskmgr/taskmgr.c | 29 ----------------------------- programs/taskmgr/taskmgr.rc | 3 --- 5 files changed, 12 insertions(+), 35 deletions(-) delete mode 100644 programs/taskmgr/font.bmp diff --git a/programs/taskmgr/font.bmp b/programs/taskmgr/font.bmp deleted file mode 100644 index c1f8410c93273f4bc7013014561c35ef84faa182..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 646 zcma)(!4U#62u0EH6fcfdSci9eun5QVo~(m&sz_(+`>@G4J060-haZBlxj#Nf3wh&j z*b_Tr2Rq(a)-E}XxvX+aFPn4z{T33x(lt${jNLv39ZVf;klYOQWo0y8!j?qiD3aA3(K zIq{C$VS%n9(V2QTr);{O_DntBpT=8p%%lCvw&%ZnE9Lyb=%2T9J{pLZxOXEEt2{0S rj&qR`_imbB3(wY5`TKp;OQ!n~kRUw=3;lV4-TOj~_w9QN#T)VkBip4W diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c index e6819cfbb4..7e978e16f7 100644 --- a/programs/taskmgr/graph.c +++ b/programs/taskmgr/graph.c @@ -43,6 +43,7 @@ static void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd) RECT rcClient; RECT rcBarLeft; RECT rcBarRight; + RECT rcText; WCHAR Text[256]; ULONG CpuUsage; ULONG CpuKernelUsage; @@ -96,7 +97,11 @@ static void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd) * Draw the font text onto the graph * The bottom 20 pixels are reserved for the text */ - Font_DrawText(hDC, Text, ((rcClient.right - rcClient.left) - 32) / 2, rcClient.bottom - 11 - 5); + CopyRect(&rcText, &rcClient); + rcText.top = rcText.bottom - 19; + + SetTextColor(hDC, BRIGHT_GREEN); + DrawTextW(hDC, Text, -1, &rcText, DT_CENTER); /* * Now we have to draw the graph @@ -223,6 +228,7 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) RECT rcClient; RECT rcBarLeft; RECT rcBarRight; + RECT rcText; WCHAR Text[256]; ULONGLONG CommitChargeTotal; ULONGLONG CommitChargeLimit; @@ -257,7 +263,11 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) * Draw the font text onto the graph * The bottom 20 pixels are reserved for the text */ - Font_DrawText(hDC, Text, ((rcClient.right - rcClient.left) - (lstrlenW(Text) * 8)) / 2, rcClient.bottom - 11 - 5); + CopyRect(&rcText, &rcClient); + rcText.top = rcText.bottom - 19; + + SetTextColor(hDC, BRIGHT_GREEN); + DrawTextW(hDC, Text, -1, &rcText, DT_CENTER); /* * Now we have to draw the graph diff --git a/programs/taskmgr/resource.h b/programs/taskmgr/resource.h index cd43f156e9..4153f66c32 100644 --- a/programs/taskmgr/resource.h +++ b/programs/taskmgr/resource.h @@ -35,7 +35,6 @@ #define IDR_PROCESS_PAGE_CONTEXT 144 #define IDB_TRAYMASK 150 #define IDB_TRAYICON 153 -#define IDB_FONT 154 #define IDD_DEBUG_CHANNELS_DIALOG 155 #define IDC_DEBUG_CHANNELS_LIST 156 diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index b99d238814..d3337d2960 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -76,35 +76,6 @@ static void Draw3dRect(HDC hDC, int x, int y, int cx, int cy, COLORREF clrTopLef FillSolidRect2(hDC, x, y + cy, cx, -1, clrBottomRight); } -void Font_DrawText(HDC hDC, LPWSTR lpwszText, int x, int y) -{ - HDC hFontDC; - HBITMAP hFontBitmap; - HBITMAP hOldBitmap; - int i; - - hFontDC = CreateCompatibleDC(hDC); - hFontBitmap = LoadBitmapW(hInst, MAKEINTRESOURCEW(IDB_FONT)); - hOldBitmap = SelectObject(hFontDC, hFontBitmap); - - for (i = 0; lpwszText[i]; i++) { - if ((lpwszText[i] >= '0') && (lpwszText[i] <= '9')) { - BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, (lpwszText[i] - '0') * 8, 0, SRCCOPY); - } - else if (lpwszText[i] == 'K') - { - BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 80, 0, SRCCOPY); - } - else if (lpwszText[i] == '%') - { - BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 88, 0, SRCCOPY); - } - } - SelectObject(hFontDC, hOldBitmap); - DeleteObject(hFontBitmap); - DeleteDC(hFontDC); -} - static BOOL OnCreate(HWND hWnd) { HMENU hMenu; diff --git a/programs/taskmgr/taskmgr.rc b/programs/taskmgr/taskmgr.rc index e6742a7544..ffd0699f80 100644 --- a/programs/taskmgr/taskmgr.rc +++ b/programs/taskmgr/taskmgr.rc @@ -609,6 +609,3 @@ IDB_TRAYMASK BITMAP traymask.bmp /* @makedep: trayicon.bmp */ IDB_TRAYICON BITMAP trayicon.bmp - -/* @makedep: font.bmp */ -IDB_FONT BITMAP font.bmp -- 2.21.0

1 0

[PATCH] shlwapi: SHMapHandle should not set error when NULL is passed as hShared.
by Vijay Kiran Kamuju April 1, 2019

April 1, 2019

From: Sebastian Lackner <sebastian(a)fds-team.de> From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/shlwapi/ordinal.c | 6 ++++++ dlls/shlwapi/tests/ordinal.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 4118d4b308..657c33fffa 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -97,6 +97,12 @@ HANDLE WINAPI SHMapHandle(HANDLE hShared, DWORD dwSrcProcId, DWORD dwDstProcId, TRACE("(%p,%d,%d,%08x,%08x)\n", hShared, dwDstProcId, dwSrcProcId, dwAccess, dwOptions); + if (!hShared) + { + TRACE("Returning handle NULL\n"); + return NULL; + } + /* Get dest process handle */ if (dwDstProcId == dwMyProcId) hDst = GetCurrentProcess(); diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 97e4606443..6781b09432 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -556,7 +556,6 @@ static void test_alloc_shared_remote(DWORD procid, HANDLE hmem) SetLastError(0xdeadbeef); hmem2 = pSHMapHandle(NULL, procid, GetCurrentProcessId(), 0, 0); ok(hmem2 == NULL, "expected NULL, got new handle\n"); -todo_wine ok(GetLastError() == 0xdeadbeef, "last error should not have changed, got %u\n", GetLastError()); hmem2 = pSHMapHandle(hmem, procid, GetCurrentProcessId(), 0, 0); -- 2.21.0

1 0

Re: TestBot job 50182 results: [PATCH 1/2] kernel32: Partially implement VirtualAllocExNuma
by Fabian Maurer April 1, 2019

April 1, 2019

This is unrelated since I didn't touch the tests, or code that the tests used. PS: Still don't know why the PATCH is marked as OK on https:// source.winehq.org/patches/, when the testbot says it failed. Regards, Fabian Maurer > VM Status Failures Command > debian9 failed 2 > debian9 failed 2 > > You can also see the results at: > https://testbot.winehq.org/JobDetails.pl?Key=50182 > > > === debian9 (32 bit report) === > > kernel32: > Unhandled exception: page fault on write access to 0x00000000 in 32-bit code > (0x7ebcc85d). > > Report errors: > kernel32:virtual prints too much data (90431 bytes) > > === debian9 (32 bit Chinese:China report) === > > kernel32: > Unhandled exception: page fault on write access to 0x00000000 in 32-bit code > (0x7ebd785d). > > Report errors: > kernel32:virtual prints too much data (90431 bytes) > > === debian9 (32 bit WoW report) === > > kernel32: > Unhandled exception: page fault on write access to 0x00000000 in 32-bit code > (0x7ebcc85d). > > Report errors: > kernel32:virtual prints too much data (90502 bytes) > > === debian9 (64 bit WoW report) === > > kernel32: > Unhandled exception: page fault on write access to 0x00000000 in 64-bit code > (0x00007f9902d9e8a1). > > Report errors: > kernel32:virtual prints too much data (87157 bytes)

2 1