Update to latest idl (#524)

* Update to latest idl

* fix for new feature not existing for wgpu-native yet

Author: almarklein

CHANGELOG.md

@@ -17,6 +17,13 @@ Possible sections in each release:
 * Security: in case of vulnerabilities.
 
 
+### [v0.16.0] - tbd
+
+Changed:
+
+* The `Adapter.request_adapter_info()` method is replaced by the `.info` property.
+
+
 ### [v0.15.3] - 12-06-2024
 
 Added:

docs/start.rst

@@ -90,17 +90,17 @@ WGPU can work in GPU cloud compute environments on Linux machines with no physic
 
     sudo apt install xserver-xorg-core mesa-vulkan-drivers libvulkan1
 
-.. note:: If your distro is not Debian/Ubuntu install the corresponding packages for your distribution. 
+.. note:: If your distro is not Debian/Ubuntu install the corresponding packages for your distribution.
 
 You can verify whether the `"DiscreteGPU"` adapters are found:
 
 .. code-block:: python
 
     import wgpu
     import pprint
-    
+
     for a in wgpu.gpu.enumerate_adapters():
-        pprint.pprint(a.request_adapter_info())
+        pprint.pprint(a.info)
 
 If you are using a remote frame buffer via `jupyter-rfb <https://github.com/vispy/jupyter_rfb>`_ we also recommend installing the following for optimal performance:
 
@@ -109,7 +109,7 @@ If you are using a remote frame buffer via `jupyter-rfb <https://github.com/visp
     sudo apt install libjpeg-turbo8-dev libturbojpeg0-dev
     pip install simplejpeg
 
-Your mileage may vary across different cloud service providers, for more info see: https://github.com/pygfx/wgpu-py/issues/493 
+Your mileage may vary across different cloud service providers, for more info see: https://github.com/pygfx/wgpu-py/issues/493
 
 Installing LavaPipe on Linux
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

docs/wgpu.rst

@@ -63,7 +63,7 @@ features, limits and properties. To actually start using that harware for comput
 to control your hardware (or software).
 The device is the central object; most other GPU objects are created from it.
 Also see the convenience function :func:`wgpu.utils.get_default_device`.
-Information on the adapter can be obtained using :func:`wgpu.GPUAdapter.request_adapter_info` in the form of a :class:`GPUAdapterInfo`.
+Information on the adapter can be obtained using :attr:`wgpu.GPUAdapter.info` (a dict simular to :class:`GPUAdapterInfo`) or  :attr:`wgpu.GPUAdapter.summary`.
 
 A device is controlled with a specific backend API. By default one is selected automatically.
 This can be overridden by setting the

tests/testutils.py

@@ -97,7 +97,7 @@ def get_wgpu_backend():
     """
     Query the configured wgpu backend driver.
     """
-    code = "import wgpu.utils; info = wgpu.utils.get_default_device().adapter.request_adapter_info(); print(info['adapter_type'], info['backend_type'])"
+    code = "import wgpu.utils; info = wgpu.utils.get_default_device().adapter.info; print(info['adapter_type'], info['backend_type'])"
     result = subprocess.run(
         [
             sys.executable,

wgpu/_classes.py

@@ -377,24 +377,20 @@ def is_fallback_adapter(self):
         """Whether this adapter runs on software (rather than dedicated hardware)."""
         return self._adapter_info.get("adapter_type", "").lower() in ("software", "cpu")
 
+    # IDL: [SameObject] readonly attribute GPUAdapterInfo info;
+    @property
+    def info(self):
+        """A dict with information about this adapter, such as the vendor and devicen name."""
+        # Note: returns a dict rather than an GPUAdapterInfo instance.
+        return self._adapter_info
+
     @apidiff.add("Useful in multi-gpu environments")
     @property
     def summary(self):
         """A one-line summary of the info of this adapter (name, adapter_type, backend_type)."""
         d = self._adapter_info
         return f"{d['device']} ({d['adapter_type']}) via {d['backend_type']}"
 
-    # IDL: Promise<GPUAdapterInfo> requestAdapterInfo();
-    def request_adapter_info(self):
-        """Get a dict with information about this adapter, such as the vendor and devicen name."""
-        # Note: returns a dict rather than an GPUAdapterInfo instance.
-        return self._adapter_info
-
-    # IDL: Promise<GPUAdapterInfo> requestAdapterInfo();
-    async def request_adapter_info_async(self):
-        """Async get information about this adapter."""
-        return self._adapter_info
-
 
 class GPUObjectBase:
     """The base class for all GPU objects.

wgpu/backends/wgpu_native/_api.py

@@ -344,6 +344,8 @@ def to_py_str(key):
         # WebGPU features
         features = set()
         for f in sorted(enums.FeatureName):
+            if f in ["clip-distances"]:
+                continue  # not supported by wgpu-native yet
             key = f"FeatureName.{f}"
             i = enummap[key]
             # H: WGPUBool f(WGPUAdapter adapter, WGPUFeatureName feature)
@@ -852,6 +854,8 @@ def callback(status, result, message, userdata):
         # WebGPU features
         features = set()
         for f in sorted(enums.FeatureName):
+            if f in ["clip-distances"]:
+                continue  # not supported by wgpu-native yet
             key = f"FeatureName.{f}"
             i = enummap[key]
             # H: WGPUBool f(WGPUDevice device, WGPUFeatureName feature)

wgpu/enums.py

@@ -88,6 +88,7 @@ def __repr__(self):
 #: * "rg11b10ufloat_renderable"
 #: * "bgra8unorm_storage"
 #: * "float32_filterable"
+#: * "clip_distances"
 FeatureName = Enum(
     "FeatureName",
     depth_clip_control="depth-clip-control",
@@ -101,6 +102,7 @@ def __repr__(self):
     rg11b10ufloat_renderable="rg11b10ufloat-renderable",
     bgra8unorm_storage="bgra8unorm-storage",
     float32_filterable="float32-filterable",
+    clip_distances="clip-distances",
 )
 
 #: * "unmapped"

wgpu/resources/codegen_report.md

@@ -1,6 +1,6 @@
 # Code generatation report
 ## Preparing
-* The webgpu.idl defines 37 classes with 76 functions
+* The webgpu.idl defines 37 classes with 75 functions
 * The webgpu.idl defines 5 flags, 33 enums, 59 structs
 * The wgpu.h defines 198 functions
 * The wgpu.h defines 7 flags, 50 enums, 93 structs
@@ -18,10 +18,11 @@
 * Diffs for GPUTextureView: add size, add texture
 * Diffs for GPUBindingCommandsMixin: change set_bind_group
 * Diffs for GPUQueue: add read_buffer, add read_texture, hide copy_external_image_to_texture
-* Validated 37 classes, 114 methods, 44 properties
+* Validated 37 classes, 112 methods, 45 properties
 ### Patching API for backends/wgpu_native/_api.py
 * Validated 37 classes, 111 methods, 0 properties
 ## Validating backends/wgpu_native/_api.py
+* Enum field FeatureName.clip-distances missing in wgpu.h
 * Enum PipelineErrorReason missing in wgpu.h
 * Enum AutoLayoutMode missing in wgpu.h
 * Enum field VertexFormat.unorm10-10-10-2 missing in wgpu.h

wgpu/resources/webgpu.idl

@@ -100,10 +100,10 @@ enum GPUPowerPreference {
 interface GPUAdapter {
     [SameObject] readonly attribute GPUSupportedFeatures features;
     [SameObject] readonly attribute GPUSupportedLimits limits;
+    [SameObject] readonly attribute GPUAdapterInfo info;
     readonly attribute boolean isFallbackAdapter;
 
     Promise<GPUDevice> requestDevice(optional GPUDeviceDescriptor descriptor = {});
-    Promise<GPUAdapterInfo> requestAdapterInfo();
 };
 
 dictionary GPUDeviceDescriptor
@@ -125,6 +125,7 @@ enum GPUFeatureName {
     "rg11b10ufloat-renderable",
     "bgra8unorm-storage",
     "float32-filterable",
+    "clip-distances",
 };
 
 [Exposed=(Window, Worker), SecureContext]