Skip to content

Commit

Permalink
winex11.drv: Support child window rendering for Vulkan via XComposite
Browse files Browse the repository at this point in the history
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45277
Signed-off-by: Felix Hädicke <felixhaedicke@web.de>
  • Loading branch information
felixhaedicke committed Jul 10, 2019
1 parent 4ee1a63 commit 258a826
Showing 1 changed file with 50 additions and 9 deletions.
59 changes: 50 additions & 9 deletions dlls/winex11.drv/vulkan.c
Expand Up @@ -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
Expand All @@ -55,13 +56,15 @@ 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

struct wine_vk_surface
{
LONG ref;
Window window;
HDC child_window_dc;
VkSurfaceKHR surface; /* native surface */
};

Expand Down Expand Up @@ -252,16 +255,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,
Expand All @@ -277,13 +288,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;
Expand All @@ -300,6 +304,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 */
Expand Down Expand Up @@ -369,6 +394,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,
Expand Down Expand Up @@ -541,6 +567,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;
}

Expand Down

0 comments on commit 258a826

Please sign in to comment.