Update submodules + Regenerate bindings (#1534)

.github/workflows/wgpu.yml

@@ -33,20 +33,20 @@ jobs:
     name: ${{ matrix.env.name }} Build
     runs-on: ${{ matrix.env.os }}
     steps:
-      - uses: dtolnay/rust-toolchain@nightly
+      - uses: dtolnay/rust-toolchain@stable
         if: runner.os == 'Windows'
         with:
-          toolchain: nightly-x86_64-pc-windows-msvc
+          toolchain: stable-x86_64-pc-windows-msvc
 
-      - uses: dtolnay/rust-toolchain@nightly
+      - uses: dtolnay/rust-toolchain@stable
         if: runner.os == 'Linux'
         with:
-          toolchain: nightly-x86_64-unknown-linux-gnu
+          toolchain: stable-x86_64-unknown-linux-gnu
 
-      - uses: dtolnay/rust-toolchain@nightly
+      - uses: dtolnay/rust-toolchain@stable
         if: runner.os == 'macOS'
         with:
-          toolchain: nightly-x86_64-apple-darwin
+          toolchain: stable-x86_64-apple-darwin
 
       - name: Add targets
         if: runner.os == 'Windows'

build/nuke/Native/Assimp.cs

@@ -37,7 +37,7 @@ partial class Build {
                 () =>
                 {
                     var @out = AssimpPath / "build";
-                    var prepare = "cmake -S. -B build -D BUILD_SHARED_LIBS=ON";
+                    var prepare = "cmake -S. -B build -D BUILD_SHARED_LIBS=ON -DASSIMP_WARNINGS_AS_ERRORS=OFF";
                     var build = $"cmake --build build --config Release{JobsArg}";
                     EnsureCleanDirectory(@out);
                     var runtimes = RootDirectory / "src" / "Native" / "Silk.NET.Assimp.Native" / "runtimes";

generator.json

@@ -434,7 +434,8 @@
                     "char": "byte",
                     "Window": "nint",
                     "VkAabbPositionsKHR": "Silk.NET.Maths.Box3D<float>",
-                    "VkAabbPositionsNV": "Silk.NET.Maths.Box3D<float>"
+                    "VkAabbPositionsNV": "Silk.NET.Maths.Box3D<float>",
+                    "_screen_buffer": "void"
                 },
                 {
                     "StdVideoDecodeH264PictureInfo": "Video.StdVideoDecodeH264PictureInfo",
@@ -2385,7 +2386,8 @@
                     "WGPUBufferUsageFlags": "Silk.NET.WebGPU.BufferUsage",
                     "WGPUMapModeFlags": "Silk.NET.WebGPU.MapMode",
                     "WGPUShaderStageFlags": "Silk.NET.WebGPU.ShaderStage",
-                    "WGPUTextureUsageFlags": "Silk.NET.WebGPU.TextureUsage"
+                    "WGPUTextureUsageFlags": "Silk.NET.WebGPU.TextureUsage",
+                    "WGPUInstanceBackendFlags": "Silk.NET.WebGPU.Extensions.WGPU.InstanceBackend"
                 },
                 {
                     "$include.commonTypeMap": "build/csharp_typemap.json",

src/Assimp/Silk.NET.Assimp/Enums/MorphingMethod.gen.cs

@@ -12,9 +12,6 @@ namespace Silk.NET.Assimp
     [NativeName("Name", "aiMorphingMethod")]
     public enum MorphingMethod : int
     {
-        [Obsolete("Deprecated in favour of \"Unknown\"")]
-        [NativeName("Name", "aiMorphingMethod_UNKNOWN")]
-        MorphingMethodUnknown = 0x0,
         [Obsolete("Deprecated in favour of \"VertexBlend\"")]
         [NativeName("Name", "aiMorphingMethod_VERTEX_BLEND")]
         MorphingMethodVertexBlend = 0x1,
@@ -24,8 +21,6 @@ public enum MorphingMethod : int
         [Obsolete("Deprecated in favour of \"MorphRelative\"")]
         [NativeName("Name", "aiMorphingMethod_MORPH_RELATIVE")]
         MorphingMethodMorphRelative = 0x3,
-        [NativeName("Name", "aiMorphingMethod_UNKNOWN")]
-        Unknown = 0x0,
         [NativeName("Name", "aiMorphingMethod_VERTEX_BLEND")]
         VertexBlend = 0x1,
         [NativeName("Name", "aiMorphingMethod_MORPH_NORMALIZED")]

src/Assimp/Silk.NET.Assimp/Structs/Mesh.gen.cs

@@ -35,7 +35,7 @@ public Mesh
             AssimpString? mName = null,
             uint? mNumAnimMeshes = null,
             AnimMesh** mAnimMeshes = null,
-            MorphingMethod? mMethod = null,
+            uint? mMethod = null,
             Silk.NET.Maths.Box3D<float>? mAABB = null,
             AssimpString** mTextureCoordsNames = null
         ) : this()
@@ -267,10 +267,10 @@ public ref System.Numerics.Vector3* this[int index]
         [NativeName("Name", "mAnimMeshes")]
         public AnimMesh** MAnimMeshes;
 
-        [NativeName("Type", "enum aiMorphingMethod")]
-        [NativeName("Type.Name", "enum aiMorphingMethod")]
+        [NativeName("Type", "unsigned int")]
+        [NativeName("Type.Name", "unsigned int")]
         [NativeName("Name", "mMethod")]
-        public MorphingMethod MMethod;
+        public uint MMethod;
 
         [NativeName("Type", "aiAABB")]
         [NativeName("Type.Name", "aiAABB")]

src/Lab/Experiments/WebGPUTest/Program.cs

@@ -13,25 +13,29 @@ public static unsafe class Program
     public static Instance* instance;
     public static Adapter* adapter;
     public static Device* device;
+
     public static void Main(string[] args)
     {
         uint[] numbers = { 1, 2, 3, 4 };
         var numbersSize = (uint) numbers.Length * sizeof(uint);
         var numbersLength = (uint) numbers.Length;
 
-        var wgpu = WebGPU.GetApi();
+        var webGpu = WebGPU.GetApi();
 
-        wgpu.TryGetDeviceExtension(null, out Wgpu wgpuSpecific);
+        if (!webGpu.TryGetDeviceExtension(null, out Wgpu wgpuSpecific))
+        {
+            throw new Exception("This code only runs on wgpu-native! Please PR in support for Dawn if you know how to get it working there!");
+        }
 
         InstanceDescriptor instanceDescriptor = new InstanceDescriptor();
-        instance = wgpu.CreateInstance(&instanceDescriptor);
+        instance = webGpu.CreateInstance(&instanceDescriptor);
 
         var requestAdapterOptions = new RequestAdapterOptions();
-        wgpu.InstanceRequestAdapter(instance, &requestAdapterOptions, new PfnRequestAdapterCallback(RequestAdapterCallback), null);
+        webGpu.InstanceRequestAdapter(instance, &requestAdapterOptions, new PfnRequestAdapterCallback(RequestAdapterCallback), null);
 
-        wgpu.AdapterRequestDevice(adapter, null, new PfnRequestDeviceCallback(RequestDeviceCallback), null);
+        webGpu.AdapterRequestDevice(adapter, null, new PfnRequestDeviceCallback(RequestDeviceCallback), null);
 
-        SetErrorCallback(wgpu);
+        SetErrorCallback(webGpu);
 
         // ReSharper disable once InconsistentNaming
         var shaderModuleWGSLDescriptor = new ShaderModuleWGSLDescriptor();
@@ -85,7 +89,7 @@ fn main(@builtin(global_invocation_id) global_id: vec3<u32>) {
             Label = (byte*) SilkMarshal.StringToPtr("Test Compute Shader") //TODO: free this
         };
 
-        var shader = wgpu.DeviceCreateShaderModule(device, shaderModuleDescriptor);
+        var shader = webGpu.DeviceCreateShaderModule(device, shaderModuleDescriptor);
 
         var stagingBufferDescription = new BufferDescriptor
         {
@@ -94,7 +98,7 @@ fn main(@builtin(global_invocation_id) global_id: vec3<u32>) {
             Size             = numbersSize,
             MappedAtCreation = false
         };
-        var stagingBuffer = wgpu.DeviceCreateBuffer(device, stagingBufferDescription);
+        var stagingBuffer = webGpu.DeviceCreateBuffer(device, stagingBufferDescription);
 
         var storageBufferDescription = new BufferDescriptor
         {
@@ -103,7 +107,7 @@ fn main(@builtin(global_invocation_id) global_id: vec3<u32>) {
             Size             = numbersSize,
             MappedAtCreation = false
         };
-        var storageBuffer = wgpu.DeviceCreateBuffer(device, storageBufferDescription);
+        var storageBuffer = webGpu.DeviceCreateBuffer(device, storageBufferDescription);
 
         var computePipelineDescriptor = new ComputePipelineDescriptor
         {
@@ -115,9 +119,9 @@ fn main(@builtin(global_invocation_id) global_id: vec3<u32>) {
                 EntryPoint = (byte*) SilkMarshal.StringToPtr("main") //TODO: free this
             }
         };
-        var computePipeline = wgpu.DeviceCreateComputePipeline(device, computePipelineDescriptor);
+        var computePipeline = webGpu.DeviceCreateComputePipeline(device, computePipelineDescriptor);
 
-        var bindGroupLayout = wgpu.ComputePipelineGetBindGroupLayout(computePipeline, 0);
+        var bindGroupLayout = webGpu.ComputePipelineGetBindGroupLayout(computePipeline, 0);
 
         var bindGroupDescriptor = new BindGroupDescriptor
         {
@@ -134,57 +138,57 @@ fn main(@builtin(global_invocation_id) global_id: vec3<u32>) {
         bindGroupDescriptor.Entries = entries;
         bindGroupDescriptor.EntryCount = 1;
 
-        var bindGroup = wgpu.DeviceCreateBindGroup(device, bindGroupDescriptor);
+        var bindGroup = webGpu.DeviceCreateBindGroup(device, bindGroupDescriptor);
 
         var commandEncoderDescriptor = new CommandEncoderDescriptor
         {
             Label = (byte*) SilkMarshal.StringToPtr("Command Encoder") //TODO: free this 
         };
-        var encoder = wgpu.DeviceCreateCommandEncoder(device, commandEncoderDescriptor);
+        var encoder = webGpu.DeviceCreateCommandEncoder(device, commandEncoderDescriptor);
 
         var computePassDescriptor = new ComputePassDescriptor
         {
             Label = (byte*) SilkMarshal.StringToPtr("Compute Pass") //TODO: free this  
         };
-        var computePass = wgpu.CommandEncoderBeginComputePass(encoder, computePassDescriptor);
+        var computePass = webGpu.CommandEncoderBeginComputePass(encoder, computePassDescriptor);
 
-        wgpu.ComputePassEncoderSetPipeline(computePass, computePipeline);
-        wgpu.ComputePassEncoderSetBindGroup(computePass, 0, bindGroup, 0, null);
-        wgpu.ComputePassEncoderDispatchWorkgroups(computePass, numbersLength, 1, 1);
-        wgpu.ComputePassEncoderEnd(computePass);
-        wgpu.CommandEncoderCopyBufferToBuffer
+        webGpu.ComputePassEncoderSetPipeline(computePass, computePipeline);
+        webGpu.ComputePassEncoderSetBindGroup(computePass, 0, bindGroup, 0, null);
+        webGpu.ComputePassEncoderDispatchWorkgroups(computePass, numbersLength, 1, 1);
+        webGpu.ComputePassEncoderEnd(computePass);
+        webGpu.CommandEncoderCopyBufferToBuffer
         (
             encoder, storageBuffer, 0, stagingBuffer,
             0, numbersSize
         );
 
-        var queue = wgpu.DeviceGetQueue(device);
+        var queue = webGpu.DeviceGetQueue(device);
         var commandBufferDescriptor = new CommandBufferDescriptor
         {
             Label = (byte*) SilkMarshal.StringToPtr("Command Buffer") //TODO: free this  
         };
-        var cmdBuffer = wgpu.CommandEncoderFinish(encoder, commandBufferDescriptor);
+        var cmdBuffer = webGpu.CommandEncoderFinish(encoder, commandBufferDescriptor);
 
         fixed (uint* numberPtr = numbers)
-            wgpu.QueueWriteBuffer(queue, storageBuffer, 0, numberPtr, numbersSize);
+            webGpu.QueueWriteBuffer(queue, storageBuffer, 0, numberPtr, numbersSize);
 
-        wgpu.QueueSubmit(queue, 1, &cmdBuffer);
+        webGpu.QueueSubmit(queue, 1, &cmdBuffer);
 
-        wgpu.BufferMapAsync(stagingBuffer, MapMode.Read, 0, numbersSize, new PfnBufferMapCallback(
+        webGpu.BufferMapAsync(stagingBuffer, MapMode.Read, 0, numbersSize, new PfnBufferMapCallback(
                                 (arg0, data) =>
                                 {
                                     if(arg0 != BufferMapAsyncStatus.Success)
                                     {
                                         throw new Exception($"Unable to map buffer! status: {arg0}");
                                     }
 
-                                    var times = (uint*) wgpu.BufferGetMappedRange(stagingBuffer, 0, numbersSize); ;
+                                    var times = (uint*) webGpu.BufferGetMappedRange(stagingBuffer, 0, numbersSize); ;
 
                                     Console.WriteLine($"Times: [{times[0]}, {times[1]}, {times[2]}, {times[3]}]");
                                 }), null);
 
         wgpuSpecific.DevicePoll(device, true, null);
-        wgpu.BufferUnmap(stagingBuffer);
+        webGpu.BufferUnmap(stagingBuffer);
     }
 
     private static void ReadBufferMap(BufferMapAsyncStatus arg0, void* arg1)

src/Lab/Experiments/WebGPUTexturedQuad/Program.cs

@@ -1,4 +1,6 @@
 using System.Numerics;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 using Silk.NET.Core.Native;
 using Silk.NET.Maths;
 using Silk.NET.WebGPU;
@@ -28,9 +30,8 @@ public Vertex(Vector2 position, Vector2 texCoord)
     }
 
     // ReSharper disable once InconsistentNaming
-    private static WebGPU         wgpu            = null!;
-    private static WebGPUDisposal _WebGpuDisposal = null!;
-    private static IWindow?       _Window;
+    private static WebGPU   wgpu = null!;
+    private static IWindow? _Window;
 
     private static Instance*       _Instance;
     private static Surface*        _Surface;
@@ -86,8 +87,6 @@ private static void WindowOnLoad()
     {
         wgpu = WebGPU.GetApi();
 
-        _WebGpuDisposal = new WebGPUDisposal(wgpu);
-
         InstanceDescriptor instanceDescriptor = new InstanceDescriptor();
         _Instance = wgpu.CreateInstance(instanceDescriptor);
 
@@ -118,10 +117,15 @@ private static void WindowOnLoad()
         PrintAdapterFeatures();
 
         { //Get device
+            var deviceDescriptor = new DeviceDescriptor
+            {
+                DeviceLostCallback = new PfnDeviceLostCallback(DeviceLost),
+            };
+
             wgpu.AdapterRequestDevice
             (
                 _Adapter,
-                null,
+                in deviceDescriptor,
                 new PfnRequestDeviceCallback((_, device1, _, _) => _Device = device1),
                 null
             );
@@ -130,7 +134,6 @@ private static void WindowOnLoad()
         } //Get device
 
         wgpu.DeviceSetUncapturedErrorCallback(_Device, new PfnErrorCallback(UncapturedError), null);
-        wgpu.DeviceSetDeviceLostCallback(_Device, new PfnDeviceLostCallback(DeviceLost), null);
 
         { //Load shader
             var wgslDescriptor = new ShaderModuleWGSLDescriptor
@@ -260,10 +263,11 @@ private static void WindowOnLoad()
         { //Create sampler
             var descriptor = new SamplerDescriptor
             {
-                Compare      = CompareFunction.Undefined,
-                MipmapFilter = MipmapFilterMode.Linear,
-                MagFilter    = FilterMode.Linear,
-                MinFilter    = FilterMode.Linear
+                Compare       = CompareFunction.Undefined,
+                MipmapFilter  = MipmapFilterMode.Linear,
+                MagFilter     = FilterMode.Linear,
+                MinFilter     = FilterMode.Linear,
+                MaxAnisotropy = 1
             };
 
             _Sampler = wgpu.DeviceCreateSampler(_Device, descriptor);
@@ -564,7 +568,7 @@ private static void WindowOnRender(double delta)
         wgpu.RenderPassEncoderDraw(renderPass, 6, 1, 0, 0);
 
         wgpu.RenderPassEncoderEnd(renderPass);
-        _WebGpuDisposal.Dispose(nextTexture);
+        wgpu.TextureViewRelease(nextTexture);
 
         var queue = wgpu.DeviceGetQueue(_Device);
 
@@ -577,11 +581,12 @@ private static void WindowOnRender(double delta)
 
     private static void WindowClosing()
     {
-        _WebGpuDisposal.Dispose(_Shader);
-        _WebGpuDisposal.Dispose(_Pipeline);
-        _WebGpuDisposal.Dispose(_Device);
-        _WebGpuDisposal.Dispose(_Adapter);
-        _WebGpuDisposal.Dispose(_Surface);
+        wgpu.ShaderModuleRelease(_Shader);
+        wgpu.RenderPipelineRelease(_Pipeline);
+        wgpu.DeviceRelease(_Device);
+        wgpu.AdapterRelease(_Adapter);
+        wgpu.SurfaceRelease(_Surface);
+        wgpu.InstanceRelease(_Instance);
 
         wgpu.Dispose();
     }

src/Lab/Experiments/WebGPUTexturedQuad/shader.wgsl

@@ -5,10 +5,6 @@ struct VertexOutputs {
     @location(0) tex_coord: vec2<f32>
 }
 
-struct FragmentInputs {
-    @location(0) tex_coord: vec2<f32>
-}
-
 @group(1) @binding(0) var<uniform> projection_matrix: mat4x4<f32>;
 
 @vertex
@@ -30,6 +26,6 @@ fn vs_main(
 @group(0) @binding(1) var s: sampler;
 
 @fragment
-fn fs_main(input: FragmentInputs) -> @location(0) vec4<f32> {
+fn fs_main(input: VertexOutputs) -> @location(0) vec4<f32> {
     return textureSample(t, s, input.tex_coord);
 }