February 2019 - Wine-Commits

Michael Stefaniuc : msxml3: Remove useless casts to self.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: wine Branch: master Commit: 979c9db3ec248119580257e21eeb3173a3d0c851 URL: https://source.winehq.org/git/wine.git/?a=commit;h=979c9db3ec248119580257e2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Feb 18 21:14:02 2019 +0100 msxml3: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/httprequest.c | 2 +- dlls/msxml3/node.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 07eeb74..c6f9fdb 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -759,7 +759,7 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * case VT_ARRAY|VT_UI1: { sa = V_ARRAY(body); - if ((hr = SafeArrayAccessData(sa, (void **)&ptr)) != S_OK) + if ((hr = SafeArrayAccessData(sa, &ptr)) != S_OK) { heap_free(bsc); return hr; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index fc18935..27abf94 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1217,7 +1217,7 @@ static HRESULT node_transform_write(xsltStylesheetPtr style, xmlDocPtr result, B htmlSetMetaEncoding(result, (const xmlChar *)encoding); if (indent == -1) indent = 1; - htmldoc_dumpcontent(output, result, (const char*)encoding, indent); + htmldoc_dumpcontent(output, result, encoding, indent); } else if (method && xmlStrEqual(method, (const xmlChar *)"xhtml")) {

1 0

Józef Kucia : vkd3d: Implement SO statistics queries.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: vkd3d Branch: master Commit: 2ce7b2305a70eb299d3fccca8cdd0fb62d2e0e02 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2ce7b2305a70eb299d3fccc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 20 13:42:50 2019 +0100 vkd3d: Implement SO statistics queries. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 6 ++++++ libs/vkd3d/command.c | 35 +++++++++++++++++++++++++++++++---- libs/vkd3d/device.c | 1 + libs/vkd3d/resource.c | 13 ++++++++++--- libs/vkd3d/vkd3d_private.h | 1 + tests/d3d12.c | 11 ++++++++--- 6 files changed, 57 insertions(+), 10 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 8b2e70f..231123b 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1749,6 +1749,12 @@ typedef struct D3D12_QUERY_DATA_PIPELINE_STATISTICS UINT64 CSInvocations; } D3D12_QUERY_DATA_PIPELINE_STATISTICS; +typedef struct D3D12_QUERY_DATA_SO_STATISTICS +{ + UINT64 NumPrimitivesWritten; + UINT64 PrimitivesStorageNeeded; +} D3D12_QUERY_DATA_SO_STATISTICS; + typedef enum D3D12_PREDICATION_OP { D3D12_PREDICATION_OP_EQUAL_ZERO = 0, diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 7457ae3..5b11c3c 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4080,10 +4080,19 @@ static void STDMETHODCALLTYPE d3d12_command_list_BeginQuery(ID3D12GraphicsComman d3d12_command_list_end_current_render_pass(list); + VK_CALL(vkCmdResetQueryPool(list->vk_command_buffer, query_heap->vk_query_pool, index, 1)); + if (type == D3D12_QUERY_TYPE_OCCLUSION) flags = VK_QUERY_CONTROL_PRECISE_BIT; - VK_CALL(vkCmdResetQueryPool(list->vk_command_buffer, query_heap->vk_query_pool, index, 1)); + if (D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0 <= type && type <= D3D12_QUERY_TYPE_SO_STATISTICS_STREAM3) + { + unsigned int stream_index = type - D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0; + VK_CALL(vkCmdBeginQueryIndexedEXT(list->vk_command_buffer, + query_heap->vk_query_pool, index, flags, stream_index)); + return; + } + VK_CALL(vkCmdBeginQuery(list->vk_command_buffer, query_heap->vk_query_pool, index, flags)); } @@ -4110,9 +4119,28 @@ static void STDMETHODCALLTYPE d3d12_command_list_EndQuery(ID3D12GraphicsCommandL return; } + if (D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0 <= type && type <= D3D12_QUERY_TYPE_SO_STATISTICS_STREAM3) + { + unsigned int stream_index = type - D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0; + VK_CALL(vkCmdEndQueryIndexedEXT(list->vk_command_buffer, + query_heap->vk_query_pool, index, stream_index)); + return; + } + VK_CALL(vkCmdEndQuery(list->vk_command_buffer, query_heap->vk_query_pool, index)); } +static size_t get_query_stride(D3D12_QUERY_TYPE type) +{ + if (type == D3D12_QUERY_TYPE_PIPELINE_STATISTICS) + return sizeof(D3D12_QUERY_DATA_PIPELINE_STATISTICS); + + if (D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0 <= type && type <= D3D12_QUERY_TYPE_SO_STATISTICS_STREAM3) + return sizeof(D3D12_QUERY_DATA_SO_STATISTICS); + + return sizeof(uint64_t); +} + static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12GraphicsCommandList *iface, ID3D12QueryHeap *heap, D3D12_QUERY_TYPE type, UINT start_index, UINT query_count, ID3D12Resource *dst_buffer, UINT64 aligned_dst_buffer_offset) @@ -4120,9 +4148,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics const struct d3d12_query_heap *query_heap = unsafe_impl_from_ID3D12QueryHeap(heap); struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); struct d3d12_resource *buffer = unsafe_impl_from_ID3D12Resource(dst_buffer); - VkDeviceSize offset, stride = sizeof(uint64_t); const struct vkd3d_vk_device_procs *vk_procs; unsigned int i, first, count; + VkDeviceSize offset, stride; TRACE("iface %p, heap %p, type %#x, start_index %u, query_count %u, " "dst_buffer %p, aligned_dst_buffer_offset %#"PRIx64".\n", @@ -4149,8 +4177,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics d3d12_command_list_end_current_render_pass(list); - if (type == D3D12_QUERY_TYPE_PIPELINE_STATISTICS) - stride = sizeof(struct D3D12_QUERY_DATA_PIPELINE_STATISTICS); + stride = get_query_stride(type); count = 0; first = start_index; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index df59a49..3d9b8c9 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -945,6 +945,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->device_limits = device_properties2.properties.limits; vulkan_info->sparse_properties = device_properties2.properties.sparseProperties; vulkan_info->rasterization_stream = xfb_properties.transformFeedbackRasterizationStreamSelect; + vulkan_info->transform_feedback_queries = xfb_properties.transformFeedbackQueries; vulkan_info->max_vertex_attrib_divisor = max(vertex_divisor_properties.maxVertexAttribDivisor, 1); device->feature_options.DoublePrecisionFloatShaderOps = features->shaderFloat64; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 34f558d..1176538 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2835,9 +2835,16 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_H break; case D3D12_QUERY_HEAP_TYPE_SO_STATISTICS: - FIXME("Unsupported query heap type SO_STATISTICS.\n"); - vkd3d_free(object); - return E_NOTIMPL; + if (!device->vk_info.transform_feedback_queries) + { + FIXME("Transform feedback queries are not supported by Vulkan implementation.\n"); + vkd3d_free(object); + return E_NOTIMPL; + } + + pool_info.queryType = VK_QUERY_TYPE_TRANSFORM_FEEDBACK_STREAM_EXT; + pool_info.pipelineStatistics = 0; + break; default: WARN("Invalid query heap type %u.\n", desc->Type); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index dee129e..9b2fbaf 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -93,6 +93,7 @@ struct vkd3d_vulkan_info bool EXT_vertex_attribute_divisor; bool rasterization_stream; + bool transform_feedback_queries; bool vertex_attrib_zero_divisor; unsigned int max_vertex_attrib_divisor; diff --git a/tests/d3d12.c b/tests/d3d12.c index 259f0ca..e83ea48 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -19007,10 +19007,15 @@ static void test_create_query_heap(void) heap_desc.NodeMask = 0; hr = ID3D12Device_CreateQueryHeap(device, &heap_desc, &IID_ID3D12QueryHeap, (void **)&query_heap); - todo ok(hr == S_OK, "Failed to create query heap, type %u, hr %#x.\n", heap_desc.Type, hr); - - if (hr == S_OK) + if (hr != E_NOTIMPL) + { + ok(hr == S_OK, "Failed to create query heap, type %u, hr %#x.\n", heap_desc.Type, hr); ID3D12QueryHeap_Release(query_heap); + } + else + { + skip("Stream output is not supported.\n"); + } refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);

