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

[PATCH 1/2] winemac.drv: Pass the CAMetalLayer to MoltenVK.

by Chip Davis

It isn't safe to access the view object from any thread other than the main thread. In fact, if you try to call vkCreateMacOSSurfaceMVK() from any other thread, MoltenVK prints out a big, scary warning telling you not to do this! Instead, get the layer from the view ourselves and pass that to MoltenVK. Recent versions of MoltenVK can accept either the view or the layer. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/winemac.drv/cocoa_window.m | 14 ++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 2 ++ dlls/winemac.drv/vulkan.c | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 877653ea007..6ac30843025 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -3796,6 +3796,20 @@ macdrv_metal_view macdrv_view_create_metal_view(macdrv_view v, macdrv_metal_devi return (macdrv_metal_view)metalView; } +macdrv_metal_layer macdrv_view_get_metal_layer(macdrv_metal_view v) +{ + WineMetalView* view = (WineMetalView*)v; + __block CAMetalLayer* layer; + + if ([NSThread isMainThread]) + layer = (CAMetalLayer*)view.layer; + else OnMainThread(^{ + layer = (CAMetalLayer*)view.layer; + }); + + return (macdrv_metal_layer)layer; +} + void macdrv_view_release_metal_view(macdrv_metal_view v) { WineMetalView* view = (WineMetalView*)v; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 676adb435bb..b02ad79f025 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -140,6 +140,7 @@ #ifdef HAVE_METAL_METAL_H typedef struct macdrv_opaque_metal_device* macdrv_metal_device; typedef struct macdrv_opaque_metal_view* macdrv_metal_view; +typedef struct macdrv_opaque_metal_layer* macdrv_metal_layer; #endif typedef struct macdrv_opaque_status_item* macdrv_status_item; struct macdrv_event; @@ -587,6 +588,7 @@ extern void macdrv_set_window_color_key(macdrv_window w, CGFloat keyRed, CGFloat extern macdrv_metal_device macdrv_create_metal_device(void) DECLSPEC_HIDDEN; extern void macdrv_release_metal_device(macdrv_metal_device d) DECLSPEC_HIDDEN; extern macdrv_metal_view macdrv_view_create_metal_view(macdrv_view v, macdrv_metal_device d) DECLSPEC_HIDDEN; +extern macdrv_metal_layer macdrv_view_get_metal_layer(macdrv_metal_view v) DECLSPEC_HIDDEN; extern void macdrv_view_release_metal_view(macdrv_metal_view v) DECLSPEC_HIDDEN; #endif extern int macdrv_get_view_backing_size(macdrv_view v, int backing_size[2]) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index cc7f22f6788..21e93827c15 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -282,7 +282,7 @@ static VkResult macdrv_vkCreateWin32SurfaceKHR(VkInstance instance, create_info_host.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK; create_info_host.pNext = NULL; create_info_host.flags = 0; /* reserved */ - create_info_host.pView = mac_surface->view; + create_info_host.pView = macdrv_view_get_metal_layer(mac_surface->view); res = pvkCreateMacOSSurfaceMVK(instance, &create_info_host, NULL /* allocator */, &mac_surface->surface); if (res != VK_SUCCESS) -- 2.24.0

Dec. 13, 2019

Re: [PATCH v2 2/2] gdiplus: GdipGraphicsClear() should overwrite pixels, not alpha blend

by Vincent Povirk (they/them)

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com>

Dec. 13, 2019

Re: [PATCH v2 1/2] gdiplus: start implementing CompositingModeSourceCopy

by Vincent Povirk (they/them)

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com>

Dec. 13, 2019

Re: [PATCH vkd3d 1/2] vkd3d: Add queries for KHR_timeline_semaphore extension.

by Sveinar Søpler

