wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

demos: Make the demos work in the Windows build.

Browse Source 
Commit 02fe9f5bdf introduced linking the
Windows build of the demos with d3d12 and dxgi, while also still linking
to libvkd3d-utils.la. That happens to more or less work on Wine; we get
vkd3d-utils' D3D12CreateDevice(), and Wine's
IDXGIFactory2_CreateSwapChainForHwnd(), but because Wine's
implementation of d3d12 swapchains uses vkd3d, we're able to use the
resulting swapchain buffers even though the instance of vkd3d used by
Wine may not be the same instance of vkd3d used by the demos. Perhaps
unsurprisingly, things don't go nearly as well on Windows.

We could of course stop linking the demos to vkd3d-utils on Windows, but
that's not that interesting; we're trying to show what vkd3d can do
here, not what d3d12 can do.
This commit is contained in:
Henri Verbeet
2025-04-21 18:02:41 +02:00
parent 883ffc5fd6
commit dfe3ad5551
Notes: Henri Verbeet 2025-04-28 13:01:05 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1468
6 changed files with 142 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
demos/demo_xcb.h
View File

@@ -78,7 +78,7 @@ static VkSurfaceKHR demo_window_xcb_create_vk_surface(struct demo_window *window
surface_desc.sType = VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR;
surface_desc.pNext = NULL;
surface_desc.flags = 0;
surface_desc.connection = window->demo->xcb.connection;
surface_desc.connection = window->demo->u.xcb.connection;
surface_desc.window = window_xcb->window;
if (vkCreateXcbSurfaceKHR(vk_instance, &surface_desc, NULL, &vk_surface) < 0)
return VK_NULL_HANDLE;
@@ -89,7 +89,7 @@ static VkSurfaceKHR demo_window_xcb_create_vk_surface(struct demo_window *window
static void demo_window_xcb_destroy(struct demo_window *window)
{
struct demo_window_xcb *window_xcb = CONTAINING_RECORD(window, struct demo_window_xcb, w);
struct demo_xcb *xcb = &window->demo->xcb;
struct demo_xcb *xcb = &window->demo->u.xcb;
xcb_destroy_window(xcb->connection, window_xcb->window);
xcb_flush(xcb->connection);
@@ -100,8 +100,8 @@ static void demo_window_xcb_destroy(struct demo_window *window)
static struct demo_window *demo_window_xcb_create(struct demo *demo, const char *title,
unsigned int width, unsigned int height, void *user_data)
{
struct demo_xcb *xcb = &demo->u.xcb;
struct demo_window_xcb *window_xcb;
struct demo_xcb *xcb = &demo->xcb;
xcb_size_hints_t hints;
xcb_screen_t *screen;
@@ -113,7 +113,8 @@ static struct demo_window *demo_window_xcb_create(struct demo *demo, const char
if (!(window_xcb = malloc(sizeof(*window_xcb))))
return NULL;
if (!demo_window_init(&window_xcb->w, demo, user_data))
if (!demo_window_init(&window_xcb->w, demo, user_data,
demo_window_xcb_create_vk_surface, demo_window_xcb_destroy))
{
free(window_xcb);
return NULL;
@@ -144,7 +145,7 @@ static struct demo_window *demo_window_xcb_create(struct demo *demo, const char
static void demo_xcb_get_dpi(struct demo *demo, double *dpi_x, double *dpi_y)
{
struct demo_xcb *xcb = &demo->xcb;
struct demo_xcb *xcb = &demo->u.xcb;
xcb_screen_t *screen;
if (!(screen = demo_xcb_get_screen(xcb->connection, xcb->screen)))
@@ -161,8 +162,8 @@ static void demo_xcb_process_events(struct demo *demo)
{
const struct xcb_client_message_event_t *client_message;
struct xcb_key_press_event_t *key_press;
struct demo_xcb *xcb = &demo->u.xcb;
struct demo_window_xcb *window_xcb;
struct demo_xcb *xcb = &demo->xcb;
xcb_generic_event_t *event;
xcb_keysym_t sym;
@@ -212,7 +213,7 @@ static void demo_xcb_process_events(struct demo *demo)
static void demo_xcb_cleanup(struct demo *demo)
{
struct demo_xcb *xcb = &demo->xcb;
struct demo_xcb *xcb = &demo->u.xcb;
xcb_key_symbols_free(xcb->xcb_keysyms);
xcb_disconnect(xcb->connection);