May 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : winedump: Print fake dll information also for NE files.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: ddadd9d84be8b241c0322623647d723848df7cd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddadd9d84be8b241c0322623… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 18 09:37:24 2019 +0200 winedump: Print fake dll information also for NE files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/ne.c | 1 + tools/winedump/pe.c | 2 +- tools/winedump/winedump.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/winedump/ne.c b/tools/winedump/ne.c index ae0388b..b4f4f89 100644 --- a/tools/winedump/ne.c +++ b/tools/winedump/ne.c @@ -427,6 +427,7 @@ void ne_dump( void ) dos = PRD(0, sizeof(*dos)); if (!dos) return; ne = PRD(dos->e_lfanew, sizeof(*ne)); + print_fake_dll(); if (globals.do_dumpheader || !globals.dumpsect) dump_ne_header( ne ); diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index d33e8ef..d24e30a 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -98,7 +98,7 @@ static const IMAGE_NT_HEADERS32 *get_nt_header( void ) return PRD(dos->e_lfanew, sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER)); } -static void print_fake_dll( void ) +void print_fake_dll( void ) { static const char builtin_signature[] = "Wine builtin DLL"; static const char fakedll_signature[] = "Wine placeholder DLL"; diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index ea95b27..c165872 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -228,6 +228,7 @@ unsigned int strlenW( const unsigned short *str ); void dump_unicode_str( const unsigned short *str, int len ); const char* get_guid_str(const GUID* guid); const char* get_symbol_str(const char* symname); +void print_fake_dll(void); void dump_file_header(const IMAGE_FILE_HEADER *); void dump_optional_header(const IMAGE_OPTIONAL_HEADER32 *, UINT); void dump_section(const IMAGE_SECTION_HEADER *, const char* strtable);

1 0

Alexandre Julliard : ntdll: Set LDR_WINE_INTERNAL flag also for PE builtins.
by Alexandre Julliard 20 May '19

20 May '19

Module: wine Branch: master Commit: b8743f1f0b359de14e16d6f75595635e7205ddd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8743f1f0b359de14e16d6f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 19 10:21:36 2019 +0200 ntdll: Set LDR_WINE_INTERNAL flag also for PE builtins. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c77f329..da41fdf 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2147,6 +2147,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, const UNICODE_STRING *nt_nam wm->ino = st->st_ino; if (image_info->loader_flags) wm->ldr.Flags |= LDR_COR_IMAGE; if (image_info->image_flags & IMAGE_FLAGS_ComPlusILOnly) wm->ldr.Flags |= LDR_COR_ILONLY; + if (image_info->image_flags & IMAGE_FLAGS_WineBuiltin) wm->ldr.Flags |= LDR_WINE_INTERNAL; set_security_cookie( module, image_info->map_size ); @@ -3347,7 +3348,8 @@ static void free_modref( WINE_MODREF *wm ) free_tls_slot( &wm->ldr ); RtlReleaseActivationContext( wm->ldr.ActivationContext ); - if (wm->ldr.Flags & LDR_WINE_INTERNAL) wine_dll_unload( wm->ldr.SectionHandle ); + if ((wm->ldr.Flags & LDR_WINE_INTERNAL) && wm->ldr.SectionHandle) + wine_dll_unload( wm->ldr.SectionHandle ); NtUnmapViewOfSection( NtCurrentProcess(), wm->ldr.BaseAddress ); if (cached_modref == wm) cached_modref = NULL; RtlFreeUnicodeString( &wm->ldr.FullDllName );

1 0

Philip Rebohle : vkd3d-shader: Parse ISG1, PSG1 and OSG1 signatures.
by Alexandre Julliard 20 May '19

20 May '19

Module: vkd3d Branch: master Commit: 578ce3653ddf1f8dd16d45ecd0f2b7b0e3ccdf61 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=578ce3653ddf1f8dd16d45e… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Sat May 18 12:03:14 2019 +0200 vkd3d-shader: Parse ISG1, PSG1 and OSG1 signatures. These signatures extend the OSG5 format by a minimum precision hint, which gets ignored for now but could be implemented using 16-bit floats in the future. Fixes some shader parsing errors in Resident Evil 2. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 1 + libs/vkd3d-shader/dxbc.c | 21 ++++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 28c3274..318a438 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -580,6 +580,7 @@ struct vkd3d_shader_signature_element enum vkd3d_component_type component_type; unsigned int register_index; unsigned int mask; + unsigned int min_precision; }; struct vkd3d_shader_signature diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 520e208..92ea174 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1852,9 +1852,12 @@ bool shader_sm4_is_end(void *data, const DWORD **ptr) ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') #define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') +#define TAG_ISG1 MAKE_TAG('I', 'S', 'G', '1') #define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') #define TAG_OSG5 MAKE_TAG('O', 'S', 'G', '5') +#define TAG_OSG1 MAKE_TAG('O', 'S', 'G', '1') #define TAG_PCSG MAKE_TAG('P', 'C', 'S', 'G') +#define TAG_PSG1 MAKE_TAG('P', 'S', 'G', '1') #define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') #define TAG_SHEX MAKE_TAG('S', 'H', 'E', 'X') #define TAG_AON9 MAKE_TAG('A', 'o', 'n', '9') @@ -1993,6 +1996,7 @@ static int shader_parse_signature(DWORD tag, const char *data, DWORD data_size, const char *ptr = data; unsigned int i; DWORD count; + bool has_stream_index, has_min_precision; if (!require_space(0, 2, sizeof(DWORD), data_size)) { @@ -2017,11 +2021,14 @@ static int shader_parse_signature(DWORD tag, const char *data, DWORD data_size, return VKD3D_ERROR_OUT_OF_MEMORY; } + has_min_precision = tag == TAG_OSG1 || tag == TAG_PSG1 || tag == TAG_ISG1; + has_stream_index = tag == TAG_OSG5 || has_min_precision; + for (i = 0; i < count; ++i) { DWORD name_offset; - if (tag == TAG_OSG5) + if (has_stream_index) read_dword(&ptr, &e[i].stream_index); else e[i].stream_index = 0; @@ -2038,10 +2045,15 @@ static int shader_parse_signature(DWORD tag, const char *data, DWORD data_size, read_dword(&ptr, &e[i].register_index); read_dword(&ptr, &e[i].mask); + if (has_min_precision) + read_dword(&ptr, &e[i].min_precision); + else + e[i].min_precision = 0; + TRACE("Stream: %u, semantic: %s, semantic idx: %u, sysval_semantic %#x, " - "type %u, register idx: %u, use_mask %#x, input_mask %#x.\n", + "type %u, register idx: %u, use_mask %#x, input_mask %#x, precision %u.\n", e[i].stream_index, debugstr_a(e[i].semantic_name), e[i].semantic_index, e[i].sysval_semantic, - e[i].component_type, e[i].register_index, (e[i].mask >> 8) & 0xff, e[i].mask & 0xff); + e[i].component_type, e[i].register_index, (e[i].mask >> 8) & 0xff, e[i].mask & 0xff, e[i].min_precision); } s->elements = e; @@ -2084,6 +2096,7 @@ static int shdr_handler(const char *data, DWORD data_size, DWORD tag, void *cont switch (tag) { case TAG_ISGN: + case TAG_ISG1: if (desc->input_signature.elements) { FIXME("Multiple input signatures.\n"); @@ -2095,6 +2108,7 @@ static int shdr_handler(const char *data, DWORD data_size, DWORD tag, void *cont case TAG_OSGN: case TAG_OSG5: + case TAG_OSG1: if (desc->output_signature.elements) { FIXME("Multiple output signatures.\n"); @@ -2105,6 +2119,7 @@ static int shdr_handler(const char *data, DWORD data_size, DWORD tag, void *cont break; case TAG_PCSG: + case TAG_PSG1: if (desc->patch_constant_signature.elements) { FIXME("Multiple patch constant signatures.\n");

