[PATCH 4/7] winex11: Add initial vkCreateWin32SurfaceKHR implementation.

[Józef Kucia]

On Mon, Mar 12, 2018 at 1:21 AM, Roderick Colenbrander
<thunderbird2k at gmail.com> wrote:
> Implement surface creation for top-level windows. Child window rendering
> is not yet supported.
>
> Signed-off-by: Roderick Colenbrander <thunderbird2k at gmail.com>
> ---
>  dlls/winex11.drv/vulkan.c | 66 +++++++++++++++++++++++++++++++++++++++++++++--
>  1 file changed, 64 insertions(+), 2 deletions(-)
>
> diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c
> index f93708c674..c5ecfd362b 100644
> --- a/dlls/winex11.drv/vulkan.c
> +++ b/dlls/winex11.drv/vulkan.c
> @@ -28,6 +28,7 @@
>  #include "wine/debug.h"
>  #include "wine/heap.h"
>  #include "wine/library.h"
> +#include "x11drv.h"
>
>  /* We only want host compatible structures and don't need alignment. */
>  #define WINE_VK_ALIGN(x)
> @@ -43,7 +44,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan);
>  #define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
>  #endif
>
> +typedef VkFlags VkXlibSurfaceCreateFlagsKHR;
> +#define VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR 1000004000
> +
> +struct wine_vk_surface
> +{
> +    Window window;
> +    VkSurfaceKHR surface; /* native surface */
> +};
> +
> +typedef struct VkXlibSurfaceCreateInfoKHR
> +{
> +    VkStructureType sType;
> +    const void *pNext;
> +    VkXlibSurfaceCreateFlagsKHR flags;
> +    Display *dpy;
> +    Window window;
> +} VkXlibSurfaceCreateInfoKHR;
> +
>  static VkResult (*pvkCreateInstance)(const VkInstanceCreateInfo *, const VkAllocationCallbacks *, VkInstance *);
> +static VkResult (*pvkCreateXlibSurfaceKHR)(VkInstance, const VkXlibSurfaceCreateInfoKHR *, const VkAllocationCallbacks *, VkSurfaceKHR *);
>  static void (*pvkDestroyInstance)(VkInstance, const VkAllocationCallbacks *);
>  static void * (*pvkGetDeviceProcAddr)(VkDevice, const char *);
>  static void * (*pvkGetInstanceProcAddr)(VkInstance, const char *);
> @@ -66,6 +86,7 @@ static BOOL wine_vk_init(void)
>
>  #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(vulkan_handle, #f, NULL, 0)) == NULL) return FALSE;
>  LOAD_FUNCPTR(vkCreateInstance)
> +LOAD_FUNCPTR(vkCreateXlibSurfaceKHR)
>  LOAD_FUNCPTR(vkDestroyInstance)
>  LOAD_FUNCPTR(vkGetDeviceProcAddr)
>  LOAD_FUNCPTR(vkGetInstanceProcAddr)
> @@ -171,8 +192,49 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance,
>          const VkWin32SurfaceCreateInfoKHR *create_info,
>          const VkAllocationCallbacks *allocator, VkSurfaceKHR *surface)
>  {
> -    FIXME("stub: %p %p %p %p\n", instance, create_info, allocator, surface);
> -    return VK_ERROR_OUT_OF_HOST_MEMORY;
> +    VkResult res;
> +    VkXlibSurfaceCreateInfoKHR create_info_host;
> +    struct wine_vk_surface *x11_surface;
> +    Window win;
> +
> +    TRACE("%p %p %p %p\n", instance, create_info, allocator, surface);
> +
> +    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;
> +    }
> +
> +    win = create_client_window(create_info->hwnd, &default_visual);
> +    if (!win)
> +        return VK_ERROR_OUT_OF_HOST_MEMORY;
> +
> +    x11_surface = heap_alloc(sizeof(*x11_surface));
> +    if (!x11_surface)
> +        return VK_ERROR_OUT_OF_HOST_MEMORY;

If it fails the client window isn't destroyed.

> +    x11_surface->window = win;
> +
> +    create_info_host.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR;
> +    create_info_host.pNext = NULL;
> +    create_info_host.flags = 0; /* reserved */
> +    create_info_host.dpy = gdi_display;
> +    create_info_host.window = x11_surface->window;
> +
> +    res = pvkCreateXlibSurfaceKHR(instance, &create_info_host, NULL /* allocator */, &x11_surface->surface);
> +    if (res != VK_SUCCESS)
> +    {
> +        heap_free(x11_surface);
> +        return res;
> +    }

Same as above.

> +
> +    *surface = (uintptr_t)x11_surface;
> +
> +    TRACE("Created surface=0x%s\n", wine_dbgstr_longlong(*surface));
> +    return VK_SUCCESS;
>  }
>
>  static void X11DRV_vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *allocator)
> --
> 2.14.3
>
>
>