On 12.12.2019 20:02, Rémi Bernon wrote: > Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> > --- > libs/vkd3d/device.c | 23 +++++++++++++++++++++++ > libs/vkd3d/vkd3d_private.h | 3 +++ > libs/vkd3d/vulkan_procs.h | 3 +++ > 3 files changed, 29 insertions(+) > > diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c > index 757d4ac8..3f99ef9a 100644 > --- a/libs/vkd3d/device.c > +++ b/libs/vkd3d/device.c > @@ -127,6 +127,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = > VK_EXTENSION(KHR_IMAGE_FORMAT_LIST, KHR_image_format_list), > VK_EXTENSION(KHR_MAINTENANCE3, KHR_maintenance3), > VK_EXTENSION(KHR_PUSH_DESCRIPTOR, KHR_push_descriptor), > + VK_EXTENSION(KHR_TIMELINE_SEMAPHORE, KHR_timeline_semaphore), > /* EXT extensions */ > VK_EXTENSION(EXT_CONDITIONAL_RENDERING, EXT_conditional_rendering), > VK_EXTENSION(EXT_DEBUG_MARKER, EXT_debug_marker), > @@ -664,6 +665,7 @@ struct vkd3d_physical_device_info > VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT texel_buffer_alignment_properties; > VkPhysicalDeviceTransformFeedbackPropertiesEXT xfb_properties; > VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT vertex_divisor_properties; > + VkPhysicalDeviceTimelineSemaphorePropertiesKHR timeline_semaphore_properties; > > VkPhysicalDeviceProperties2KHR properties2; > > @@ -675,6 +677,7 @@ struct vkd3d_physical_device_info > VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT texel_buffer_alignment_features; > VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; > VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT vertex_divisor_features; > + VkPhysicalDeviceTimelineSemaphoreFeaturesKHR timeline_semaphore_features; > > VkPhysicalDeviceFeatures2 features2; > }; > @@ -693,8 +696,10 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i > VkPhysicalDeviceDepthClipEnableFeaturesEXT *depth_clip_features; > VkPhysicalDeviceMaintenance3Properties *maintenance3_properties; > VkPhysicalDeviceTransformFeedbackPropertiesEXT *xfb_properties; > + VkPhysicalDeviceTimelineSemaphorePropertiesKHR *timeline_semaphore_properties; > VkPhysicalDevice physical_device = device->vk_physical_device; > VkPhysicalDeviceTransformFeedbackFeaturesEXT *xfb_features; > + VkPhysicalDeviceTimelineSemaphoreFeaturesKHR *timeline_semaphore_features; > struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; > > memset(info, 0, sizeof(*info)); > @@ -710,6 +715,8 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i > vertex_divisor_properties = &info->vertex_divisor_properties; > xfb_features = &info->xfb_features; > xfb_properties = &info->xfb_properties; > + timeline_semaphore_properties = &info->timeline_semaphore_properties; > + timeline_semaphore_features = &info->timeline_semaphore_features; > > info->features2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; > > @@ -727,6 +734,8 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i > vk_prepend_struct(&info->features2, xfb_features); > vertex_divisor_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT; > vk_prepend_struct(&info->features2, vertex_divisor_features); > + timeline_semaphore_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES_KHR; > + vk_prepend_struct(&info->features2, timeline_semaphore_features); > > if (vulkan_info->KHR_get_physical_device_properties2) > VK_CALL(vkGetPhysicalDeviceFeatures2KHR(physical_device, &info->features2)); > @@ -745,6 +754,8 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i > vk_prepend_struct(&info->properties2, xfb_properties); > vertex_divisor_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT; > vk_prepend_struct(&info->properties2, vertex_divisor_properties); > + timeline_semaphore_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES_KHR; > + vk_prepend_struct(&info->properties2, timeline_semaphore_properties); > > if (vulkan_info->KHR_get_physical_device_properties2) > VK_CALL(vkGetPhysicalDeviceProperties2KHR(physical_device, &info->properties2)); > @@ -817,6 +828,7 @@ static void vkd3d_trace_physical_device_limits(const struct vkd3d_physical_devic > const VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT *buffer_alignment; > const VkPhysicalDeviceMaintenance3Properties *maintenance3; > const VkPhysicalDeviceTransformFeedbackPropertiesEXT *xfb; > + const VkPhysicalDeviceTimelineSemaphorePropertiesKHR *timeline_semaphore; > > TRACE("Device limits:\n"); > TRACE(" maxImageDimension1D: %u.\n", limits->maxImageDimension1D); > @@ -1021,6 +1033,10 @@ static void vkd3d_trace_physical_device_limits(const struct vkd3d_physical_devic > divisor_properties = &info->vertex_divisor_properties; > TRACE(" VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT:\n"); > TRACE(" maxVertexAttribDivisor: %u.\n", divisor_properties->maxVertexAttribDivisor); > + > + timeline_semaphore = &info->timeline_semaphore_properties; > + TRACE(" VkPhysicalDeviceTimelineSemaphorePropertiesKHR:\n"); > + TRACE(" maxTimelineSemaphoreValueDifference: %u.\n", timeline_semaphore->maxTimelineSemaphoreValueDifference); Should it be %lu? (Atleast seems to compile fine when changed to %lu.) libs/vkd3d/device.c:1039:11: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 4 has type ‘uint64_t’ {aka ‘const long unsigned int’} [-Wformat=] 1039 | TRACE(" maxTimelineSemaphoreValueDifference: %u.\n", timeline_semaphore->maxTimelineSemaphoreValueDifference); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | uint64_t {aka const long unsigned int} > } > > static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_device_info *info) > @@ -1033,6 +1049,7 @@ static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_dev > const VkPhysicalDeviceDepthClipEnableFeaturesEXT *depth_clip_features; > const VkPhysicalDeviceFeatures *features = &info->features2.features; > const VkPhysicalDeviceTransformFeedbackFeaturesEXT *xfb; > + const VkPhysicalDeviceTimelineSemaphoreFeaturesKHR *timeline_semaphore; > > TRACE("Device features:\n"); > TRACE(" robustBufferAccess: %#x.\n", features->robustBufferAccess); > @@ -1165,6 +1182,10 @@ static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_dev > divisor_features->vertexAttributeInstanceRateDivisor); > TRACE(" vertexAttributeInstanceRateZeroDivisor: %#x.\n", > divisor_features->vertexAttributeInstanceRateZeroDivisor); > + > + timeline_semaphore = &info->timeline_semaphore_features; > + TRACE(" VkPhysicalDeviceTimelineSemaphoreFeaturesKHR:\n"); > + TRACE(" timelineSemaphore: %#x.\n", timeline_semaphore->timelineSemaphore); > } > > static void vkd3d_init_feature_level(struct vkd3d_vulkan_info *vk_info, > @@ -1294,6 +1315,8 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, > vulkan_info->transform_feedback_queries = physical_device_info->xfb_properties.transformFeedbackQueries; > vulkan_info->max_vertex_attrib_divisor = max(physical_device_info->vertex_divisor_properties.maxVertexAttribDivisor, 1); > > + vulkan_info->max_timeline_semaphore_value_difference = max(physical_device_info->timeline_semaphore_properties.maxTimelineSemaphoreValueDifference, 1); > + > device->feature_options.DoublePrecisionFloatShaderOps = features->shaderFloat64; > device->feature_options.OutputMergerLogicOp = features->logicOp; > /* SPV_KHR_16bit_storage */ > diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h > index 0c031d20..84abcb8d 100644 > --- a/libs/vkd3d/vkd3d_private.h > +++ b/libs/vkd3d/vkd3d_private.h > @@ -100,6 +100,7 @@ struct vkd3d_vulkan_info > bool KHR_image_format_list; > bool KHR_maintenance3; > bool KHR_push_descriptor; > + bool KHR_timeline_semaphore; > /* EXT device extensions */ > bool EXT_conditional_rendering; > bool EXT_debug_marker; > @@ -116,6 +117,8 @@ struct vkd3d_vulkan_info > bool vertex_attrib_zero_divisor; > unsigned int max_vertex_attrib_divisor; > > + uint64_t max_timeline_semaphore_value_difference; > + > VkPhysicalDeviceLimits device_limits; > VkPhysicalDeviceSparseProperties sparse_properties; > > diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h > index ec29eb45..d080278a 100644 > --- a/libs/vkd3d/vulkan_procs.h > +++ b/libs/vkd3d/vulkan_procs.h > @@ -206,6 +206,9 @@ VK_DEVICE_EXT_PFN(vkCmdBindTransformFeedbackBuffersEXT) > VK_DEVICE_EXT_PFN(vkCmdEndQueryIndexedEXT) > VK_DEVICE_EXT_PFN(vkCmdEndTransformFeedbackEXT) > > +/* VK_KHR_timeline_semaphore */ > +VK_DEVICE_EXT_PFN(vkSignalSemaphoreKHR) > + > #undef VK_INSTANCE_PFN > #undef VK_INSTANCE_EXT_PFN > #undef VK_DEVICE_PFN

Dec. 13, 2019