1 0

Philip Rebohle : vkd3d: Enable VK_KHR_draw_indirect_count.
by Alexandre Julliard 20 May '19

20 May '19

Module: vkd3d Branch: master Commit: ca744ae57918c138be9ed12ea96403f07e4c0620 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ca744ae57918c138be9ed12… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Mon May 20 09:09:23 2019 +0200 vkd3d: Enable VK_KHR_draw_indirect_count. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> 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/device.c | 1 + libs/vkd3d/vkd3d_private.h | 1 + libs/vkd3d/vulkan_procs.h | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5239911..ddec0f7 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -151,6 +151,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = { /* KHR extensions */ {VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_dedicated_allocation)}, + {VK_KHR_DRAW_INDIRECT_COUNT_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_draw_indirect_count)}, {VK_KHR_GET_MEMORY_REQUIREMENTS_2_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_get_memory_requirements2)}, {VK_KHR_MAINTENANCE3_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_maintenance3)}, {VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_push_descriptor)}, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 0f0d77f..036b9eb 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -92,6 +92,7 @@ struct vkd3d_vulkan_info /* KHR device extensions */ bool KHR_dedicated_allocation; + bool KHR_draw_indirect_count; bool KHR_get_memory_requirements2; bool KHR_maintenance3; bool KHR_push_descriptor; diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index 38ead47..a55fb07 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -177,6 +177,10 @@ VK_DEVICE_PFN(vkUnmapMemory) VK_DEVICE_PFN(vkUpdateDescriptorSets) VK_DEVICE_PFN(vkWaitForFences) +/* VK_KHR_draw_indirect_count */ +VK_DEVICE_EXT_PFN(vkCmdDrawIndirectCountKHR); +VK_DEVICE_EXT_PFN(vkCmdDrawIndexedIndirectCountKHR); + /* VK_KHR_get_memory_requirements2 */ VK_DEVICE_EXT_PFN(vkGetBufferMemoryRequirements2KHR) VK_DEVICE_EXT_PFN(vkGetImageMemoryRequirements2KHR)

