Merge pull request #18 from EvergineTeam/fix-requiredFatures

WGPUDeviceLostCallback should be process like void*
EvergineTeam · Sep 27, 2024 · 7040ff4 · 7040ff4
2 parents 8133d77 + c11441d
commit 7040ff4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/WebGPUGen/Evergine.Bindings.WebGPU/Generated/Structs.cs b/WebGPUGen/Evergine.Bindings.WebGPU/Generated/Structs.cs
@@ -662,7 +662,7 @@ public unsafe struct WGPUDeviceDescriptor
 		public WGPUFeatureName* requiredFeatures;
 		public WGPURequiredLimits* requiredLimits;
 		public WGPUQueueDescriptor defaultQueue;
-		public WGPUDeviceLostCallback deviceLostCallback;
+		public void* deviceLostCallback;
 		public void* deviceLostUserdata;
 	}
 

diff --git a/WebGPUGen/HelloTriangle/HelloTriangle.cs b/WebGPUGen/HelloTriangle/HelloTriangle.cs
@@ -93,11 +93,17 @@ private void InitWebGPU()
 
             wgpuInstanceRequestAdapter(Instance, &options, OnAdapterRequestEnded, (void*)0);
 
+            var requiredFeatureCount = WebGPUNative.wgpuAdapterEnumerateFeatures(this.Adapter, null);
+            var requiredFeatures = stackalloc WGPUFeatureName[(int)requiredFeatureCount];
+
+            WebGPUNative.wgpuAdapterEnumerateFeatures(this.Adapter, requiredFeatures);
+
             WGPUDeviceDescriptor deviceDescriptor = new WGPUDeviceDescriptor()
             {
                 nextInChain = null,
                 label = null,
-                requiredFeatures = (WGPUFeatureName*)0,
+                requiredFeatures = requiredFeatures,
+                requiredFeatureCount = requiredFeatureCount,
                 requiredLimits = null,
             };
 

diff --git a/WebGPUGen/WebGPUGen/Helpers.cs b/WebGPUGen/WebGPUGen/Helpers.cs
@@ -10,8 +10,6 @@ namespace WebGPUGen
 {
     public static class Helpers
     {
-        //public static List<string> TypedefList;
-
         private static readonly Dictionary<string, string> s_csNameMappings = new Dictionary<string, string>()
         {
             { "uint8_t", "byte" },
@@ -28,6 +26,7 @@ public static class Helpers
             { "DWORD", "uint" },
 
             { "WGPUSubmissionIndex", "ulong" },
+            { "WGPUDeviceLostCallback", "void*" },
         };
 
         public static string ConvertToCSharpType(CppType type, bool isPointer = false)
@@ -259,11 +258,6 @@ private static string GetCsCleanName(string name)
                 return name.Remove(name.Count() - 5);
             }
 
-            //if (TypedefList.Contains(name))
-            //{
-            //    return "IntPtr";
-            //}
-
             return name;
         }