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

Nikolay Sivov : mf: Add initial implementation of SAR stream type handler.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: d2c736e1bad29f246a69f1070e42c2d19158dab9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2c736e1bad29f246a69f107… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 20 19:24:59 2020 +0300 mf: Add initial implementation of SAR stream type handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++------- dlls/mf/tests/mf.c | 29 ++++++++---- 2 files changed, 138 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d2c736e1bad29f246a69…

1 0

Henri Verbeet : wined3d: Implement Vulkan GPU buffer copies.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: d16de1e06cb303350ba2461db4a57073c344d370 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d16de1e06cb303350ba2461d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 20 23:48:22 2020 +0430 wined3d: Implement Vulkan GPU buffer copies. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 78a8df6b8b..35b4e8da6a 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -697,8 +697,109 @@ static void adapter_vk_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size) { + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_bo_vk staging_bo, *src_bo, *dst_bo; + VkBufferMemoryBarrier vk_barrier[2]; + struct wined3d_bo_address staging; + VkCommandBuffer vk_command_buffer; struct wined3d_range range; void *dst_ptr, *src_ptr; + VkBufferCopy region; + + src_bo = (struct wined3d_bo_vk *)src->buffer_object; + dst_bo = (struct wined3d_bo_vk *)dst->buffer_object; + + if (src_bo && dst_bo) + { + if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) + { + ERR("Failed to get command buffer.\n"); + return; + } + + region.srcOffset = (uintptr_t)src->addr; + region.dstOffset = (uintptr_t)dst->addr; + region.size = size; + + vk_barrier[0].sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; + vk_barrier[0].pNext = NULL; + vk_barrier[0].srcAccessMask = vk_access_mask_from_bind_flags(src_bind_flags); + vk_barrier[0].dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; + vk_barrier[0].srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier[0].dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier[0].buffer = src_bo->vk_buffer; + vk_barrier[0].offset = region.srcOffset; + vk_barrier[0].size = region.size; + + vk_barrier[1].sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; + vk_barrier[1].pNext = NULL; + vk_barrier[1].srcAccessMask = vk_access_mask_from_bind_flags(dst_bind_flags); + vk_barrier[1].dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; + vk_barrier[1].srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier[1].dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier[1].buffer = dst_bo->vk_buffer; + vk_barrier[1].offset = region.dstOffset; + vk_barrier[1].size = region.size; + + VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, + VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, NULL, 2, vk_barrier, 0, NULL)); + + VK_CALL(vkCmdCopyBuffer(vk_command_buffer, src_bo->vk_buffer, dst_bo->vk_buffer, 1, &region)); + + vk_barrier[0].srcAccessMask = VK_ACCESS_TRANSFER_READ_BIT; + vk_barrier[0].dstAccessMask = vk_access_mask_from_bind_flags(src_bind_flags); + + vk_barrier[1].srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; + vk_barrier[1].dstAccessMask = vk_access_mask_from_bind_flags(dst_bind_flags); + + VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, + VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, 0, NULL, 2, vk_barrier, 0, NULL)); + + src_bo->command_buffer_id = context_vk->current_command_buffer.id; + dst_bo->command_buffer_id = context_vk->current_command_buffer.id; + + return; + } + + if (src_bo && !(src_bo->memory_type & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)) + { + if (!(wined3d_context_vk_create_bo(context_vk, size, VK_BUFFER_USAGE_TRANSFER_DST_BIT, + VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo))) + { + ERR("Failed to create staging bo.\n"); + return; + } + + staging.buffer_object = (uintptr_t)&staging_bo; + staging.addr = NULL; + adapter_vk_copy_bo_address(context, &staging, 0, src, src_bind_flags, size); + adapter_vk_copy_bo_address(context, dst, dst_bind_flags, &staging, 0, size); + + wined3d_context_vk_destroy_bo(context_vk, &staging_bo); + + return; + } + + if (dst_bo && (dst_bo->command_buffer_id > context_vk->completed_command_buffer_id + || !(dst_bo->memory_type & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT))) + { + if (!(wined3d_context_vk_create_bo(context_vk, size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, + VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo))) + { + ERR("Failed to create staging bo.\n"); + return; + } + + staging.buffer_object = (uintptr_t)&staging_bo; + staging.addr = NULL; + adapter_vk_copy_bo_address(context, &staging, 0, src, src_bind_flags, size); + adapter_vk_copy_bo_address(context, dst, dst_bind_flags, &staging, 0, size); + + wined3d_context_vk_destroy_bo(context_vk, &staging_bo); + + return; + } src_ptr = adapter_vk_map_bo_address(context, src, size, src_bind_flags, WINED3D_MAP_READ); dst_ptr = adapter_vk_map_bo_address(context, dst, size, dst_bind_flags, WINED3D_MAP_WRITE);