1 0

Philip Rebohle : vkd3d: Support count buffer for indirect draws.
by Alexandre Julliard 20 May '19

20 May '19

Module: vkd3d Branch: master Commit: f1076bb15333a7177e7b5406121a77601c8dfb54 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f1076bb15333a7177e7b540… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Mon May 20 09:09:24 2019 +0200 vkd3d: Support count buffer for indirect draws. Used by Resident Evil 2. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> 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/command.c | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9187ad0..2fdd980 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4872,6 +4872,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC UINT64 arg_buffer_offset, ID3D12Resource *count_buffer, UINT64 count_buffer_offset) { struct d3d12_command_signature *sig_impl = unsafe_impl_from_ID3D12CommandSignature(command_signature); + struct d3d12_resource *count_impl = unsafe_impl_from_ID3D12Resource(count_buffer); struct d3d12_resource *arg_impl = unsafe_impl_from_ID3D12Resource(arg_buffer); struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); const D3D12_COMMAND_SIGNATURE_DESC *signature_desc; @@ -4885,9 +4886,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC vk_procs = &list->device->vk_procs; - if (count_buffer) + if (count_buffer && !list->device->vk_info.KHR_draw_indirect_count) { - FIXME("Count buffers not implemented.\n"); + FIXME("Count buffers not supported by Vulkan implementation.\n"); return; } @@ -4905,8 +4906,17 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC break; } - VK_CALL(vkCmdDrawIndirect(list->vk_command_buffer, arg_impl->u.vk_buffer, - arg_buffer_offset, max_command_count, signature_desc->ByteStride)); + if (count_buffer) + { + VK_CALL(vkCmdDrawIndirectCountKHR(list->vk_command_buffer, arg_impl->u.vk_buffer, + arg_buffer_offset, count_impl->u.vk_buffer, count_buffer_offset, + max_command_count, signature_desc->ByteStride)); + } + else + { + VK_CALL(vkCmdDrawIndirect(list->vk_command_buffer, arg_impl->u.vk_buffer, + arg_buffer_offset, max_command_count, signature_desc->ByteStride)); + } break; case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED: @@ -4918,14 +4928,29 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC d3d12_command_list_check_index_buffer_strip_cut_value(list); - VK_CALL(vkCmdDrawIndexedIndirect(list->vk_command_buffer, arg_impl->u.vk_buffer, - arg_buffer_offset, max_command_count, signature_desc->ByteStride)); + if (count_buffer) + { + VK_CALL(vkCmdDrawIndexedIndirectCountKHR(list->vk_command_buffer, arg_impl->u.vk_buffer, + arg_buffer_offset, count_impl->u.vk_buffer, count_buffer_offset, + max_command_count, signature_desc->ByteStride)); + } + else + { + VK_CALL(vkCmdDrawIndexedIndirect(list->vk_command_buffer, arg_impl->u.vk_buffer, + arg_buffer_offset, max_command_count, signature_desc->ByteStride)); + } break; case D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH: if (max_command_count != 1) FIXME("Ignoring command count %u.\n", max_command_count); + if (count_buffer) + { + FIXME("Count buffers not supported for indirect dispatch.\n"); + break; + } + if (list->state->vk_bind_point != VK_PIPELINE_BIND_POINT_COMPUTE) { WARN("Pipeline state %p has bind point %#x, ignoring dispatch.\n",

1 0

Philip Rebohle : tests: Add test for indirect draws with count buffer.
by Alexandre Julliard 20 May '19

20 May '19

Module: vkd3d Branch: master Commit: c6685f9fd2acd8bfa7d1f0dae1432a4375bea483 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c6685f9fd2acd8bfa7d1f0d… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Mon May 20 09:09:25 2019 +0200 tests: Add test for indirect draws with count buffer. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> 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 | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index c7dfd8a..5ad3ea7 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21554,10 +21554,10 @@ static void test_resolve_query_data_in_reordered_command_list(void) static void test_execute_indirect(void) { + ID3D12Resource *argument_buffer, *count_buffer, *uav; D3D12_ROOT_SIGNATURE_DESC root_signature_desc; ID3D12CommandSignature *command_signature; ID3D12GraphicsCommandList *command_list; - ID3D12Resource *argument_buffer, *uav; D3D12_INPUT_LAYOUT_DESC input_layout; D3D12_ROOT_PARAMETER root_parameter; ID3D12PipelineState *pipeline_state; @@ -21682,6 +21682,7 @@ static void test_execute_indirect(void) {2, 3, 4}, {{6, 1, 0, 0, 0}, {6, 1, 0, 4, 0}}, }; + static const uint32_t count_data[] = {1, 2}; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; memset(&desc, 0, sizeof(desc)); @@ -21692,6 +21693,7 @@ static void test_execute_indirect(void) queue = context.queue; argument_buffer = create_upload_buffer(context.device, sizeof(argument_data), &argument_data); + count_buffer = create_upload_buffer(context.device, sizeof(count_data), count_data); command_signature = create_command_signature(context.device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW); @@ -21710,6 +21712,25 @@ static void test_execute_indirect(void) 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); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature, 1, argument_buffer, 0, + count_buffer, 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); ID3D12CommandSignature_Release(command_signature); command_signature = create_command_signature(context.device, D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH); @@ -21796,6 +21817,35 @@ static void test_execute_indirect(void) check_readback_data_uint(&rb, &box, 0xff00ff00, 0); release_resource_readback(&rb); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, &ibv); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature, + ARRAY_SIZE(argument_data.indexed_draws), argument_buffer, + offsetof(struct argument_data, indexed_draws), count_buffer, sizeof(uint32_t)); + + 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); + set_box(&box, 0, 0, 0, 32, 8, 1); + check_readback_data_uint(&rb, &box, 0xffffff00, 0); + set_box(&box, 24, 8, 0, 32, 32, 1); + check_readback_data_uint(&rb, &box, 0xffffff00, 0); + set_box(&box, 0, 8, 0, 24, 32, 1); + check_readback_data_uint(&rb, &box, 0xff00ff00, 0); + release_resource_readback(&rb); + ID3D12PipelineState_Release(pipeline_state); ID3D12RootSignature_Release(root_signature); ID3D12Resource_Release(ib); @@ -21803,6 +21853,7 @@ static void test_execute_indirect(void) ID3D12Resource_Release(vb); ID3D12CommandSignature_Release(command_signature); ID3D12Resource_Release(argument_buffer); + ID3D12Resource_Release(count_buffer); destroy_test_context(&context); }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_apply_compute_state().
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 376c84252634ec1884db3562d859ec728668c7ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=376c84252634ec1884db3562… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 17 16:33:16 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_apply_compute_state(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 54 ++++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bd30c14..5735d02 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4037,51 +4037,51 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, return TRUE; } -static void context_apply_compute_state(struct wined3d_context *context, +static void wined3d_context_gl_apply_compute_state(struct wined3d_context_gl *context_gl, const struct wined3d_device *device, const struct wined3d_state *state) { - const struct wined3d_state_entry *state_table = context->state_table; - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_state_entry *state_table = context_gl->c.state_table; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; unsigned int state_id, i; - context_load_shader_resources(context, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); - context_load_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_COMPUTE], + context_load_shader_resources(&context_gl->c, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); + context_load_unordered_access_resources(&context_gl->c, state->shader[WINED3D_SHADER_TYPE_COMPUTE], state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); - for (i = 0, state_id = STATE_COMPUTE_OFFSET; i < ARRAY_SIZE(context->dirty_compute_states); ++i) + for (i = 0, state_id = STATE_COMPUTE_OFFSET; i < ARRAY_SIZE(context_gl->c.dirty_compute_states); ++i) { - unsigned int dirty_mask = context->dirty_compute_states[i]; + unsigned int dirty_mask = context_gl->c.dirty_compute_states[i]; + while (dirty_mask) { unsigned int current_state_id = state_id + wined3d_bit_scan(&dirty_mask); - state_table[current_state_id].apply(context, state, current_state_id); + state_table[current_state_id].apply(&context_gl->c, state, current_state_id); } - state_id += sizeof(*context->dirty_compute_states) * CHAR_BIT; + state_id += sizeof(*context_gl->c.dirty_compute_states) * CHAR_BIT; } - memset(context->dirty_compute_states, 0, sizeof(*context->dirty_compute_states)); + memset(context_gl->c.dirty_compute_states, 0, sizeof(*context_gl->c.dirty_compute_states)); - if (context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_COMPUTE)) + if (context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_COMPUTE)) { - device->shader_backend->shader_select_compute(device->shader_priv, context, state); - context->shader_update_mask &= ~(1u << WINED3D_SHADER_TYPE_COMPUTE); + device->shader_backend->shader_select_compute(device->shader_priv, &context_gl->c, state); + context_gl->c.shader_update_mask &= ~(1u << WINED3D_SHADER_TYPE_COMPUTE); } - if (context->update_compute_shader_resource_bindings) + if (context_gl->c.update_compute_shader_resource_bindings) { - wined3d_context_gl_bind_shader_resources(wined3d_context_gl(context), state, WINED3D_SHADER_TYPE_COMPUTE); - context->update_compute_shader_resource_bindings = 0; + wined3d_context_gl_bind_shader_resources(context_gl, state, WINED3D_SHADER_TYPE_COMPUTE); + context_gl->c.update_compute_shader_resource_bindings = 0; if (gl_info->limits.combined_samplers == gl_info->limits.graphics_samplers) - context->update_shader_resource_bindings = 1; + context_gl->c.update_shader_resource_bindings = 1; } - if (context->update_compute_unordered_access_view_bindings) + if (context_gl->c.update_compute_unordered_access_view_bindings) { - context_bind_unordered_access_views(context, + context_bind_unordered_access_views(&context_gl->c, state->shader[WINED3D_SHADER_TYPE_COMPUTE], state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); - context->update_compute_unordered_access_view_bindings = 0; - context->update_unordered_access_view_bindings = 1; + context_gl->c.update_compute_unordered_access_view_bindings = 0; + context_gl->c.update_unordered_access_view_bindings = 1; } /* Updates to currently bound render targets aren't necessarily coherent @@ -4092,10 +4092,10 @@ static void context_apply_compute_state(struct wined3d_context *context, * Without this, the bloom effect in Nier:Automata is too bright on the * Mesa radeonsi driver, and presumably on other Mesa based drivers. */ wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, 0); - context_invalidate_state(context, STATE_FRAMEBUFFER); + context_invalidate_state(&context_gl->c, STATE_FRAMEBUFFER); - context->last_was_blit = FALSE; - context->last_was_ffp_blit = FALSE; + context_gl->c.last_was_blit = FALSE; + context_gl->c.last_was_ffp_blit = FALSE; } static BOOL use_transform_feedback(const struct wined3d_state *state) @@ -4311,6 +4311,7 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state const struct wined3d_dispatch_parameters *parameters) { const struct wined3d_gl_info *gl_info; + struct wined3d_context_gl *context_gl; struct wined3d_context *context; context = context_acquire(device, NULL, 0); @@ -4320,6 +4321,7 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state WARN("Invalid context, skipping dispatch.\n"); return; } + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; if (!gl_info->supported[ARB_COMPUTE_SHADER]) @@ -4332,7 +4334,7 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state if (parameters->indirect) wined3d_buffer_load(parameters->u.indirect.buffer, context, state); - context_apply_compute_state(context, device, state); + wined3d_context_gl_apply_compute_state(context_gl, device, state); if (!state->shader[WINED3D_SHADER_TYPE_COMPUTE]) {

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_level_box() in wined3d_device_update_texture().
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 099b05ce6feb507b6a158ef4074d0817d4a0b1d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=099b05ce6feb507b6a158ef4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 17 16:33:17 2019 +0430 wined3d: Use wined3d_texture_get_level_box() in wined3d_device_update_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5272e2e..5a94d03 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3821,7 +3821,6 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, unsigned int src_size, dst_size, src_skip_levels = 0; unsigned int src_level_count, dst_level_count; unsigned int layer_count, level_count, i, j; - unsigned int width, height, depth; enum wined3d_resource_type type; struct wined3d_box box; @@ -3892,11 +3891,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, /* Update every surface level of the texture. */ for (i = 0; i < level_count; ++i) { - width = wined3d_texture_get_level_width(dst_texture, i); - height = wined3d_texture_get_level_height(dst_texture, i); - depth = wined3d_texture_get_level_depth(dst_texture, i); - wined3d_box_set(&box, 0, 0, width, height, 0, depth); - + wined3d_texture_get_level_box(dst_texture, i, &box); for (j = 0; j < layer_count; ++j) { wined3d_cs_emit_blt_sub_resource(device->cs,

1 0

Alistair Leslie-Hughes : dinput: Improve returned flags in Mouse GetObjectInfo.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: c4debff5db617fc7c66d0e536caf0178560f99c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4debff5db617fc7c66d0e53… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 17 02:25:31 2019 +0000 dinput: Improve returned flags in Mouse GetObjectInfo. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/mouse.c | 3 +++ dlls/dinput/tests/mouse.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 199ed03..52a766b 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -730,6 +730,9 @@ static HRESULT WINAPI SysMouseWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, else if (pdidoi->dwType & DIDFT_BUTTON) wsprintfW(pdidoi->tszName, buttonW, DIDFT_GETINSTANCE(pdidoi->dwType) - 3); + if(pdidoi->dwType & DIDFT_AXIS) + pdidoi->dwFlags |= DIDOI_ASPECTPOSITION; + _dump_OBJECTINSTANCEW(pdidoi); return res; } diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index c1a7ff7..c5cb684 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -227,6 +227,36 @@ static void test_GetDeviceInfo(IDirectInputA *pDI) if (pMouse) IUnknown_Release(pMouse); } +static BOOL CALLBACK EnumAxes(const DIDEVICEOBJECTINSTANCEA *pdidoi, void *pContext) +{ + if (IsEqualIID(&pdidoi->guidType, &GUID_XAxis) || + IsEqualIID(&pdidoi->guidType, &GUID_YAxis) || + IsEqualIID(&pdidoi->guidType, &GUID_ZAxis)) + { + ok(pdidoi->dwFlags & DIDOI_ASPECTPOSITION, "Missing DIDOI_ASPECTPOSITION, flags are 0x%x\n", + pdidoi->dwFlags); + } + else + ok(pdidoi->dwFlags == 0, "Flags are 0x%x\n", pdidoi->dwFlags); + + return DIENUM_CONTINUE; +} + +static void test_mouse_EnumObjects(IDirectInputA *pDI) +{ + HRESULT hr; + IDirectInputDeviceA *pMouse = NULL; + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pMouse, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + if (FAILED(hr)) return; + + hr = IDirectInputDevice_EnumObjects(pMouse, EnumAxes, NULL, DIDFT_ALL); + ok(hr==DI_OK,"IDirectInputDevice_EnumObjects() failed: %08x\n", hr); + + if (pMouse) IUnknown_Release(pMouse); +} + static void mouse_tests(void) { HRESULT hr; @@ -254,6 +284,7 @@ static void mouse_tests(void) test_set_coop(pDI, hwnd); test_acquire(pDI, hwnd); test_GetDeviceInfo(pDI); + test_mouse_EnumObjects(pDI); DestroyWindow(hwnd); }

1 0

Michael Stefaniuc : msctf: Remove useless cast to self.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 61aea5a9879f41224022d4775cce28d28618ea89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61aea5a9879f41224022d477… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 17 20:34:39 2019 +0200 msctf: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 452895c..ff67d38 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -852,7 +852,7 @@ static HRESULT WINAPI TextStoreACPSink_OnLockGranted(ITextStoreACPSink *iface, /*TODO: implement ITfEditRecord */ SINK_FOR_EACH(cursor, &This->pTextEditSink, ITfTextEditSink, sink) { - ITfTextEditSink_OnEndEdit(sink, (ITfContext*) &This->ITfContext_iface, sc, NULL); + ITfTextEditSink_OnEndEdit(sink, &This->ITfContext_iface, sc, NULL); } sinkcookie = remove_Cookie(sc); }

1 0