1 0

Józef Kucia : vkd3d-shader: Avoid using SPIR-V built-ins for shader interface between tessellation stages.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: vkd3d Branch: master Commit: d274318fe22e8be78fea9516c29cdb48d598d890 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d274318fe22e8be78fea951… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 20 13:42:51 2019 +0100 vkd3d-shader: Avoid using SPIR-V built-ins for shader interface between tessellation stages. We can do this because both tessellation shaders are required in Direct3D. Signed-off-by: Józef Kucia <jkucia(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 | 67 +++++++++++++++++------------------------------ 1 file changed, 24 insertions(+), 43 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6ba169f..afed8a2 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -129,20 +129,6 @@ static const void *vkd3d_find_struct_(const struct vkd3d_struct *chain, return NULL; } -static enum vkd3d_shader_input_sysval_semantic vkd3d_siv_from_sysval(enum vkd3d_sysval_semantic sysval) -{ - switch (sysval) - { - case VKD3D_SV_NONE: - return VKD3D_SIV_NONE; - case VKD3D_SV_POSITION: - return VKD3D_SIV_POSITION; - default: - FIXME("Unhandled sysval %#x.\n", sysval); - return VKD3D_SIV_NONE; - } -} - #define VKD3D_SPIRV_VERSION 0x00010000 #define VKD3D_SPIRV_GENERATOR_ID 18 #define VKD3D_SPIRV_GENERATOR_VERSION 1 @@ -3558,9 +3544,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi return 0; } - if (!sysval && signature_element->sysval_semantic) - sysval = vkd3d_siv_from_sysval(signature_element->sysval_semantic); - builtin = get_spirv_builtin_for_sysval(compiler, sysval); component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); @@ -5014,11 +4997,12 @@ static const struct vkd3d_shader_phase *vkd3d_dxbc_compiler_get_control_point_ph static void vkd3d_dxbc_compiler_emit_default_control_point_phase(struct vkd3d_dxbc_compiler *compiler) { - const struct vkd3d_shader_signature *signature = compiler->input_signature; + const struct vkd3d_shader_signature *output_signature = compiler->output_signature; + const struct vkd3d_shader_signature *input_signature = compiler->input_signature; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_spirv_builtin *builtin, *input_builtin; uint32_t type_id, input_ptr_type_id, output_ptr_type_id; uint32_t input_id, output_id, dst_id, src_id; - const struct vkd3d_spirv_builtin *builtin; enum vkd3d_component_type component_type; unsigned int component_count; uint32_t invocation_id; @@ -5030,48 +5014,45 @@ static void vkd3d_dxbc_compiler_emit_default_control_point_phase(struct vkd3d_dx type_id = vkd3d_spirv_get_type_id(builder, builtin->component_type, builtin->component_count); invocation_id = vkd3d_spirv_build_op_load(builder, type_id, invocation_id, SpvMemoryAccessMaskNone); - for (i = 0; i < signature->element_count; ++i) + assert(input_signature->element_count == output_signature->element_count); + for (i = 0; i < output_signature->element_count; ++i) { - const struct vkd3d_shader_signature_element *e = &signature->elements[i]; + const struct vkd3d_shader_signature_element *output = &output_signature->elements[i]; + const struct vkd3d_shader_signature_element *input = &input_signature->elements[i]; + + assert((input->mask & 0xff) == (output->mask & 0xff)); + assert(input->component_type == output->component_type); - if ((builtin = get_spirv_builtin_for_sysval(compiler, e->sysval_semantic))) + if ((input_builtin = get_spirv_builtin_for_sysval(compiler, input->sysval_semantic))) { - component_type = builtin->component_type; - component_count = builtin->component_count; + component_type = input_builtin->component_type; + component_count = input_builtin->component_count; } else { - component_type = e->component_type; - component_count = vkd3d_write_mask_component_count(e->mask & 0xff); + component_type = input->component_type; + component_count = vkd3d_write_mask_component_count(input->mask & 0xff); } - if (builtin) + if (input_builtin) { input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, - builtin, SpvStorageClassInput, compiler->input_control_point_count); + input_builtin, SpvStorageClassInput, compiler->input_control_point_count); } else { input_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, SpvStorageClassInput, component_type, component_count, compiler->input_control_point_count); vkd3d_spirv_add_iface_variable(builder, input_id); - vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationLocation, e->register_index); + vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationLocation, input->register_index); } - vkd3d_spirv_build_op_name(builder, input_id, "vicp%u", e->register_index); + vkd3d_spirv_build_op_name(builder, input_id, "vicp%u", input->register_index); - if (builtin) - { - output_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, - builtin, SpvStorageClassOutput, compiler->output_control_point_count); - } - else - { - output_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, - SpvStorageClassOutput, component_type, component_count, compiler->output_control_point_count); - vkd3d_spirv_add_iface_variable(builder, output_id); - vkd3d_spirv_build_op_decorate1(builder, output_id, SpvDecorationLocation, e->register_index); - } - vkd3d_spirv_build_op_name(builder, output_id, "vocp%u", e->register_index); + output_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, + SpvStorageClassOutput, component_type, component_count, compiler->output_control_point_count); + vkd3d_spirv_add_iface_variable(builder, output_id); + vkd3d_spirv_build_op_decorate1(builder, output_id, SpvDecorationLocation, output->register_index); + vkd3d_spirv_build_op_name(builder, output_id, "vocp%u", output->register_index); type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); output_ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassOutput, type_id);

1 0

Józef Kucia : tests: Add test for quad tessellation.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: vkd3d Branch: master Commit: a248aced81851728dedcceddb307fbfd91695747 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a248aced81851728dedcced… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 20 13:42:52 2019 +0100 tests: Add test for quad tessellation. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 488 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 485 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=a248aced81851728ded…

1 0

Józef Kucia : vkd3d-shader: Add basic support for dcl_index_range.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: vkd3d Branch: master Commit: b6de566e3abe57d38a0e7e2c7929100b4b2f9d59 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b6de566e3abe57d38a0e7e2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 20 13:42:53 2019 +0100 vkd3d-shader: Add basic support for dcl_index_range. We can address SPIR-V arrays dynamically. Signed-off-by: Józef Kucia <jkucia(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 | 4 +- libs/vkd3d-shader/spirv.c | 74 ++++++++++++++++++++++++++++++-- libs/vkd3d-shader/trace.c | 4 +- libs/vkd3d-shader/vkd3d_shader_private.h | 4 +- 4 files changed, 76 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 4911668..7cc11e7 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -619,8 +619,8 @@ static void shader_sm4_read_dcl_index_range(struct vkd3d_shader_instruction *ins struct vkd3d_sm4_data *priv) { shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_OPAQUE, - &ins->declaration.index_range.first_register); - ins->declaration.index_range.last_register = *tokens; + &ins->declaration.index_range.dst); + ins->declaration.index_range.register_count = *tokens; } static void shader_sm4_read_dcl_output_topology(struct vkd3d_shader_instruction *ins, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index afed8a2..52c22fe 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2568,14 +2568,17 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp } else if (register_info->is_aggregate) { - if (reg->idx[0].rel_addr || reg->idx[1].rel_addr) + if (reg->idx[1].rel_addr) FIXME("Relative addressing not implemented.\n"); - indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, register_info->member_idx); + if (reg->idx[0].rel_addr) + indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[0]); + else + indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, register_info->member_idx); } else { - if (reg->idx[1].rel_addr) + if (reg->idx[1].rel_addr || (reg->idx[1].offset == ~0u && reg->idx[0].rel_addr)) FIXME("Relative addressing not implemented.\n"); /* Handle arrayed registers, e.g. v[3][0]. */ @@ -4754,6 +4757,64 @@ static void vkd3d_dxbc_compiler_emit_dcl_output_siv(struct vkd3d_dxbc_compiler * vkd3d_dxbc_compiler_emit_output(compiler, dst, sysval); } +static bool vkd3d_dxbc_compiler_check_index_range(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_index_range *range) +{ + const struct vkd3d_shader_register *reg = &range->dst.reg; + struct vkd3d_shader_register_info reg_info; + struct vkd3d_shader_register current_reg; + struct vkd3d_symbol reg_symbol; + unsigned int i; + uint32_t id; + + current_reg = *reg; + vkd3d_symbol_make_register(&reg_symbol, &current_reg); + if (!vkd3d_dxbc_compiler_get_register_info(compiler, &current_reg, &reg_info)) + { + ERR("Failed to get register info.\n"); + return false; + } + + /* FIXME: We should check if it's an array. */ + if (!reg_info.is_aggregate) + { + FIXME("Unhandled register %#x.\n", reg->type); + return false; + } + id = reg_info.id; + + for (i = reg->idx[0].offset; i < reg->idx[0].offset + range->register_count; ++i) + { + current_reg.idx[0].offset = i; + vkd3d_symbol_make_register(&reg_symbol, &current_reg); + + if (range->dst.write_mask != reg_info.write_mask + || vkd3d_write_mask_component_count(reg_info.write_mask) != 1) + { + FIXME("Unhandled index range write mask %#x (%#x).\n", + range->dst.write_mask, reg_info.write_mask); + return false; + } + + if (reg_info.id != id) + { + FIXME("Unhandled index range %#x, %u.\n", reg->type, i); + return false; + } + } + + return true; +} + +static void vkd3d_dxbc_compiler_emit_dcl_index_range(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + const struct vkd3d_shader_index_range *range = &instruction->declaration.index_range; + + if (!vkd3d_dxbc_compiler_check_index_range(compiler, range)) + FIXME("Ignoring dcl_index_range %#x %u.\n", range->dst.reg.type, range->register_count); +} + static void vkd3d_dxbc_compiler_emit_dcl_stream(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -7388,6 +7449,9 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_DCL_OUTPUT_SIV: vkd3d_dxbc_compiler_emit_dcl_output_siv(compiler, instruction); break; + case VKD3DSIH_DCL_INDEX_RANGE: + vkd3d_dxbc_compiler_emit_dcl_index_range(compiler, instruction); + break; case VKD3DSIH_DCL_STREAM: vkd3d_dxbc_compiler_emit_dcl_stream(compiler, instruction); break; @@ -7730,7 +7794,6 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ vkd3d_spirv_build_op_function(builder, void_id, function_id, SpvFunctionControlMaskNone, function_type_id); - vkd3d_spirv_build_op_name(builder, function_id, "epilogue"); for (i = 0; i < ARRAY_SIZE(compiler->private_output_variable); ++i) { @@ -7789,7 +7852,10 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, } if (compiler->epilogue_function_id) + { + vkd3d_spirv_build_op_name(builder, compiler->epilogue_function_id, "epilogue"); vkd3d_dxbc_compiler_emit_shader_epilogue_function(compiler); + } if (compiler->options & VKD3D_SHADER_STRIP_DEBUG) vkd3d_spirv_stream_clear(&builder->debug_stream); diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 6375e71..bb0e6ad 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1389,8 +1389,8 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, case VKD3DSIH_DCL_INDEX_RANGE: shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); - shader_dump_dst_param(buffer, &ins->declaration.index_range.first_register, shader_version); - shader_addline(buffer, " %u", ins->declaration.index_range.last_register); + shader_dump_dst_param(buffer, &ins->declaration.index_range.dst, shader_version); + shader_addline(buffer, " %u", ins->declaration.index_range.register_count); break; case VKD3DSIH_DCL_INDEXABLE_TEMP: diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 6b095a9..7ffcdd9 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -584,8 +584,8 @@ struct vkd3d_shader_src_param struct vkd3d_shader_index_range { - struct vkd3d_shader_dst_param first_register; - unsigned int last_register; + struct vkd3d_shader_dst_param dst; + unsigned int register_count; }; enum vkd3d_decl_usage

1 0

Józef Kucia : tests: Add another hull shader to NOP tessellation shaders test.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: vkd3d Branch: master Commit: d3622628bf348d820c2c5920a5c05004cb8c0dfe URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d3622628bf348d820c2c592… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 20 13:42:54 2019 +0100 tests: Add another hull shader to NOP tessellation shaders test. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 65 insertions(+), 13 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5a4e90b..4e42000 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21838,6 +21838,7 @@ static void test_nop_tessellation_shaders(void) struct test_context context; ID3D12CommandQueue *queue; struct vec4 tess_factors; + unsigned int i; HRESULT hr; static const DWORD hs_cb_code[] = @@ -21913,6 +21914,16 @@ static void test_nop_tessellation_shaders(void) } [domain("tri")] + [outputcontrolpoints(3)] + [partitioning("integer")] + [outputtopology("triangle_cw")] + [patchconstantfunc("patch_constant")] + data hs_main(InputPatch<data, 3> input, uint i : SV_OutputControlPointID) + { + return input[i]; + } + + [domain("tri")] void ds_main(patch_constant_data input, float3 tess_coord : SV_DomainLocation, const OutputPatch<data, 3> patch, @@ -21923,6 +21934,27 @@ static void test_nop_tessellation_shaders(void) + tess_coord.z * patch[2].position; } #endif + static const DWORD hs_code[] = + { + 0x43425844, 0x0e9a8861, 0x39351e76, 0x0e10883f, 0x6054b5a1, 0x00000001, 0x0000020c, 0x00000004, + 0x00000030, 0x00000064, 0x00000098, 0x0000012c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x47534350, 0x0000008c, + 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x0000000d, 0x00000003, 0x00000000, 0x00000e01, + 0x00000068, 0x00000001, 0x0000000d, 0x00000003, 0x00000001, 0x00000e01, 0x00000068, 0x00000002, + 0x0000000d, 0x00000003, 0x00000002, 0x00000e01, 0x00000076, 0x00000000, 0x0000000e, 0x00000003, + 0x00000003, 0x00000e01, 0x545f5653, 0x46737365, 0x6f746361, 0x56530072, 0x736e495f, 0x54656469, + 0x46737365, 0x6f746361, 0xabab0072, 0x58454853, 0x000000d8, 0x00030050, 0x00000036, 0x01000071, + 0x01001893, 0x01001894, 0x01001095, 0x01000896, 0x01001897, 0x0100086a, 0x01000073, 0x02000099, + 0x00000003, 0x0200005f, 0x00017000, 0x04000067, 0x00102012, 0x00000000, 0x00000011, 0x04000067, + 0x00102012, 0x00000001, 0x00000012, 0x04000067, 0x00102012, 0x00000002, 0x00000013, 0x02000068, + 0x00000001, 0x0400005b, 0x00102012, 0x00000000, 0x00000003, 0x04000036, 0x00100012, 0x00000000, + 0x0001700a, 0x06000036, 0x00902012, 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, 0x0100003e, + 0x01000073, 0x04000067, 0x00102012, 0x00000003, 0x00000014, 0x05000036, 0x00102012, 0x00000003, + 0x00004001, 0x3f800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)}; static const DWORD ds_code[] = { 0x43425844, 0x8ed11021, 0x414dff74, 0x426849eb, 0x312f4860, 0x00000001, 0x000001e0, 0x00000004, @@ -21942,6 +21974,7 @@ static void test_nop_tessellation_shaders(void) 0x00000000, 0x0001caa6, 0x00219e46, 0x00000002, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)}; + static const D3D12_SHADER_BYTECODE *hull_shaders[] = {&hs_cb, &hs}; memset(&desc, 0, sizeof(desc)); desc.no_root_signature = true; @@ -21964,23 +21997,42 @@ static void test_nop_tessellation_shaders(void) hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, &IID_ID3D12PipelineState, (void **)&context.pipeline_state); ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr); + ID3D12PipelineState_Release(context.pipeline_state); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + for (i = 0; i < ARRAY_SIZE(hull_shaders); ++i) + { + vkd3d_test_set_context("Test %u", i); - 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_3_CONTROL_POINT_PATCHLIST); - ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); - ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); - tess_factors.x = tess_factors.y = tess_factors.z = tess_factors.w = 1.0f; - ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &tess_factors.x, 0); - ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + pso_desc.HS = *hull_shaders[i]; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr); - 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); - check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + 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_3_CONTROL_POINT_PATCHLIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + tess_factors.x = tess_factors.y = tess_factors.z = tess_factors.w = 1.0f; + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &tess_factors.x, 0); + 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, 0xff00ff00, 0); + + 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); + + ID3D12PipelineState_Release(context.pipeline_state); + context.pipeline_state = NULL; + } + vkd3d_test_set_context(NULL); destroy_test_context(&context); }

