From e91cfa4dc3341dfc2d75015dd346694f34a54173 Mon Sep 17 00:00:00 2001 From: Park Joon-Kyu Date: Thu, 2 Jan 2020 17:10:45 +0900 Subject: [PATCH] Enable wayland support for examples/triangle --- examples/triangle/CMakeLists.txt | 6 +++++- examples/triangle/main.c | 14 +++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/examples/triangle/CMakeLists.txt b/examples/triangle/CMakeLists.txt index e02d478a5..de2d6bad5 100644 --- a/examples/triangle/CMakeLists.txt +++ b/examples/triangle/CMakeLists.txt @@ -15,7 +15,11 @@ elseif(APPLE) set(OS_LIBRARIES "-framework Cocoa" "-framework CoreVideo" "-framework IOKit" "-framework QuartzCore") target_compile_options(${TARGET_NAME} PRIVATE -x objective-c) else(MSVC) - add_definitions(-DWGPU_TARGET=WGPU_TARGET_LINUX) +if(USE_WAYLAND) + add_definitions(-DWGPU_TARGET=WGPU_TARGET_LINUX_WAYLAND) +else(USE_WAYLAND) + add_definitions(-DWGPU_TARGET=WGPU_TARGET_LINUX_X11) +endif(USE_WAYLAND) target_compile_options(${TARGET_NAME} PRIVATE -Wall -Wextra -pedantic) endif(MSVC) diff --git a/examples/triangle/main.c b/examples/triangle/main.c index e8c624f9a..05eab3e59 100644 --- a/examples/triangle/main.c +++ b/examples/triangle/main.c @@ -12,8 +12,9 @@ #include #define WGPU_TARGET_MACOS 1 -#define WGPU_TARGET_LINUX 2 +#define WGPU_TARGET_LINUX_X11 2 #define WGPU_TARGET_WINDOWS 3 +#define WGPU_TARGET_LINUX_WAYLAND 4 #if WGPU_TARGET == WGPU_TARGET_MACOS #include @@ -23,8 +24,9 @@ #include #if WGPU_TARGET == WGPU_TARGET_MACOS #define GLFW_EXPOSE_NATIVE_COCOA -#elif WGPU_TARGET == WGPU_TARGET_LINUX +#elif WGPU_TARGET == WGPU_TARGET_LINUX_X11 #define GLFW_EXPOSE_NATIVE_X11 +#elif WGPU_TARGET == WGPU_TARGET_LINUX_WAYLAND #define GLFW_EXPOSE_NATIVE_WAYLAND #elif WGPU_TARGET == WGPU_TARGET_WINDOWS #define GLFW_EXPOSE_NATIVE_WIN32 @@ -174,12 +176,18 @@ int main() { [ns_window.contentView setLayer:metal_layer]; surface = wgpu_create_surface_from_metal_layer(metal_layer); } -#elif WGPU_TARGET == WGPU_TARGET_LINUX +#elif WGPU_TARGET == WGPU_TARGET_LINUX_X11 { Display *x11_display = glfwGetX11Display(); Window x11_window = glfwGetX11Window(window); surface = wgpu_create_surface_from_xlib((const void **)x11_display, x11_window); } +#elif WGPU_TARGET == WGPU_TARGET_LINUX_WAYLAND + { + struct wl_display *wayland_display = glfwGetWaylandDisplay(); + struct wl_surface *wayland_surface = glfwGetWaylandWindow(window); + surface = wgpu_create_surface_from_wayland(wayland_surface, wayland_display); + } #elif WGPU_TARGET == WGPU_TARGET_WINDOWS { HWND hwnd = glfwGetWin32Window(window);