Update to latest WebGPU headers (#1675)

* Update to latest WebGPU headers * Update Wgpu binaries (#1676) Co-authored-by: The Silk.NET Automaton <[email protected]> * Update lab WebGPU code * does this even need submodules? --------- Co-authored-by: silkdotnet <[email protected]> Co-authored-by: The Silk.NET Automaton <[email protected]>
dotnet · Sep 24, 2023 · eabb56e · eabb56e
1 parent 647e73d
commit eabb56e
Show file tree

Hide file tree

Showing 99 changed files with 3,843 additions and 983 deletions.
diff --git a/.github/workflows/public-api.yml b/.github/workflows/public-api.yml
@@ -27,10 +27,6 @@ jobs:
               if: ${{ github.repository == 'dotnet/Silk.NET' && github.event_name != 'pull_request_target' }}
               with:
                   path: inbound_pr
-            - name: Checkout submodules, configure git
-              run: |
-                  cd inbound_pr
-                  git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive
             - name: Cache .tmp, ~/.nuget/packages
               uses: actions/cache@v2
               with:

diff --git a/build/cache/webgpu.json.gz b/build/cache/webgpu.json.gz
diff --git a/build/submodules/dawn b/build/submodules/dawn
diff --git a/build/submodules/webgpu-headers b/build/submodules/webgpu-headers
diff --git a/build/submodules/wgpu-native b/build/submodules/wgpu-native
diff --git a/generator.json b/generator.json
@@ -2364,7 +2364,8 @@
                     "WGPUMapModeFlags": "Silk.NET.WebGPU.MapMode",
                     "WGPUShaderStageFlags": "Silk.NET.WebGPU.ShaderStage",
                     "WGPUTextureUsageFlags": "Silk.NET.WebGPU.TextureUsage",
-                    "WGPUInstanceBackendFlags": "Silk.NET.WebGPU.Extensions.WGPU.InstanceBackend"
+                    "WGPUInstanceBackendFlags": "Silk.NET.WebGPU.Extensions.WGPU.InstanceBackend",
+                    "WGPUBool": "Silk.NET.Core.Bool32"
                 },
                 {
                     "$include.commonTypeMap": "build/csharp_typemap.json",

diff --git a/src/Lab/Experiments/WebGPUTexturedQuad/Program.cs b/src/Lab/Experiments/WebGPUTexturedQuad/Program.cs
@@ -1,11 +1,7 @@
 using System.Numerics;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 using Silk.NET.Core.Native;
 using Silk.NET.Maths;
 using Silk.NET.WebGPU;
-using Silk.NET.WebGPU.Extensions.Disposal;
-using Silk.NET.WebGPU.Extensions.WGPU;
 using Silk.NET.Windowing;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
@@ -31,16 +27,16 @@ public Vertex(Vector2 position, Vector2 texCoord)
 
     // ReSharper disable once InconsistentNaming
     private static WebGPU   wgpu = null!;
-    private static IWindow? _Window;
+    private static IWindow _Window = null!;
 
     private static Instance*       _Instance;
     private static Surface*        _Surface;
+    private static SurfaceCapabilities _SurfaceCapabilities;
+    private static SurfaceConfiguration _SurfaceConfiguration;
     private static Adapter*        _Adapter;
     private static Device*         _Device;
     private static ShaderModule*   _Shader;
     private static RenderPipeline* _Pipeline;
-    private static SwapChain*      _SwapChain;
-    private static TextureFormat   _SwapChainFormat;
 
     private static Buffer* _VertexBuffer;
     private static ulong   _VertexBufferSize;
@@ -87,8 +83,7 @@ private static void WindowOnLoad()
     {
         wgpu = WebGPU.GetApi();
 
-        InstanceDescriptor instanceDescriptor = new InstanceDescriptor();
-        _Instance = wgpu.CreateInstance(instanceDescriptor);
+        _Instance = wgpu.CreateInstance(null);
 
         _Surface = _Window.CreateWebGPUSurface(wgpu, _Instance);
 
@@ -116,6 +111,8 @@ private static void WindowOnLoad()
 
         PrintAdapterFeatures();
 
+        wgpu.SurfaceGetCapabilities(_Surface, _Adapter, ref _SurfaceCapabilities);
+
         { //Get device
             var deviceDescriptor = new DeviceDescriptor
             {
@@ -155,8 +152,6 @@ private static void WindowOnLoad()
             Console.WriteLine($"Created shader {(nuint) _Shader:X}");
         } //Load shader
 
-        _SwapChainFormat = wgpu.SurfaceGetPreferredFormat(_Surface, _Adapter);
-
         var vertexAttributes = stackalloc VertexAttribute[2];
 
         vertexAttributes[0] = new VertexAttribute
@@ -397,7 +392,7 @@ private static void WindowOnLoad()
 
             var colorTargetState = new ColorTargetState
             {
-                Format    = _SwapChainFormat,
+                Format    = _SurfaceCapabilities.Formats[0],
                 Blend     = &blendState,
                 WriteMask = ColorWriteMask.All
             };
@@ -513,33 +508,31 @@ private static void UpdateProjectionMatrix()
 
     private static void WindowOnRender(double delta)
     {
-        TextureView* nextTexture = null;
-
-        for (var attempt = 0; attempt < 2; attempt++)
+        SurfaceTexture surfaceTexture;
+        wgpu.SurfaceGetCurrentTexture(_Surface, &surfaceTexture);
+        switch (surfaceTexture.Status)
         {
-            nextTexture = wgpu.SwapChainGetCurrentTextureView(_SwapChain);
-
-            if (attempt == 0 && nextTexture == null)
-            {
-                Console.WriteLine("wgpu.SwapChainGetCurrentTextureView() failed; trying to create a new swap chain...\n");
+            case SurfaceGetCurrentTextureStatus.Timeout:
+            case SurfaceGetCurrentTextureStatus.Outdated:
+            case SurfaceGetCurrentTextureStatus.Lost:
+                // Recreate swapchain,
+                wgpu.TextureRelease(surfaceTexture.Texture);
                 CreateSwapchain();
-                continue;
-            }
-
-            break;
+                // Skip this frame
+                return;
+            case SurfaceGetCurrentTextureStatus.OutOfMemory:
+            case SurfaceGetCurrentTextureStatus.DeviceLost:
+            case SurfaceGetCurrentTextureStatus.Force32:
+                throw new Exception($"What is going on bros... {surfaceTexture.Status}");
         }
 
-        if (nextTexture == null)
-        {
-            Console.WriteLine("wgpu.SwapChainGetCurrentTextureView() failed after multiple attempts; giving up.\n");
-            return;
-        }
+        var currentTexture = wgpu.TextureCreateView(surfaceTexture.Texture, null);
 
         var encoder = wgpu.DeviceCreateCommandEncoder(_Device, new CommandEncoderDescriptor());
 
         var colorAttachment = new RenderPassColorAttachment
         {
-            View          = nextTexture,
+            View          = currentTexture,
             ResolveTarget = null,
             LoadOp        = LoadOp.Clear,
             StoreOp       = StoreOp.Store,
@@ -568,15 +561,20 @@ private static void WindowOnRender(double delta)
         wgpu.RenderPassEncoderDraw(renderPass, 6, 1, 0, 0);
 
         wgpu.RenderPassEncoderEnd(renderPass);
-        wgpu.TextureViewRelease(nextTexture);
 
         var queue = wgpu.DeviceGetQueue(_Device);
 
         var commandBuffer = wgpu.CommandEncoderFinish(encoder, new CommandBufferDescriptor());
 
         wgpu.QueueSubmit(queue, 1, &commandBuffer);
-        wgpu.SwapChainPresent(_SwapChain);
+        wgpu.SurfacePresent(_Surface);
         _Window.SwapBuffers();
+
+        wgpu.CommandBufferRelease(commandBuffer);
+        wgpu.RenderPassEncoderRelease(renderPass);
+        wgpu.CommandEncoderRelease(encoder);
+        wgpu.TextureViewRelease(currentTexture);
+        wgpu.TextureRelease(surfaceTexture.Texture);
     }
 
     private static void WindowClosing()
@@ -599,16 +597,18 @@ private static void FramebufferResize(Vector2D<int> obj)
 
     private static void CreateSwapchain()
     {
-        var swapChainDescriptor = new SwapChainDescriptor
+        _SurfaceConfiguration = new SurfaceConfiguration
         {
-            Usage       = TextureUsage.RenderAttachment,
-            Format      = _SwapChainFormat,
-            Width       = (uint) _Window.FramebufferSize.X,
-            Height      = (uint) _Window.FramebufferSize.Y,
-            PresentMode = PresentMode.Fifo
+            Usage = TextureUsage.RenderAttachment,
+            Device = _Device,
+            Format = _SurfaceCapabilities.Formats[0],
+            PresentMode = PresentMode.Fifo,
+            AlphaMode = _SurfaceCapabilities.AlphaModes[0],
+            Width = (uint) _Window.FramebufferSize.X,
+            Height = (uint) _Window.FramebufferSize.Y,
         };
-
-        _SwapChain = wgpu.DeviceCreateSwapChain(_Device, _Surface, swapChainDescriptor);
+        
+        wgpu.SurfaceConfigure(_Surface, in _SurfaceConfiguration);
     }
 
     private static void PrintAdapterFeatures()

diff --git a/src/Lab/Experiments/WebGPUTexturedQuad/WebGPUTexturedQuad.csproj b/src/Lab/Experiments/WebGPUTexturedQuad/WebGPUTexturedQuad.csproj
@@ -11,7 +11,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\..\..\src\WebGPU\Extensions\Silk.NET.WebGPU.Extensions.Disposal\Silk.NET.WebGPU.Extensions.Disposal.csproj" />
       <ProjectReference Include="..\..\..\..\src\WebGPU\Silk.NET.WebGPU\Silk.NET.WebGPU.csproj" />
       <ProjectReference Include="..\..\..\..\src\Windowing\Silk.NET.GLFW\Silk.NET.GLFW.csproj" />
       <ProjectReference Include="..\..\..\..\src\Windowing\Silk.NET.Windowing.Common\Silk.NET.Windowing.Common.csproj" />

diff --git a/src/Lab/Experiments/WebGPUTriangle/Program.cs b/src/Lab/Experiments/WebGPUTriangle/Program.cs
@@ -1,12 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics;
 using Silk.NET.Core.Native;
 using Silk.NET.Maths;
 using Silk.NET.WebGPU;
-using Silk.NET.WebGPU.Extensions.Disposal;
-using Silk.NET.WebGPU.Extensions.WGPU;
 using Silk.NET.Windowing;
 
 namespace WebGPUTriangle;
@@ -15,16 +12,17 @@ public static unsafe class Program
 {
     // ReSharper disable once InconsistentNaming
     private static WebGPU   wgpu = null!;
-    private static IWindow? _Window;
+    private static IWindow _Window = null!;
+
+    private static Surface*        _Surface;
+    private static SurfaceConfiguration _SurfaceConfiguration;
+    private static SurfaceCapabilities _SurfaceCapabilities;
 
     private static Instance*       _Instance;
-    private static Surface*        _Surface;
     private static Adapter*        _Adapter;
     private static Device*         _Device;
     private static ShaderModule*   _Shader;
     private static RenderPipeline* _Pipeline;
-    private static SwapChain*      _SwapChain;
-    private static TextureFormat   _SwapChainFormat;
 
     private const string SHADER = @"@vertex
 fn vs_main(@builtin(vertex_index) in_vertex_index: u32) -> @builtin(position) vec4<f32> {
@@ -135,7 +133,7 @@ private static void WindowOnLoad()
             Console.WriteLine($"Created shader {(nuint) _Shader:X}");
         } //Load shader
 
-        _SwapChainFormat = wgpu.SurfaceGetPreferredFormat(_Surface, _Adapter);
+        wgpu.SurfaceGetCapabilities(_Surface, _Adapter, ref _SurfaceCapabilities);
 
         { //Create pipeline
             var blendState = new BlendState
@@ -156,7 +154,7 @@ private static void WindowOnLoad()
 
             var colorTargetState = new ColorTargetState
             {
-                Format    = _SwapChainFormat,
+                Format    = _SurfaceCapabilities.Formats[0],
                 Blend     = &blendState,
                 WriteMask = ColorWriteMask.All
             };
@@ -215,51 +213,50 @@ private static void WindowClosing()
 
     private static void CreateSwapchain()
     {
-        var swapChainDescriptor = new SwapChainDescriptor
+        _SurfaceConfiguration = new SurfaceConfiguration
         {
-            Usage       = TextureUsage.RenderAttachment,
-            Format      = _SwapChainFormat,
-            Width       = (uint) _Window.FramebufferSize.X,
-            Height      = (uint) _Window.FramebufferSize.Y,
-            PresentMode = PresentMode.Fifo
+            Usage = TextureUsage.RenderAttachment, 
+            Format = _SurfaceCapabilities.Formats[0], 
+            PresentMode = PresentMode.Fifo, 
+            Device = _Device, 
+            Width = (uint)_Window.FramebufferSize.X,
+            Height = (uint)_Window.FramebufferSize.Y 
         };
 
-        _SwapChain = wgpu.DeviceCreateSwapChain(_Device, _Surface, swapChainDescriptor);
+        wgpu.SurfaceConfigure(_Surface, _SurfaceConfiguration);
     }
 
     private static void WindowOnUpdate(double delta) {}
 
     private static void WindowOnRender(double delta)
     {
-        TextureView* nextTexture = null;
-
-        for (var attempt = 0; attempt < 2; attempt++)
+        SurfaceTexture surfaceTexture;
+        wgpu.SurfaceGetCurrentTexture(_Surface, &surfaceTexture);
+        switch (surfaceTexture.Status)
         {
-            nextTexture = wgpu.SwapChainGetCurrentTextureView(_SwapChain);
-
-            if (attempt == 0 && nextTexture == null)
-            {
-                Console.WriteLine("wgpu.SwapChainGetCurrentTextureView() failed; trying to create a new swap chain...\n");
+            case SurfaceGetCurrentTextureStatus.Timeout:
+            case SurfaceGetCurrentTextureStatus.Outdated:
+            case SurfaceGetCurrentTextureStatus.Lost:
+                // Recreate swapchain,
+                wgpu.TextureRelease(surfaceTexture.Texture);
                 CreateSwapchain();
-                continue;
-            }
-
-            break;
+                // Skip this frame
+                return;
+            case SurfaceGetCurrentTextureStatus.OutOfMemory:
+            case SurfaceGetCurrentTextureStatus.DeviceLost:
+            case SurfaceGetCurrentTextureStatus.Force32:
+                throw new Exception($"What is going on bros... {surfaceTexture.Status}");
         }
 
-        if (nextTexture == null)
-        {
-            Console.WriteLine("wgpu.SwapChainGetCurrentTextureView() failed after multiple attempts; giving up.\n");
-            return;
-        }
+        var view = wgpu.TextureCreateView(surfaceTexture.Texture, null);
 
         var commandEncoderDescriptor = new CommandEncoderDescriptor();
 
         var encoder = wgpu.DeviceCreateCommandEncoder(_Device, commandEncoderDescriptor);
 
         var colorAttachment = new RenderPassColorAttachment
         {
-            View          = nextTexture,
+            View          = view,
             ResolveTarget = null,
             LoadOp        = LoadOp.Clear,
             StoreOp       = StoreOp.Store,
@@ -284,15 +281,18 @@ private static void WindowOnRender(double delta)
         wgpu.RenderPassEncoderSetPipeline(renderPass, _Pipeline);
         wgpu.RenderPassEncoderDraw(renderPass, 3, 1, 0, 0);
         wgpu.RenderPassEncoderEnd(renderPass);
-        wgpu.TextureViewRelease(nextTexture);
 
         var queue = wgpu.DeviceGetQueue(_Device);
 
         var commandBuffer = wgpu.CommandEncoderFinish(encoder, new CommandBufferDescriptor());
 
         wgpu.QueueSubmit(queue, 1, &commandBuffer);
-        wgpu.SwapChainPresent(_SwapChain);
-        // _Window.SwapBuffers();
+        wgpu.SurfacePresent(_Surface);
+        wgpu.CommandBufferRelease(commandBuffer);
+        wgpu.RenderPassEncoderRelease(renderPass);
+        wgpu.CommandEncoderRelease(encoder);
+        wgpu.TextureViewRelease(view);
+        wgpu.TextureRelease(surfaceTexture.Texture);
     }
 
     private static void PrintAdapterFeatures()

diff --git a/src/Lab/Experiments/WebGPUTriangle/WebGPUTriangle.csproj b/src/Lab/Experiments/WebGPUTriangle/WebGPUTriangle.csproj
@@ -9,7 +9,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\WebGPU\Extensions\Silk.NET.WebGPU.Extensions.Disposal\Silk.NET.WebGPU.Extensions.Disposal.csproj" />
         <ProjectReference Include="..\..\..\WebGPU\Extensions\Silk.NET.WebGPU.Extensions.WGPU\Silk.NET.WebGPU.Extensions.WGPU.csproj" />
         <ProjectReference Include="..\..\..\WebGPU\Silk.NET.WebGPU\Silk.NET.WebGPU.csproj" />
         <ProjectReference Include="..\..\..\Windowing\Extensions\Silk.NET.Windowing.Extensions\Silk.NET.Windowing.Extensions.csproj" />

diff --git a/src/Native/Silk.NET.WebGPU.Native.WGPU/runtimes/linux-x64/native/libwgpu_native.so b/src/Native/Silk.NET.WebGPU.Native.WGPU/runtimes/linux-x64/native/libwgpu_native.so
diff --git a/src/Native/Silk.NET.WebGPU.Native.WGPU/runtimes/linux-x86/native/libwgpu_native.so b/src/Native/Silk.NET.WebGPU.Native.WGPU/runtimes/linux-x86/native/libwgpu_native.so
diff --git a/src/Native/Silk.NET.WebGPU.Native.WGPU/runtimes/osx-arm64/native/libwgpu_native.dylib b/src/Native/Silk.NET.WebGPU.Native.WGPU/runtimes/osx-arm64/native/libwgpu_native.dylib
diff --git a/src/Native/Silk.NET.WebGPU.Native.WGPU/runtimes/osx-x64/native/libwgpu_native.dylib b/src/Native/Silk.NET.WebGPU.Native.WGPU/runtimes/osx-x64/native/libwgpu_native.dylib
diff --git a/src/Native/Silk.NET.WebGPU.Native.WGPU/runtimes/win-arm64/native/wgpu_native.dll b/src/Native/Silk.NET.WebGPU.Native.WGPU/runtimes/win-arm64/native/wgpu_native.dll
diff --git a/src/Native/Silk.NET.WebGPU.Native.WGPU/runtimes/win-x64/native/wgpu_native.dll b/src/Native/Silk.NET.WebGPU.Native.WGPU/runtimes/win-x64/native/wgpu_native.dll
diff --git a/src/Native/Silk.NET.WebGPU.Native.WGPU/runtimes/win-x86/native/wgpu_native.dll b/src/Native/Silk.NET.WebGPU.Native.WGPU/runtimes/win-x86/native/wgpu_native.dll
+11 −0		.github/workflows/compile.yml
+10 −0		tests/compile/Makefile
+3 −0		tests/compile/main.c
+95 −51		webgpu.h
+3 −12		.github/workflows/cd.yml
+76 −59		Cargo.lock
+14 −13		Cargo.toml
+2 −1		README.md
+0 −1		build.rs
+2 −1		examples/capture/main.c
+2 −1		examples/compute/main.c
+1 −2		examples/enumerate_adapters/main.c
+80 −84		examples/triangle/main.c
+1 −1		ffi/webgpu-headers
+13 −42		ffi/wgpu.h
+102 −98		src/conv.rs
+370 −288		src/lib.rs
+39 −31		src/utils.rs