Allow bitwise OR-ing of enum flags

codegen/generate.ts

@@ -71,8 +71,8 @@ function pyOptional(pyType: string): string {
   return IS_PY12 ? `${pyType} | None` : `Optional[${pyType}]`;
 }
 
-function pyUnion(a: string, b: string): string {
-  return IS_PY12 ? `${a} | ${b}` : `Union[${a}, ${b}]`;
+function pyUnion(...args: string[]): string {
+  return IS_PY12 ? args.join(" | ") : `Union[${args.join(", ")}]`;
 }
 
 function onlyDefined<T>(items: (T | undefined)[]): T[] {
@@ -98,6 +98,7 @@ class CEnum implements CType {
   kind: "enum" = "enum";
   sanitized: { name: string; val: string }[] = [];
   values: CEnumVal[] = [];
+  flagType?: string
 
   constructor(public cName: string, public pyName: string, values: CEnumVal[]) {
     this.mergeValues(values);
@@ -189,6 +190,9 @@ class ${this.pyName}:
         else:
             self.value = sum(set(flags))
 
+    def __or__(self, rhs: ${pyUnion(quoted(this.pyName), etypename)}) -> ${quoted(this.pyName)}:
+        return ${this.pyName}(int(self) | int(rhs))
+
     def __int__(self) -> int:
         return self.value
     ` + props.join("\n")

webgoo/bindings.py

@@ -705,6 +705,9 @@ def __init__(self, flags: Union[list["BufferUsage"], int]):
         else:
             self.value = sum(set(flags))
 
+    def __or__(self, rhs: Union["BufferUsageFlags", "BufferUsage"]) -> "BufferUsageFlags":
+        return BufferUsageFlags(int(self) | int(rhs))
+
     def __int__(self) -> int:
         return self.value
 
@@ -826,6 +829,11 @@ def __init__(self, flags: Union[list["ColorWriteMask"], int]):
         else:
             self.value = sum(set(flags))
 
+    def __or__(
+        self, rhs: Union["ColorWriteMaskFlags", "ColorWriteMask"]
+    ) -> "ColorWriteMaskFlags":
+        return ColorWriteMaskFlags(int(self) | int(rhs))
+
     def __int__(self) -> int:
         return self.value
 
@@ -892,6 +900,9 @@ def __init__(self, flags: Union[list["MapMode"], int]):
         else:
             self.value = sum(set(flags))
 
+    def __or__(self, rhs: Union["MapModeFlags", "MapMode"]) -> "MapModeFlags":
+        return MapModeFlags(int(self) | int(rhs))
+
     def __int__(self) -> int:
         return self.value
 
@@ -925,6 +936,9 @@ def __init__(self, flags: Union[list["ShaderStage"], int]):
         else:
             self.value = sum(set(flags))
 
+    def __or__(self, rhs: Union["ShaderStageFlags", "ShaderStage"]) -> "ShaderStageFlags":
+        return ShaderStageFlags(int(self) | int(rhs))
+
     def __int__(self) -> int:
         return self.value
 
@@ -969,6 +983,11 @@ def __init__(self, flags: Union[list["TextureUsage"], int]):
         else:
             self.value = sum(set(flags))
 
+    def __or__(
+        self, rhs: Union["TextureUsageFlags", "TextureUsage"]
+    ) -> "TextureUsageFlags":
+        return TextureUsageFlags(int(self) | int(rhs))
+
     def __int__(self) -> int:
         return self.value
 
@@ -1035,6 +1054,11 @@ def __init__(self, flags: Union[list["InstanceBackend"], int]):
         else:
             self.value = sum(set(flags))
 
+    def __or__(
+        self, rhs: Union["InstanceBackendFlags", "InstanceBackend"]
+    ) -> "InstanceBackendFlags":
+        return InstanceBackendFlags(int(self) | int(rhs))
+
     def __int__(self) -> int:
         return self.value
 
@@ -1112,6 +1136,9 @@ def __init__(self, flags: Union[list["InstanceFlag"], int]):
         else:
             self.value = sum(set(flags))
 
+    def __or__(self, rhs: Union["InstanceFlags", "InstanceFlag"]) -> "InstanceFlags":
+        return InstanceFlags(int(self) | int(rhs))
+
     def __int__(self) -> int:
         return self.value
 

webgoo/conveniences.py

@@ -119,7 +119,9 @@ def read_rgba_texture(device: wg.Device, tex: wg.Texture):
 
 def create_buffer_with_data(device: wg.Device, data: bytes) -> wg.Buffer:
     bsize = len(data)
-    buffer = device.createBuffer(usage = wg.BufferUsage.CopySrc, size=bsize, mappedAtCreation=True)
+    buffer = device.createBuffer(
+        usage=wg.BufferUsage.CopySrc, size=bsize, mappedAtCreation=True
+    )
     range = buffer.getMappedRange(0, bsize)
     ffi.memmove(range._ptr, data, bsize)
     buffer.unmap()