Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45277 Signed-off-by: Felix Hädicke felixhaedicke@web.de --- Changes in v2: - add missing XUniqueContext() initialisation for vulkan_swapchain_surface_context
dlls/winex11.drv/vulkan.c | 60 +++++++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 9 deletions(-)
diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 28ae1a9e0e..a482109408 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -33,6 +33,7 @@ #include "wine/heap.h" #include "wine/library.h" #include "x11drv.h" +#include "xcomposite.h"
#define VK_NO_PROTOTYPES #define WINE_VK_HOST @@ -55,6 +56,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION context_section = { &critsect_debug, -1, 0, 0, 0, 0 };
static XContext vulkan_hwnd_context; +static XContext vulkan_swapchain_surface_context;
#define VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR 1000004000
@@ -62,6 +64,7 @@ struct wine_vk_surface { LONG ref; Window window; + HDC child_window_dc; VkSurfaceKHR surface; /* native surface */ };
@@ -135,6 +138,7 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) #undef LOAD_OPTIONAL_FUNCPTR
vulkan_hwnd_context = XUniqueContext(); + vulkan_swapchain_surface_context = XUniqueContext();
return TRUE;
@@ -252,16 +256,24 @@ static VkResult X11DRV_vkCreateSwapchainKHR(VkDevice device, const VkSwapchainCreateInfoKHR *create_info, const VkAllocationCallbacks *allocator, VkSwapchainKHR *swapchain) { + VkResult res; VkSwapchainCreateInfoKHR create_info_host; + struct wine_vk_surface *x11_surface = surface_from_handle(create_info->surface); + TRACE("%p %p %p %p\n", device, create_info, allocator, swapchain);
if (allocator) FIXME("Support for allocation callbacks not implemented yet\n");
create_info_host = *create_info; - create_info_host.surface = surface_from_handle(create_info->surface)->surface; + create_info_host.surface = x11_surface->surface;
- return pvkCreateSwapchainKHR(device, &create_info_host, NULL /* allocator */, swapchain); + res = pvkCreateSwapchainKHR(device, &create_info_host, NULL /* allocator */, swapchain); + if (res == VK_SUCCESS) + { + XSaveContext(gdi_display, (XID)(*swapchain), vulkan_swapchain_surface_context, (char *)x11_surface); + } + return res; }
static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, @@ -277,13 +289,6 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, if (allocator) FIXME("Support for allocation callbacks not implemented yet\n");
- /* TODO: support child window rendering. */ - if (GetAncestor(create_info->hwnd, GA_PARENT) != GetDesktopWindow()) - { - FIXME("Application requires child window rendering, which is not implemented yet!\n"); - return VK_ERROR_INCOMPATIBLE_DRIVER; - } - x11_surface = heap_alloc_zero(sizeof(*x11_surface)); if (!x11_surface) return VK_ERROR_OUT_OF_HOST_MEMORY; @@ -300,6 +305,27 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, goto err; }
+ /* child window rendering. */ + if (GetAncestor(create_info->hwnd, GA_PARENT) != GetDesktopWindow()) + { +#ifdef SONAME_LIBXCOMPOSITE + if (usexcomposite) + { + pXCompositeRedirectWindow(gdi_display, x11_surface->window, CompositeRedirectManual); + x11_surface->child_window_dc = GetDC(create_info->hwnd); + } +#else + if (0) + { + } +#endif + else + { + FIXME("Child window rendering is not supported without X Composite Extension!\n"); + return VK_ERROR_INCOMPATIBLE_DRIVER; + } + } + create_info_host.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR; create_info_host.pNext = NULL; create_info_host.flags = 0; /* reserved */ @@ -369,6 +395,7 @@ static void X11DRV_vkDestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapcha FIXME("Support for allocation callbacks not implemented yet\n");
pvkDestroySwapchainKHR(device, swapchain, NULL /* allocator */); + XDeleteContext(gdi_display, (XID)swapchain, vulkan_swapchain_surface_context); }
static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_name, @@ -541,6 +568,21 @@ static VkResult X11DRV_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR * } }
+ for (uint32_t i = 0 ; i < present_info->swapchainCount; ++i) + { + struct wine_vk_surface *x11_surface; + if (!XFindContext(gdi_display, (XID)present_info->pSwapchains[i], + vulkan_swapchain_surface_context, (char **)&x11_surface) && + x11_surface->child_window_dc) + { + struct x11drv_escape_flush_gl_drawable escape; + escape.code = X11DRV_FLUSH_GL_DRAWABLE; + escape.gl_drawable = x11_surface->window; + escape.flush = TRUE; + ExtEscape(x11_surface->child_window_dc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL); + } + } + return res; }
-- 2.22.0
-
Felix Hädicke