fix(bgfx) demo init on Wayland

LWJGL · Dec 9, 2024 · 316143d · 316143d
1 parent 994887c
commit 316143d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/modules/samples/src/test/java/org/lwjgl/demo/bgfx/HelloBGFX.java b/modules/samples/src/test/java/org/lwjgl/demo/bgfx/HelloBGFX.java
@@ -71,9 +71,16 @@ public static void main(String[] args) {
             switch (Platform.get()) {
                 case FREEBSD:
                 case LINUX:
-                    init.platformData()
-                        .ndt(GLFWNativeX11.glfwGetX11Display())
-                        .nwh(GLFWNativeX11.glfwGetX11Window(window));
+                    if (glfwGetPlatform() == GLFW_PLATFORM_WAYLAND) {
+                        init.platformData()
+                            .ndt(GLFWNativeWayland.glfwGetWaylandDisplay())
+                            .nwh(GLFWNativeWayland.glfwGetWaylandWindow(window))
+                            .type(BGFX_NATIVE_WINDOW_HANDLE_TYPE_WAYLAND);
+                    } else {
+                        init.platformData()
+                            .ndt(GLFWNativeX11.glfwGetX11Display())
+                            .nwh(GLFWNativeX11.glfwGetX11Window(window));
+                    }
                     break;
                 case MACOSX:
                     init.platformData()

diff --git a/modules/samples/src/test/java/org/lwjgl/demo/bgfx/HelloBGFXMT.java b/modules/samples/src/test/java/org/lwjgl/demo/bgfx/HelloBGFXMT.java
@@ -144,9 +144,16 @@ private static class GraphicsRenderer implements AutoCloseable {
                 switch (Platform.get()) {
                     case FREEBSD:
                     case LINUX:
-                        init.platformData()
-                            .ndt(GLFWNativeX11.glfwGetX11Display())
-                            .nwh(GLFWNativeX11.glfwGetX11Window(window));
+                        if (glfwGetPlatform() == GLFW_PLATFORM_WAYLAND) {
+                            init.platformData()
+                                .ndt(GLFWNativeWayland.glfwGetWaylandDisplay())
+                                .nwh(GLFWNativeWayland.glfwGetWaylandWindow(window))
+                                .type(BGFX_NATIVE_WINDOW_HANDLE_TYPE_WAYLAND);
+                        } else {
+                            init.platformData()
+                                .ndt(GLFWNativeX11.glfwGetX11Display())
+                                .nwh(GLFWNativeX11.glfwGetX11Window(window));
+                        }
                         break;
                     case MACOSX:
                         init.platformData()

diff --git a/modules/samples/src/test/java/org/lwjgl/demo/nanovg/ExampleBGFX.java b/modules/samples/src/test/java/org/lwjgl/demo/nanovg/ExampleBGFX.java
@@ -163,9 +163,16 @@ public static void main(String[] args) {
             switch (Platform.get()) {
                 case FREEBSD:
                 case LINUX:
-                    init.platformData()
-                        .ndt(GLFWNativeX11.glfwGetX11Display())
-                        .nwh(GLFWNativeX11.glfwGetX11Window(window));
+                    if (glfwGetPlatform() == GLFW_PLATFORM_WAYLAND) {
+                        init.platformData()
+                            .ndt(GLFWNativeWayland.glfwGetWaylandDisplay())
+                            .nwh(GLFWNativeWayland.glfwGetWaylandWindow(window))
+                            .type(BGFX_NATIVE_WINDOW_HANDLE_TYPE_WAYLAND);
+                    } else {
+                        init.platformData()
+                            .ndt(GLFWNativeX11.glfwGetX11Display())
+                            .nwh(GLFWNativeX11.glfwGetX11Window(window));
+                    }
                     break;
                 case MACOSX:
                     init.platformData()