1 0

Zhiyi Zhang : winex11.drv: Fix incorrect frequency for double scan and interlaced modes.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: fb69b6aeb23c5fad851047c10f0e81fb75c7e1d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb69b6aeb23c5fad851047c1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Apr 20 16:42:33 2020 +0800 winex11.drv: Fix incorrect frequency for double scan and interlaced modes. Double scan modes have double the dots to be scanned and interlaced modes only have half the dots to be scanned. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index bef52128f2..95e4a5d6db 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -482,6 +482,21 @@ static XRRCrtcInfo *xrandr12_get_primary_crtc_info( XRRScreenResources *resource return NULL; } +static unsigned int get_frequency( const XRRModeInfo *mode ) +{ + unsigned int dots = mode->hTotal * mode->vTotal; + + if (!dots) + return 0; + + if (mode->modeFlags & RR_DoubleScan) + dots *= 2; + if (mode->modeFlags & RR_Interlace) + dots /= 2; + + return (mode->dotClock + dots / 2) / dots; +} + static int xrandr12_init_modes(void) { unsigned int only_one_resolution = 1, mode_count; @@ -540,8 +555,7 @@ static int xrandr12_init_modes(void) if (mode->id == output_info->modes[i]) { - unsigned int dots = mode->hTotal * mode->vTotal; - unsigned int refresh = dots ? (mode->dotClock + dots / 2) / dots : 0; + unsigned int refresh = get_frequency( mode ); TRACE("Adding mode %#lx: %ux%u(a)%u.\n", mode->id, mode->width, mode->height, refresh); X11DRV_Settings_AddOneMode( mode->width, mode->height, 0, refresh );

1 0

Henri Verbeet : wined3d: Implement Vulkan texture downloads.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 01cd409e3cfcfa3d9159d30887a84b0c29acf6e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01cd409e3cfcfa3d9159d308… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 20 23:48:25 2020 +0430 wined3d: Implement Vulkan texture downloads. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 174 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 173 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 98bc8a510c..9adb978b1c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4363,7 +4363,151 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, const struct wined3d_format *dst_format, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, unsigned int dst_row_pitch, unsigned int dst_slice_pitch) { - FIXME("Not implemented.\n"); + struct wined3d_texture_vk *src_texture_vk = wined3d_texture_vk(src_texture); + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); + unsigned int src_level, src_width, src_height, src_depth; + struct wined3d_texture_sub_resource *sub_resource; + unsigned int src_row_pitch, src_slice_pitch; + struct wined3d_bo_address staging_bo_addr; + const struct wined3d_vk_info *vk_info; + VkCommandBuffer vk_command_buffer; + struct wined3d_bo_vk staging_bo; + VkImageAspectFlags aspect_mask; + struct wined3d_range range; + VkBufferImageCopy region; + void *map_ptr; + + TRACE("context %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_box %s, dst_bo_addr %s, " + "dst_format %s, dst_x %u, dst_y %u, dst_z %u, dst_row_pitch %u, dst_slice_pitch %u.\n", + context, src_texture, src_sub_resource_idx, wined3d_debug_location(src_location), + debug_box(src_box), debug_bo_address(dst_bo_addr), debug_d3dformat(dst_format->id), + dst_x, dst_y, dst_z, dst_row_pitch, dst_slice_pitch); + + if (src_location != WINED3D_LOCATION_TEXTURE_RGB) + { + FIXME("Unhandled location %s.\n", wined3d_debug_location(src_location)); + return; + } + + src_level = src_sub_resource_idx % src_texture->level_count; + src_width = wined3d_texture_get_level_width(src_texture, src_level); + src_height = wined3d_texture_get_level_height(src_texture, src_level); + src_depth = wined3d_texture_get_level_depth(src_texture, src_level); + if (src_box->left || src_box->top || src_box->right != src_width || src_box->bottom != src_height + || src_box->front || src_box->back != src_depth) + { + FIXME("Unhandled source box %s.\n", debug_box(src_box)); + return; + } + + if (dst_bo_addr->buffer_object) + { + FIXME("Unhandled buffer object %#lx.\n", dst_bo_addr->buffer_object); + return; + } + + if (dst_format->id != src_texture->resource.format->id) + { + FIXME("Unhandled format conversion (%s -> %s).\n", + debug_d3dformat(dst_format->id), + debug_d3dformat(src_texture->resource.format->id)); + return; + } + + if (dst_x || dst_y || dst_z) + { + FIXME("Unhandled destination (%u, %u, %u).\n", dst_x, dst_y, dst_z); + return; + } + + if (wined3d_resource_get_sample_count(&src_texture_vk->t.resource) > 1) + { + FIXME("Not supported for multisample textures.\n"); + return; + } + + aspect_mask = vk_aspect_mask_from_format(src_texture->resource.format); + if (wined3d_popcount(aspect_mask) > 1) + { + FIXME("Unhandled multi-aspect format %s.\n", debug_d3dformat(src_texture->resource.format->id)); + return; + } + + wined3d_texture_get_pitch(src_texture, src_level, &src_row_pitch, &src_slice_pitch); + if (src_texture->resource.type == WINED3D_RTYPE_TEXTURE_1D) + src_row_pitch = dst_row_pitch = 0; + if (src_texture->resource.type != WINED3D_RTYPE_TEXTURE_3D) + src_slice_pitch = dst_slice_pitch = 0; + + sub_resource = &src_texture_vk->t.sub_resources[src_sub_resource_idx]; + vk_info = context_vk->vk_info; + if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) + { + ERR("Failed to get command buffer.\n"); + return; + } + + if (!wined3d_context_vk_create_bo(context_vk, sub_resource->size, + VK_BUFFER_USAGE_TRANSFER_DST_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo)) + { + ERR("Failed to create staging bo.\n"); + return; + } + + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, + VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, + vk_access_mask_from_bind_flags(src_texture_vk->t.resource.bind_flags), + VK_ACCESS_TRANSFER_READ_BIT, + src_texture_vk->layout, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + src_texture_vk->vk_image, aspect_mask); + + region.bufferOffset = 0; + region.bufferRowLength = 0; + region.bufferImageHeight = 0; + region.imageSubresource.aspectMask = aspect_mask; + region.imageSubresource.mipLevel = src_level; + region.imageSubresource.baseArrayLayer = src_sub_resource_idx / src_texture_vk->t.level_count; + region.imageSubresource.layerCount = 1; + region.imageOffset.x = 0; + region.imageOffset.y = 0; + region.imageOffset.z = 0; + region.imageExtent.width = src_width; + region.imageExtent.height = src_height; + region.imageExtent.depth = src_depth; + + VK_CALL(vkCmdCopyImageToBuffer(vk_command_buffer, src_texture_vk->vk_image, + VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, staging_bo.vk_buffer, 1, &region)); + + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, + VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, + VK_ACCESS_TRANSFER_READ_BIT, + vk_access_mask_from_bind_flags(src_texture_vk->t.resource.bind_flags), + VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, src_texture_vk->layout, + src_texture_vk->vk_image, aspect_mask); + + src_texture_vk->command_buffer_id = context_vk->current_command_buffer.id; + staging_bo.command_buffer_id = context_vk->current_command_buffer.id; + wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL); + wined3d_context_vk_wait_command_buffer(context_vk, src_texture_vk->command_buffer_id); + + staging_bo_addr.buffer_object = (uintptr_t)&staging_bo; + staging_bo_addr.addr = (uint8_t *)NULL; + if (!(map_ptr = wined3d_context_map_bo_address(context, &staging_bo_addr, + sub_resource->size, 0, WINED3D_MAP_READ))) + { + ERR("Failed to map staging bo.\n"); + wined3d_context_vk_destroy_bo(context_vk, &staging_bo); + return; + } + + wined3d_format_copy_data(dst_format, map_ptr, src_row_pitch, src_slice_pitch, + dst_bo_addr->addr, dst_row_pitch, dst_slice_pitch, src_box->right - src_box->left, + src_box->bottom - src_box->top, src_box->back - src_box->front); + + range.offset = 0; + range.size = sub_resource->size; + wined3d_context_unmap_bo_address(context, &staging_bo_addr, 0, 1, &range); + wined3d_context_vk_destroy_bo(context_vk, &staging_bo); } static BOOL wined3d_texture_vk_load_texture(struct wined3d_texture_vk *texture_vk, @@ -4392,6 +4536,31 @@ static BOOL wined3d_texture_vk_load_texture(struct wined3d_texture_vk *texture_v return TRUE; } +static BOOL wined3d_texture_vk_load_sysmem(struct wined3d_texture_vk *texture_vk, + unsigned int sub_resource_idx, struct wined3d_context *context) +{ + struct wined3d_texture_sub_resource *sub_resource; + unsigned int level, row_pitch, slice_pitch; + struct wined3d_bo_address data; + struct wined3d_box src_box; + + sub_resource = &texture_vk->t.sub_resources[sub_resource_idx]; + if (!(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)) + { + ERR("Unimplemented load from %s.\n", wined3d_debug_location(sub_resource->locations)); + return FALSE; + } + + level = sub_resource_idx % texture_vk->t.level_count; + wined3d_texture_get_memory(&texture_vk->t, sub_resource_idx, &data, WINED3D_LOCATION_SYSMEM); + wined3d_texture_get_level_box(&texture_vk->t, level, &src_box); + wined3d_texture_get_pitch(&texture_vk->t, level, &row_pitch, &slice_pitch); + wined3d_texture_vk_download_data(context, &texture_vk->t, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, + &src_box, &data, texture_vk->t.resource.format, 0, 0, 0, row_pitch, slice_pitch); + + return TRUE; +} + static BOOL wined3d_texture_vk_prepare_texture(struct wined3d_texture_vk *texture_vk, struct wined3d_context_vk *context_vk) { @@ -4584,6 +4753,9 @@ static BOOL wined3d_texture_vk_load_location(struct wined3d_texture *texture, case WINED3D_LOCATION_TEXTURE_RGB: return wined3d_texture_vk_load_texture(wined3d_texture_vk(texture), sub_resource_idx, context); + case WINED3D_LOCATION_SYSMEM: + return wined3d_texture_vk_load_sysmem(wined3d_texture_vk(texture), sub_resource_idx, context); + default: FIXME("Unimplemented location %s.\n", wined3d_debug_location(location)); return FALSE;

1 0

Henri Verbeet : wined3d: Implement Vulkan texture uploads.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 3685c2199b1b11004e62f86f6e9792aa4c09b03f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3685c2199b1b11004e62f86f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 20 23:48:24 2020 +0430 wined3d: Implement Vulkan texture uploads. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 26 +++++ dlls/wined3d/texture.c | 213 ++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/utils.c | 30 ++++++ dlls/wined3d/wined3d_private.h | 22 +++++ 4 files changed, 288 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3685c2199b1b11004e62…

1 0

Zhiyi Zhang : winex11.drv: Ignore disconnected outputs when finding mirroring slaves.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 562702c69bd2f02ead53be6b10db0817a48b1496 URL: https://source.winehq.org/git/wine.git/?a=commit;h=562702c69bd2f02ead53be6b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Apr 20 16:37:17 2020 +0800 winex11.drv: Ignore disconnected outputs when finding mirroring slaves. Some graphics drivers keep CRTCs attached to disconnected outputs. This could cause the XRandR 1.4 display device handler to incorrectly mark outputs as mirrored. So enumerate outputs instead of CRTCs when finding mirroring slaves. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48932 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 578b68269e..bef52128f2 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -769,7 +769,7 @@ static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new XRRScreenResources *screen_resources = NULL; XRRProviderInfo *provider_info = NULL; XRRCrtcInfo *enum_crtc_info, *crtc_info = NULL; - XRROutputInfo *output_info = NULL; + XRROutputInfo *enum_output_info, *output_info = NULL; RROutput *outputs; INT crtc_count, output_count; INT primary_adapter = 0; @@ -833,24 +833,34 @@ static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new if (!output_info->crtc || !crtc_info->mode) detached = TRUE; - /* Ignore crtc mirroring slaves because mirrored monitors are under the same adapter */ + /* Ignore mirroring output slaves because mirrored monitors are under the same adapter */ mirrored = FALSE; if (!detached) { - for (j = 0; j < screen_resources->ncrtc; ++j) + for (j = 0; j < screen_resources->noutput; ++j) { - enum_crtc_info = pXRRGetCrtcInfo( gdi_display, screen_resources, screen_resources->crtcs[j] ); + enum_output_info = pXRRGetOutputInfo( gdi_display, screen_resources, screen_resources->outputs[j] ); + if (!enum_output_info) + continue; + + if (enum_output_info->connection != RR_Connected || !enum_output_info->crtc) + { + pXRRFreeOutputInfo( enum_output_info ); + continue; + } + + enum_crtc_info = pXRRGetCrtcInfo( gdi_display, screen_resources, enum_output_info->crtc ); + pXRRFreeOutputInfo( enum_output_info ); if (!enum_crtc_info) - goto done; + continue; - /* Some crtcs on different providers may have the same coordinates, aka mirrored. - * Choose the crtc with the lowest value as primary and the rest will then be slaves - * in a mirroring set */ + /* Some outputs may have the same coordinates, aka mirrored. Choose the output with + * the lowest value as primary and the rest will then be slaves in a mirroring set */ if (crtc_info->x == enum_crtc_info->x && crtc_info->y == enum_crtc_info->y && crtc_info->width == enum_crtc_info->width && crtc_info->height == enum_crtc_info->height && - output_info->crtc > screen_resources->crtcs[j]) + outputs[i] > screen_resources->outputs[j]) { mirrored = TRUE; pXRRFreeCrtcInfo( enum_crtc_info );

1 0

Liam Middlebrook : winevulkan: Handle VkEnumValue aliases to provisional exts.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 39191aa9060efc454c0b708bdd15c4d0e1f5743c URL: https://source.winehq.org/git/wine.git/?a=commit;h=39191aa9060efc454c0b708b… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Apr 20 08:35:02 2020 -0700 winevulkan: Handle VkEnumValue aliases to provisional exts. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index bbfec495ba..d855057072 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2731,10 +2731,27 @@ class VkRegistry(object): self.enums = OrderedDict(sorted(enums.items())) - def _process_require_enum(self, enum_elem, ext=None): + def _process_require_enum(self, enum_elem, ext=None, only_aliased=False): if "extends" in enum_elem.keys(): enum = self.types[enum_elem.attrib["extends"]]["data"] + # Need to define VkEnumValues which were aliased to by another value. This is necessary + # from VK spec version 1.2.135 where the provisional VK_KHR_ray_tracing extension was + # added which altered VK_NV_ray_tracing's VkEnumValues to alias to the provisional + # extension. + aliased = False + for _, t in self.types.items(): + if t["category"] != "enum": + continue + if not t["data"]: + continue + for value in t["data"].values: + if value.alias == enum_elem.attrib["name"]: + aliased = True + + if only_aliased and not aliased: + return + if "bitpos" in enum_elem.keys(): # We need to add an extra value to an existing enum type. # E.g. VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG to VkFormatFeatureFlagBits. @@ -2763,6 +2780,10 @@ class VkRegistry(object): enum.add(VkEnumValue(enum_elem.attrib["name"], alias=enum_elem.attrib["alias"])) elif "value" in enum_elem.keys(): + # Constants are not aliased, no need to add them here, they'll get added later on. + if only_aliased: + return + self.consts.append(VkConstant(enum_elem.attrib["name"], enum_elem.attrib["value"])) @staticmethod @@ -2808,6 +2829,13 @@ class VkRegistry(object): LOGGER.debug("Skipping experimental extension: {0}".format(ext_name)) return + # Extensions can define VkEnumValues which alias to provisional extensions. Pre-process + # extensions to define any required VkEnumValues before the platform check below. + for require in ext.findall("require"): + # Extensions can add enum values to Core / extension enums, so add these. + for enum_elem in require.findall("enum"): + self._process_require_enum(enum_elem, ext, only_aliased=True) + platform = ext.attrib.get("platform") if platform and platform != "win32": LOGGER.debug("Skipping extensions {0} for platform {1}".format(ext_name, platform))

1 0

Nikolay Sivov : mf: Merge SAR sink and steam instances.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 198fa490a4bdafe3e3929c57df91fc16e1dc0daa URL: https://source.winehq.org/git/wine.git/?a=commit;h=198fa490a4bdafe3e3929c57… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 20 19:24:58 2020 +0300 mf: Merge SAR sink and steam instances. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 169 ++++++++++++++++++---------------------------------------- 1 file changed, 51 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=198fa490a4bdafe3e392…

1 0

Jacek Caban : widl: Use DECLSPEC_ALIGN in MSVC compatible way.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 4fd8190ef1ba37c22904ccb499aea32cc6c0c0a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fd8190ef1ba37c22904ccb4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 20 20:19:59 2020 +0200 widl: Use DECLSPEC_ALIGN in MSVC compatible way. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 9b8aa1a322..a1db88a7c0 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4816,7 +4816,7 @@ void write_func_param_struct( FILE *file, const type_t *iface, const type_t *fun if (align >= pointer_size) fprintf( file, "%s;\n", arg->name ); else - fprintf( file, "%s DECLSPEC_ALIGN(%u);\n", arg->name, pointer_size ); + fprintf( file, "DECLSPEC_ALIGN(%u) %s;\n", pointer_size, arg->name ); } if (add_retval && !is_void( retval->declspec.type )) {

1 0

Liam Middlebrook : winevulkan: Respect sortorder extension attribute.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 63ea53decb56bd8e41e449c622ba99c844f0da0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=63ea53decb56bd8e41e449c6… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Apr 20 08:35:01 2020 -0700 winevulkan: Respect sortorder extension attribute. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 482d9805cb..bbfec495ba 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2779,7 +2779,9 @@ class VkRegistry(object): """ Parse extensions section and pull in any types and commands for this extension. """ extensions = [] exts = root.findall("./extensions/extension") - for ext in exts: + deferred_exts = [] + + def process_ext(ext, deferred=False): ext_name = ext.attrib["name"] # Set extension name on any functions calls part of this extension as we @@ -2792,29 +2794,34 @@ class VkRegistry(object): # Some extensions are not ready or have numbers reserved as a place holder. if ext.attrib["supported"] == "disabled": LOGGER.debug("Skipping disabled extension: {0}".format(ext_name)) - continue + return + + # Defer extensions with 'sortorder' as they are order-dependent for spec-parsing. + if not deferred and "sortorder" in ext.attrib: + deferred_exts.append(ext) + return # Disable highly experimental extensions as the APIs are unstable and can # change between minor Vulkan revisions until API is final and becomes KHR # or NV. if "KHX" in ext_name or "NVX" in ext_name: LOGGER.debug("Skipping experimental extension: {0}".format(ext_name)) - continue + return platform = ext.attrib.get("platform") if platform and platform != "win32": LOGGER.debug("Skipping extensions {0} for platform {1}".format(ext_name, platform)) - continue; + return if not self._is_extension_supported(ext_name): LOGGER.debug("Skipping blacklisted extension: {0}".format(ext_name)) - continue + return elif "requires" in ext.attrib: # Check if this extension builds on top of another blacklisted # extension. requires = ext.attrib["requires"].split(",") if len(set(requires).intersection(BLACKLISTED_EXTENSIONS)) > 0: - continue + return LOGGER.debug("Loading extension: {0}".format(ext_name)) @@ -2843,10 +2850,22 @@ class VkRegistry(object): cmd_name = command.attrib["name"] self._mark_command_required(cmd_name) + # Store a list with extensions. ext_info = {"name" : ext_name, "type" : ext.attrib["type"]} extensions.append(ext_info) + + # Process extensions, allowing for sortorder to defer extension processing + for ext in exts: + process_ext(ext) + + deferred_exts.sort(key=lambda ext: ext.attrib["sortorder"]) + + # Respect sortorder + for ext in deferred_exts: + process_ext(ext, deferred=True) + # Sort in alphabetical order. self.extensions = sorted(extensions, key=lambda ext: ext["name"])

1 0