Merge pull request #15702 from Popov72/webgpu-adapterinfo

WebGPU: Fix requestAdapterInfo removed from the spec
BabylonJS · Oct 15, 2024 · 96d8f17 · 96d8f17
2 parents 281732a + 0664d91
commit 96d8f17
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/packages/dev/core/src/Engines/webgpuEngine.ts b/packages/dev/core/src/Engines/webgpuEngine.ts
@@ -145,6 +145,11 @@ export interface GlslangOptions {
  * Options to create the WebGPU engine
  */
 export interface WebGPUEngineOptions extends AbstractEngineOptions, GPURequestAdapterOptions {
+    /**
+     * The featureLevel property of the GPURequestAdapterOptions interface
+     */
+    featureLevel?: string;
+
     /**
      * Defines the category of adapter to use.
      * Is it the discrete or integrated device.
@@ -639,10 +644,7 @@ export class WebGPUEngine extends ThinWebGPUEngine {
                     this._adapterSupportedExtensions = [];
                     this._adapter.features?.forEach((feature) => this._adapterSupportedExtensions.push(feature as WebGPUConstants.FeatureName));
                     this._adapterSupportedLimits = this._adapter.limits;
-
-                    this._adapter.requestAdapterInfo().then((adapterInfo) => {
-                        this._adapterInfo = adapterInfo;
-                    });
+                    this._adapterInfo = this._adapter.info;
 
                     const deviceDescriptor = this._options.deviceDescriptor ?? {};
                     const requiredFeatures = deviceDescriptor?.requiredFeatures ?? (this._options.enableAllFeatures ? this._adapterSupportedExtensions : undefined);

diff --git a/packages/dev/core/src/LibDeclarations/webgpu.d.ts b/packages/dev/core/src/LibDeclarations/webgpu.d.ts
@@ -72,6 +72,7 @@ declare class GPU {
 }
 
 interface GPURequestAdapterOptions {
+    featureLevel?: string;
     powerPreference?: GPUPowerPreference;
     forceFallbackAdapter?: boolean /* default=false */;
 }
@@ -83,10 +84,10 @@ declare class GPUAdapter {
     readonly name: string;
     readonly features: GPUSupportedFeatures;
     readonly limits: GPUSupportedLimits;
+    readonly info: GPUAdapterInfo;
     readonly isFallbackAdapter: boolean;
 
     requestDevice(descriptor?: GPUDeviceDescriptor): Promise<GPUDevice>;
-    requestAdapterInfo(unmaskHints?: string[]): Promise<GPUAdapterInfo>;
 }
 
 interface GPUDeviceDescriptor extends GPUObjectDescriptorBase {