1 0

Józef Kucia : vkd3d-shader: Replace VKD3DSIH_TABLE_SIZE with VKD3DSIH_INVALID.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: vkd3d Branch: master Commit: 3fbbc681609498e7538b7303c5c3d92a8d5ff475 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3fbbc681609498e7538b730… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 20 13:42:48 2019 +0100 vkd3d-shader: Replace VKD3DSIH_TABLE_SIZE with VKD3DSIH_INVALID. Signed-off-by: Józef Kucia <jkucia(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 | 10 +++++----- libs/vkd3d-shader/trace.c | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 3 ++- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 0b5f7bc..5e4babb 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -545,7 +545,7 @@ static void shader_sm4_read_shader_data(struct vkd3d_shader_instruction *ins, if (icb_size % 4 || icb_size > MAX_IMMEDIATE_CONSTANT_BUFFER_SIZE) { FIXME("Unexpected immediate constant buffer size %u.\n", icb_size); - ins->handler_idx = VKD3DSIH_TABLE_SIZE; + ins->handler_idx = VKD3DSIH_INVALID; return; } @@ -1689,7 +1689,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha if (!(opcode_info = get_opcode_info(opcode))) { FIXME("Unrecognized opcode %#x, opcode_token 0x%08x.\n", opcode, opcode_token); - ins->handler_idx = VKD3DSIH_TABLE_SIZE; + ins->handler_idx = VKD3DSIH_INVALID; *ptr += len; return; } @@ -1733,7 +1733,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha if (!(shader_sm4_read_dst_param(priv, &p, *ptr, map_data_type(opcode_info->dst_info[i]), &priv->dst_param[i]))) { - ins->handler_idx = VKD3DSIH_TABLE_SIZE; + ins->handler_idx = VKD3DSIH_INVALID; return; } priv->dst_param[i].modifiers |= instruction_dst_modifier; @@ -1744,7 +1744,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha if (!(shader_sm4_read_src_param(priv, &p, *ptr, map_data_type(opcode_info->src_info[i]), &priv->src_param[i]))) { - ins->handler_idx = VKD3DSIH_TABLE_SIZE; + ins->handler_idx = VKD3DSIH_INVALID; return; } } @@ -1754,7 +1754,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha fail: *ptr = priv->end; - ins->handler_idx = VKD3DSIH_TABLE_SIZE; + ins->handler_idx = VKD3DSIH_INVALID; return; } diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index cb7452b..6375e71 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1602,7 +1602,7 @@ void vkd3d_shader_trace(void *data) struct vkd3d_shader_instruction ins; shader_sm4_read_instruction(data, &ptr, &ins); - if (ins.handler_idx == VKD3DSIH_TABLE_SIZE) + if (ins.handler_idx == VKD3DSIH_INVALID) { WARN("Skipping unrecognized instruction.\n"); shader_addline(&buffer, "<unrecognized instruction>\n"); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 6e6880c..55cb56c 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -175,7 +175,7 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, { shader_sm4_read_instruction(parser.data, &parser.ptr, &instruction); - if (instruction.handler_idx == VKD3DSIH_TABLE_SIZE) + if (instruction.handler_idx == VKD3DSIH_INVALID) { WARN("Encountered unrecognized or invalid instruction.\n"); vkd3d_dxbc_compiler_destroy(spirv_compiler); @@ -305,7 +305,7 @@ int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, { shader_sm4_read_instruction(parser.data, &parser.ptr, &instruction); - if (instruction.handler_idx == VKD3DSIH_TABLE_SIZE) + if (instruction.handler_idx == VKD3DSIH_INVALID) { WARN("Encountered unrecognized or invalid instruction.\n"); vkd3d_shader_parser_destroy(&parser); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 40d46b3..6b095a9 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -300,7 +300,8 @@ enum VKD3D_SHADER_INSTRUCTION_HANDLER VKD3DSIH_USHR, VKD3DSIH_UTOF, VKD3DSIH_XOR, - VKD3DSIH_TABLE_SIZE + + VKD3DSIH_INVALID, }; enum vkd3d_shader_register_type

1 0

Józef Kucia : vkd3d-shader: Set xxxx swizzle for scalar registers.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: vkd3d Branch: master Commit: 7b84adec32e4bd1d8f9ee7f92924367a43fdf0da URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7b84adec32e4bd1d8f9ee7f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 20 13:42:49 2019 +0100 vkd3d-shader: Set xxxx swizzle for scalar registers. Mainly for vOutputControlPointID. Signed-off-by: Józef Kucia <jkucia(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 | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5e4babb..4911668 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1511,6 +1511,25 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr return true; } +static bool shader_sm4_is_scalar_register(const struct vkd3d_shader_register *reg) +{ + switch (reg->type) + { + case VKD3DSPR_COVERAGE: + case VKD3DSPR_DEPTHOUT: + case VKD3DSPR_DEPTHOUTGE: + case VKD3DSPR_DEPTHOUTLE: + case VKD3DSPR_GSINSTID: + case VKD3DSPR_LOCALTHREADINDEX: + case VKD3DSPR_OUTPOINTID: + case VKD3DSPR_PRIMID: + case VKD3DSPR_SAMPLEMASK: + return true; + default: + return false; + } +} + static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param) { @@ -1541,7 +1560,10 @@ static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD * switch (swizzle_type) { case VKD3D_SM4_SWIZZLE_NONE: - src_param->swizzle = VKD3D_NO_SWIZZLE; + if (shader_sm4_is_scalar_register(&src_param->reg)) + src_param->swizzle = VKD3D_SWIZZLE(VKD3D_SWIZZLE_X, VKD3D_SWIZZLE_X, VKD3D_SWIZZLE_X, VKD3D_SWIZZLE_X); + else + src_param->swizzle = VKD3D_NO_SWIZZLE; break; case VKD3D_SM4_SWIZZLE_SCALAR: @@ -1562,25 +1584,6 @@ static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD * return true; } -static bool shader_sm4_is_scalar_register(const struct vkd3d_shader_register *reg) -{ - switch (reg->type) - { - case VKD3DSPR_COVERAGE: - case VKD3DSPR_DEPTHOUT: - case VKD3DSPR_DEPTHOUTGE: - case VKD3DSPR_DEPTHOUTLE: - case VKD3DSPR_GSINSTID: - case VKD3DSPR_LOCALTHREADINDEX: - case VKD3DSPR_OUTPOINTID: - case VKD3DSPR_PRIMID: - case VKD3DSPR_SAMPLEMASK: - return true; - default: - return false; - } -} - static bool shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_dst_param *dst_param) {

1 0

Józef Kucia : vkd3d-shader: Handle VKD3DSPR_INCONTROLPOINT in vkd3d_dxbc_compiler_get_register_id().
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: vkd3d Branch: master Commit: 197c1d9612cd006340f9e70f1e8d48757a3511d6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=197c1d9612cd006340f9e70… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 20 13:42:55 2019 +0100 vkd3d-shader: Handle VKD3DSPR_INCONTROLPOINT in vkd3d_dxbc_compiler_get_register_id(). Signed-off-by: Józef Kucia <jkucia(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 | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 52c22fe..2b52334 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2604,21 +2604,22 @@ static uint32_t vkd3d_dxbc_compiler_get_register_id(struct vkd3d_dxbc_compiler * switch (reg->type) { - case VKD3DSPR_TEMP: - case VKD3DSPR_IDXTEMP: - case VKD3DSPR_INPUT: - case VKD3DSPR_OUTPUT: case VKD3DSPR_COLOROUT: + case VKD3DSPR_CONSTBUFFER: case VKD3DSPR_DEPTHOUT: case VKD3DSPR_DEPTHOUTGE: case VKD3DSPR_DEPTHOUTLE: - case VKD3DSPR_CONSTBUFFER: + case VKD3DSPR_IDXTEMP: case VKD3DSPR_IMMCONSTBUFFER: - case VKD3DSPR_SAMPLER: - case VKD3DSPR_THREADID: + case VKD3DSPR_INCONTROLPOINT: + case VKD3DSPR_INPUT: case VKD3DSPR_LOCALTHREADID: case VKD3DSPR_LOCALTHREADINDEX: + case VKD3DSPR_OUTPUT: + case VKD3DSPR_SAMPLER: + case VKD3DSPR_TEMP: case VKD3DSPR_THREADGROUPID: + case VKD3DSPR_THREADID: if (vkd3d_dxbc_compiler_get_register_info(compiler, reg, &register_info)) { vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &register_info);

1 0

Zebediah Figura : user32: Correctly place minimized windows.
by Alexandre Julliard Feb. 19, 2019

Feb. 19, 2019

Module: wine Branch: master Commit: 04707a342fa3535cf1b36742ac0fbb8c7c9532fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=04707a342fa3535cf1b36742… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 19 12:17:41 2019 -0600 user32: Correctly place minimized windows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 6 ----- dlls/user32/winpos.c | 68 ++++++++++++++----------------------------------- 2 files changed, 19 insertions(+), 55 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 5f101b3..3444aba 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6915,14 +6915,12 @@ static void test_ShowWindow_child(HWND hwndMain) SetRect(&expect, 0, expect.bottom - GetSystemMetrics(SM_CYMINIMIZED), GetSystemMetrics(SM_CXMINIMIZED), expect.bottom); OffsetRect(&expect, pt.x, pt.y); - todo_wine ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); /* shouldn't be able to resize minimized windows */ ret = SetWindowPos(hwnd, 0, 0, 0, 200, 200, SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); ok(ret, "wrong ret %d\n", ret); GetWindowRect(hwnd, &rect); - todo_wine ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); /* test NC area */ @@ -6943,7 +6941,6 @@ static void test_ShowWindow_child(HWND hwndMain) ok(style & WS_MINIMIZE, "window should be minimized\n"); ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); GetWindowRect(hwnd2, &rect); - todo_wine ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); @@ -7046,14 +7043,12 @@ static void test_ShowWindow_mdichild(HWND hwndMain) SetRect(&expect, 0, expect.bottom - GetSystemMetrics(SM_CYMINIMIZED), GetSystemMetrics(SM_CXMINIMIZED), expect.bottom); OffsetRect(&expect, pt.x, pt.y); - todo_wine ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); /* shouldn't be able to resize minimized windows */ ret = SetWindowPos(hwnd, 0, 0, 0, 200, 200, SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); ok(ret, "wrong ret %d\n", ret); GetWindowRect(hwnd, &rect); - todo_wine ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); /* test NC area */ @@ -7074,7 +7069,6 @@ static void test_ShowWindow_mdichild(HWND hwndMain) ok(style & WS_MINIMIZE, "window should be minimized\n"); ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); GetWindowRect(hwnd2, &rect); - todo_wine ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6d137d7..4a28a6f 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -922,21 +922,13 @@ static void get_next_minimized_child_pos( const RECT *parent, const MINIMIZEDMET } } -/*********************************************************************** - * WINPOS_FindIconPos - * - * Find a suitable place for an iconic window. - */ -static POINT WINPOS_FindIconPos( HWND hwnd, POINT pt ) +static POINT get_minimized_pos( HWND hwnd, POINT pt ) { RECT rect, rectParent; HWND parent, child; HRGN hrgn, tmp; - int x, y, xspacing, yspacing; MINIMIZEDMETRICS metrics; - - metrics.cbSize = sizeof(metrics); - SystemParametersInfoW( SPI_GETMINIMIZEDMETRICS, sizeof(metrics), &metrics, 0 ); + int width, height; parent = GetAncestor( hwnd, GA_PARENT ); if (parent == GetDesktopWindow()) @@ -950,12 +942,15 @@ static POINT WINPOS_FindIconPos( HWND hwnd, POINT pt ) } else GetClientRect( parent, &rectParent ); - if ((pt.x >= rectParent.left) && (pt.x + GetSystemMetrics(SM_CXICON) < rectParent.right) && - (pt.y >= rectParent.top) && (pt.y + GetSystemMetrics(SM_CYICON) < rectParent.bottom)) + if ((pt.x >= rectParent.left) && (pt.x + GetSystemMetrics( SM_CXMINIMIZED ) < rectParent.right) && + (pt.y >= rectParent.top) && (pt.y + GetSystemMetrics( SM_CYMINIMIZED ) < rectParent.bottom)) return pt; /* The icon already has a suitable position */ - xspacing = GetSystemMetrics(SM_CXICONSPACING); - yspacing = GetSystemMetrics(SM_CYICONSPACING); + width = GetSystemMetrics( SM_CXMINIMIZED ); + height = GetSystemMetrics( SM_CYMINIMIZED ); + + metrics.cbSize = sizeof(metrics); + SystemParametersInfoW( SPI_GETMINIMIZEDMETRICS, sizeof(metrics), &metrics, 0 ); /* Check if another icon already occupies this spot */ /* FIXME: this is completely inefficient */ @@ -975,42 +970,17 @@ static POINT WINPOS_FindIconPos( HWND hwnd, POINT pt ) } DeleteObject( tmp ); - for (y = 0; y < (rectParent.bottom - rectParent.top) / yspacing; y++) + pt = get_first_minimized_child_pos( &rectParent, &metrics, width, height ); + for (;;) { - if (metrics.iArrange & ARW_STARTTOP) - { - rect.top = rectParent.top + y * yspacing; - rect.bottom = rect.top + yspacing; - } - else - { - rect.bottom = rectParent.bottom - y * yspacing; - rect.top = rect.bottom - yspacing; - } - for (x = 0; x < (rectParent.right - rectParent.left) / xspacing; x++) - { - if (metrics.iArrange & ARW_STARTRIGHT) - { - rect.right = rectParent.right - x * xspacing; - rect.left = rect.right - xspacing; - } - else - { - rect.left = rectParent.left + x * xspacing; - rect.right = rect.left + xspacing; - } - if (!RectInRegion( hrgn, &rect )) - { - /* No window was found, so it's OK for us */ - pt.x = rect.left + (xspacing - GetSystemMetrics(SM_CXICON)) / 2; - pt.y = rect.top + (yspacing - GetSystemMetrics(SM_CYICON)) / 2; - DeleteObject( hrgn ); - return pt; - } - } + SetRect( &rect, pt.x, pt.y, pt.x + width, pt.y + height ); + if (!RectInRegion( hrgn, &rect )) + break; + + get_next_minimized_child_pos( &rectParent, &metrics, width, height, &pt ); } + DeleteObject( hrgn ); - pt.x = pt.y = 0; return pt; } @@ -1041,7 +1011,7 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) case SW_SHOWMINIMIZED: case SW_FORCEMINIMIZE: case SW_MINIMIZE: - wpl.ptMinPosition = WINPOS_FindIconPos( hwnd, wpl.ptMinPosition ); + wpl.ptMinPosition = get_minimized_pos( hwnd, wpl.ptMinPosition ); SetRect( rect, wpl.ptMinPosition.x, wpl.ptMinPosition.y, wpl.ptMinPosition.x + GetSystemMetrics(SM_CXMINIMIZED), @@ -1071,7 +1041,7 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) old_style = WIN_SetStyle( hwnd, WS_MINIMIZE, WS_MAXIMIZE ); - wpl.ptMinPosition = WINPOS_FindIconPos( hwnd, wpl.ptMinPosition ); + wpl.ptMinPosition = get_minimized_pos( hwnd, wpl.ptMinPosition ); if (!(old_style & WS_MINIMIZE)) swpFlags |= SWP_STATECHANGED; SetRect( rect, wpl.ptMinPosition.x, wpl.ptMinPosition.y,

1 0