Deal with the final unbound wpgu_native function

PyryM · Jan 19, 2024 · c5e8424 · c5e8424
1 parent 2c6ee5f
commit c5e8424
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/codegen/generate.ts b/codegen/generate.ts
@@ -14,7 +14,6 @@ import {
 import { docs } from "./extract_docs";
 import {
   PATCHED_FUNCTIONS,
-  BAD_FUNCTIONS,
   FORCE_NULLABLE_ARGS,
 } from "./patches";
 
@@ -376,6 +375,15 @@ class ApiInfo {
       },
     });
 
+    this.types.set("WGPUProc", {
+      cName: "WGPUProc",
+      pyName: "VoidPtr",
+      kind: "primitive",
+      pyAnnotation: () => "VoidPtr",
+      wrap: (v) => `VoidPtr(${v})`,
+      unwrap: (v) => `${v}._ptr`
+    });
+
     // C `char *` is treated specially as Python `str`
     this.types.set("char", {
       cName: "char",
@@ -974,15 +982,6 @@ function emitFuncDef(
     return patched;
   }
 
-  const badReason = BAD_FUNCTIONS.get(func.name);
-  if (badReason) {
-    return [
-      `# ${func.name} is marked as a MISBEHAVED FUNCTION:`,
-      `# ${badReason}`,
-      ``,
-    ];
-  }
-
   const { pyArgs, callArgs, staging } = api.prepFuncCall(func, isMemberFunc);
 
   let retval = "";

diff --git a/codegen/patches.ts b/codegen/patches.ts
@@ -16,11 +16,6 @@ export const FORCE_NULLABLE_ARGS: Set<string> = new Set([
 
 export const PATCHED_FUNCTIONS: Map<string, string[]> = new Map([
   ["wgpuAdapterEnumerateFeatures", listFeatures("Adapter")],
-  ["wgpuDeviceEnumerateFeatures", listFeatures("Device")],
+  ["wgpuDeviceEnumerateFeatures", listFeatures("Device")]
 ]);
 
-export const BAD_FUNCTIONS: Map<string, string> = new Map([
-  ["wgpuAdapterEnumerateFeatures", "This is unsafe. Use hasFeature."],
-  ["wgpuDeviceEnumerateFeatures", "This is unsafe. Use hasFeature."],
-  ["wgpuGetProcAddress", "Untyped function pointer return."],
-]);