Initial support for Windows

bahaa · bahaa · commit e6315897effb · 2026-01-01T08:49:56.000+02:00
diff --git a/samples/src/main/java/io/github/bahaa/webgpu/samples/SampleBase.java b/samples/src/main/java/io/github/bahaa/webgpu/samples/SampleBase.java
@@ -4,6 +4,7 @@
 import io.github.bahaa.webgpu.api.model.*;
 import io.github.bahaa.webgpu.samples.platform.macos.appkit.NSWindow;
 import io.github.bahaa.webgpu.samples.platform.macos.ca.CAMetalLayer;
+import io.github.bahaa.webgpu.samples.platform.windwos.Windows;
 import io.github.bahaa.webgpu.tools.LibraryLoader;
 import io.github.bahaa.webgpu.tools.Platform;
 
@@ -17,6 +18,7 @@
 
 import static io.github.bahaa.webgpu.samples.glfw.ffm.glfw3_h.*;
 import static io.github.bahaa.webgpu.samples.glfw.ffm.glfw3native_h.glfwGetCocoaWindow;
+import static io.github.bahaa.webgpu.samples.glfw.ffm.glfw3native_h.glfwGetWin32Window;
 import static java.lang.foreign.MemorySegment.NULL;
 
 public abstract class SampleBase {
@@ -136,7 +138,8 @@ private void configureSurface(final Surface surface, final Device device,
 
     protected Surface createSurface(final MemorySegment window, final Instance instance) {
         return switch (Platform.currentOS()) {
-            case WINDOWS, LINUX -> throw new UnsupportedOperationException("Not supported yet.");
+            case LINUX -> throw new UnsupportedOperationException("Not supported yet.");
+            case WINDOWS -> createWindowsSurface(window, instance);
             case MACOS -> createMetalSurface(window, instance);
             case OTHER -> throw new UnsupportedOperationException("Unknown operating system!");
         };
@@ -185,4 +188,17 @@ private Surface createMetalSurface(final MemorySegment window, final Instance in
                 .build()
         );
     }
+
+    private Surface createWindowsSurface(final MemorySegment window, final Instance instance) {
+        final var hwnd = glfwGetWin32Window(window);
+        final var hinstance = Windows.getModuleHandle(NULL);
+
+        return instance.createSurface(SurfaceDescriptor.builder()
+                .source(SurfaceSource.windowsHWND()
+                        .hwnd(hwnd)
+                        .hinstance(hinstance)
+                        .build())
+                .build()
+        );
+    }
 }
diff --git a/samples/src/main/java/io/github/bahaa/webgpu/samples/glfw/ffm/glfw3native_h.java b/samples/src/main/java/io/github/bahaa/webgpu/samples/glfw/ffm/glfw3native_h.java
@@ -9,45 +9,34 @@
 public class glfw3native_h extends glfw3_h {
 
     /**
-     * Function descriptor for:
      * {@snippet lang = c:
      * int glfwGetCocoaWindow()
      *}
      */
-    public static FunctionDescriptor glfwGetCocoaWindow$descriptor() {
-        return glfwGetCocoaWindow.DESC;
-    }
-
-    /**
-     * Downcall method handle for:
-     * {@snippet lang = c:
-     * int glfwGetCocoaWindow()
-     *}
-     */
-    public static MethodHandle glfwGetCocoaWindow$handle() {
-        return glfwGetCocoaWindow.HANDLE;
-    }
-
-    /**
-     * Address for:
-     * {@snippet lang = c:
-     * int glfwGetCocoaWindow()
-     *}
-     */
-    public static MemorySegment glfwGetCocoaWindow$address() {
-        return glfwGetCocoaWindow.ADDR;
+    public static MemorySegment glfwGetCocoaWindow(final MemorySegment window) {
+        final var mh$ = glfwGetCocoaWindow.HANDLE;
+        try {
+            if (TRACE_DOWNCALLS) {
+                traceDowncall("glfwGetCocoaWindow");
+            }
+            return (MemorySegment) mh$.invokeExact(window);
+        } catch (final Error | RuntimeException ex) {
+            throw ex;
+        } catch (final Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
     }
 
     /**
      * {@snippet lang = c:
-     * int glfwGetCocoaWindow()
+     * int glfwGetWin32Window()
      *}
      */
-    public static MemorySegment glfwGetCocoaWindow(final MemorySegment window) {
-        final var mh$ = glfwGetCocoaWindow.HANDLE;
+    public static MemorySegment glfwGetWin32Window(final MemorySegment window) {
+        final var mh$ = glfwGetWin32Window.HANDLE;
         try {
             if (TRACE_DOWNCALLS) {
-                traceDowncall("glfwGetCocoaWindow");
+                traceDowncall("glfwGetWin32Window");
             }
             return (MemorySegment) mh$.invokeExact(window);
         } catch (final Error | RuntimeException ex) {
@@ -66,4 +55,14 @@ private enum glfwGetCocoaWindow {
 
         public static final MethodHandle HANDLE = Linker.nativeLinker().downcallHandle(ADDR, DESC);
     }
+
+    private enum glfwGetWin32Window {
+        ;
+        public static final FunctionDescriptor DESC = FunctionDescriptor.of(
+                glfw3_h.C_POINTER, glfw3_h.C_POINTER);
+
+        public static final MemorySegment ADDR = SYMBOL_LOOKUP.findOrThrow("glfwGetWin32Window");
+
+        public static final MethodHandle HANDLE = Linker.nativeLinker().downcallHandle(ADDR, DESC);
+    }
 }
diff --git a/samples/src/main/java/io/github/bahaa/webgpu/samples/platform/PlatformException.java b/samples/src/main/java/io/github/bahaa/webgpu/samples/platform/PlatformException.java
@@ -1,4 +1,4 @@
-package io.github.bahaa.webgpu.samples.platfrom;
+package io.github.bahaa.webgpu.samples.platform;
 
 public class PlatformException extends RuntimeException {
     public PlatformException(final String message) {
diff --git a/samples/src/main/java/io/github/bahaa/webgpu/samples/platform/macos/runtime/Runtime.java b/samples/src/main/java/io/github/bahaa/webgpu/samples/platform/macos/runtime/Runtime.java
@@ -1,6 +1,6 @@
 package io.github.bahaa.webgpu.samples.platform.macos.runtime;
 
-import io.github.bahaa.webgpu.samples.platfrom.PlatformException;
+import io.github.bahaa.webgpu.samples.platform.PlatformException;
 
 import java.lang.foreign.*;
 import java.lang.invoke.MethodHandle;
@@ -98,77 +98,76 @@ public static MemorySegment classCreateInstance(final MemorySegment clazz, final
         }
     }
 
-    private static class Meta {
-        private static final String LIB_OBJC = "libobjc.A.dylib";
-
+    private enum Meta {
+        ;
+        static final Arena LIBRARY_ARENA = Arena.ofAuto();
+        private static final String LIB_OBJC = "objc.A";
+        static final SymbolLookup SYMBOL_LOOKUP = SymbolLookup
+                .libraryLookup(System.mapLibraryName(LIB_OBJC), LIBRARY_ARENA)
+                .or(SymbolLookup.loaderLookup())
+                .or(Linker.nativeLinker().defaultLookup());
         private static final MethodHandle objc_getClass;
         private static final MethodHandle sel_registerName;
-
         private static final MethodHandle object_dispose;
-
         private static final MethodHandle objc_msgSend;
         private static final MethodHandle objc_msgSendByte;
         private static final MethodHandle objc_msgSendInt;
         private static final MethodHandle objc_msgSendLong;
         private static final MethodHandle objc_msgSendFloat;
         private static final MethodHandle objc_msgSendAddr;
         private static final MethodHandle objc_msgSendAddrAddrAddr;
-
         private static final MethodHandle class_createInstance;
 
         static {
-            final var arena = Arena.ofAuto();
-
             final var linker = Linker.nativeLinker();
-            final var objc = SymbolLookup.libraryLookup(LIB_OBJC, arena);
 
-            objc_getClass = linker.downcallHandle(objc.find("objc_getClass").orElseThrow(),
+            objc_getClass = linker.downcallHandle(SYMBOL_LOOKUP.find("objc_getClass").orElseThrow(),
                     FunctionDescriptor.of(ValueLayout.ADDRESS, ValueLayout.ADDRESS));
 
-            sel_registerName = linker.downcallHandle(objc.find("sel_registerName").orElseThrow(),
+            sel_registerName = linker.downcallHandle(SYMBOL_LOOKUP.find("sel_registerName").orElseThrow(),
                     FunctionDescriptor.of(ValueLayout.ADDRESS, ValueLayout.ADDRESS));
 
-            object_dispose = linker.downcallHandle(objc.find("object_dispose").orElseThrow(),
+            object_dispose = linker.downcallHandle(SYMBOL_LOOKUP.find("object_dispose").orElseThrow(),
                     FunctionDescriptor.ofVoid(ValueLayout.ADDRESS));
 
             objc_msgSend = linker.downcallHandle(
-                    objc.find("objc_msgSend").orElseThrow(),
+                    SYMBOL_LOOKUP.find("objc_msgSend").orElseThrow(),
                     FunctionDescriptor.of(ValueLayout.ADDRESS, ValueLayout.ADDRESS, ValueLayout.ADDRESS),
                     Linker.Option.critical(false));
 
             objc_msgSendByte = linker.downcallHandle(
-                    objc.find("objc_msgSend").orElseThrow(),
+                    SYMBOL_LOOKUP.find("objc_msgSend").orElseThrow(),
                     FunctionDescriptor.of(ValueLayout.ADDRESS, ValueLayout.ADDRESS, ValueLayout.ADDRESS, ValueLayout.JAVA_BYTE),
                     Linker.Option.critical(false));
 
             objc_msgSendInt = linker.downcallHandle(
-                    objc.find("objc_msgSend").orElseThrow(),
+                    SYMBOL_LOOKUP.find("objc_msgSend").orElseThrow(),
                     FunctionDescriptor.of(ValueLayout.ADDRESS, ValueLayout.ADDRESS, ValueLayout.ADDRESS, ValueLayout.JAVA_INT),
                     Linker.Option.critical(false));
 
             objc_msgSendLong = linker.downcallHandle(
-                    objc.find("objc_msgSend").orElseThrow(),
+                    SYMBOL_LOOKUP.find("objc_msgSend").orElseThrow(),
                     FunctionDescriptor.of(ValueLayout.ADDRESS, ValueLayout.ADDRESS, ValueLayout.ADDRESS, ValueLayout.JAVA_LONG),
                     Linker.Option.critical(false));
 
             objc_msgSendFloat = linker.downcallHandle(
-                    objc.find("objc_msgSend").orElseThrow(),
+                    SYMBOL_LOOKUP.find("objc_msgSend").orElseThrow(),
                     FunctionDescriptor.of(ValueLayout.ADDRESS, ValueLayout.ADDRESS, ValueLayout.ADDRESS, ValueLayout.JAVA_FLOAT),
                     Linker.Option.critical(false));
 
             objc_msgSendAddr = linker.downcallHandle(
-                    objc.find("objc_msgSend").orElseThrow(),
+                    SYMBOL_LOOKUP.find("objc_msgSend").orElseThrow(),
                     FunctionDescriptor.of(ValueLayout.ADDRESS, ValueLayout.ADDRESS, ValueLayout.ADDRESS, ValueLayout.ADDRESS),
                     Linker.Option.critical(false));
 
             objc_msgSendAddrAddrAddr = linker.downcallHandle(
-                    objc.find("objc_msgSend").orElseThrow(),
+                    SYMBOL_LOOKUP.find("objc_msgSend").orElseThrow(),
                     FunctionDescriptor.of(ValueLayout.ADDRESS, ValueLayout.ADDRESS, ValueLayout.ADDRESS,
                             ValueLayout.ADDRESS, ValueLayout.ADDRESS, ValueLayout.ADDRESS),
                     Linker.Option.critical(false));
 
             class_createInstance = linker.downcallHandle(
-                    objc.find("class_createInstance").orElseThrow(),
+                    SYMBOL_LOOKUP.find("class_createInstance").orElseThrow(),
                     FunctionDescriptor.of(ValueLayout.ADDRESS, ValueLayout.ADDRESS, ValueLayout.JAVA_INT),
                     Linker.Option.critical(false));
         }
diff --git a/samples/src/main/java/io/github/bahaa/webgpu/samples/platform/windwos/Windows.java b/samples/src/main/java/io/github/bahaa/webgpu/samples/platform/windwos/Windows.java
@@ -0,0 +1,37 @@
+package io.github.bahaa.webgpu.samples.platform.windwos;
+
+import io.github.bahaa.webgpu.samples.platform.PlatformException;
+
+import java.lang.foreign.*;
+import java.lang.invoke.MethodHandle;
+
+public enum Windows {
+    ;
+
+    public static MemorySegment getModuleHandle(final MemorySegment lpModuleName) {
+        try {
+            return (MemorySegment) Meta.GetModuleHandle.invokeExact(lpModuleName);
+        } catch (final Throwable e) {
+            throw new PlatformException(e);
+        }
+    }
+
+    private enum Meta {
+        ;
+        static final Arena LIBRARY_ARENA = Arena.ofAuto();
+
+        static final SymbolLookup SYMBOL_LOOKUP = SymbolLookup
+                .libraryLookup(System.mapLibraryName("Kernel32"), LIBRARY_ARENA)
+                .or(SymbolLookup.loaderLookup())
+                .or(Linker.nativeLinker().defaultLookup());
+
+        private static final MethodHandle GetModuleHandle;
+
+        static {
+            final var linker = Linker.nativeLinker();
+
+            GetModuleHandle = linker.downcallHandle(SYMBOL_LOOKUP.find("GetModuleHandleW").orElseThrow(),
+                    FunctionDescriptor.of(ValueLayout.ADDRESS, ValueLayout.ADDRESS));
+        }
+    }
+}
diff --git a/webgpu/src/main/java/io/github/bahaa/webgpu/api/model/SurfaceSource.java b/webgpu/src/main/java/io/github/bahaa/webgpu/api/model/SurfaceSource.java
@@ -5,4 +5,8 @@ public interface SurfaceSource extends StructBlueprint {
     static SurfaceSourceMetalLayer.Builder metalLayer() {
         return SurfaceSourceMetalLayer.builder();
     }
+
+    static SurfaceSourceWindowsHWND.Builder windowsHWND() {
+        return SurfaceSourceWindowsHWND.builder();
+    }
 }
diff --git a/webgpu/src/main/java/io/github/bahaa/webgpu/api/model/SurfaceSourceWindowsHWNDBlueprint.java b/webgpu/src/main/java/io/github/bahaa/webgpu/api/model/SurfaceSourceWindowsHWNDBlueprint.java
@@ -0,0 +1,36 @@
+package io.github.bahaa.webgpu.api.model;
+
+import io.github.bahaa.webgpu.ffm.WGPUChainedStruct;
+import io.github.bahaa.webgpu.ffm.WGPUSurfaceSourceWindowsHWND;
+import io.helidon.builder.api.Prototype;
+
+import java.lang.foreign.Arena;
+import java.lang.foreign.MemorySegment;
+
+import static java.lang.foreign.MemorySegment.NULL;
+
+@Prototype.Blueprint
+interface SurfaceSourceWindowsHWNDBlueprint extends SurfaceSource {
+
+    MemorySegment hinstance();
+
+    MemorySegment hwnd();
+
+    @Override
+    default MemorySegment toSegment(final Arena arena) {
+        final var struct = WGPUSurfaceSourceWindowsHWND.allocate(arena);
+        updateSegment(arena, struct);
+        return struct;
+    }
+
+    @Override
+    default void updateSegment(final Arena arena, final MemorySegment struct) {
+        WGPUSurfaceSourceWindowsHWND.hinstance(struct, hinstance());
+        WGPUSurfaceSourceWindowsHWND.hwnd(struct, hwnd());
+
+        final var chain = WGPUSurfaceSourceWindowsHWND.chain(struct);
+
+        WGPUChainedStruct.next(chain, NULL);
+        WGPUChainedStruct.sType(chain, SType.SURFACE_SOURCE_WINDOWS_HWND.value());
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.github.bahaa.webgpu.samples.platfrom;`
	`1`	`+package io.github.bahaa.webgpu.samples.platform;`
`2`	`2`
`3`	`3`	`public class PlatformException extends RuntimeException {`
`4`	`4`	`public PlatformException(final String message) {`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,8 @@ public interface SurfaceSource extends StructBlueprint {`
`5`	`5`	`static SurfaceSourceMetalLayer.Builder metalLayer() {`
`6`	`6`	`return SurfaceSourceMetalLayer.builder();`
`7`	`7`	`}`
	`8`	`+`
	`9`	`+ static SurfaceSourceWindowsHWND.Builder windowsHWND() {`
	`10`	`+ return SurfaceSourceWindowsHWND.builder();`
	`11`	`+ }`
`8`	`12`	`}`