Address feedback

gpuweb · Dec 11, 2024 · 33c0d79 · 33c0d79
1 parent fd7834a
commit 33c0d79
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/src/common/runtime/cmdline.ts b/src/common/runtime/cmdline.ts
@@ -124,6 +124,7 @@ if (globalTestConfig.compatibility || globalTestConfig.forceFallbackAdapter) {
   // MAINTENANCE_TODO: remove the cast once compatibilityMode is officially added
   setDefaultRequestAdapterOptions({
     compatibilityMode: globalTestConfig.compatibility,
+    featureLevel: globalTestConfig.compatibility ? 'compatibility' : 'core',
     forceFallbackAdapter: globalTestConfig.forceFallbackAdapter,
   } as GPURequestAdapterOptions);
 }

diff --git a/src/common/runtime/helper/utils_worker.ts b/src/common/runtime/helper/utils_worker.ts
@@ -27,7 +27,7 @@ export function setupWorkerEnvironment(ctsOptions: CTSOptions): Logger {
     setDefaultRequestAdapterOptions({
       ...(powerPreference && { powerPreference }),
       // MAINTENANCE_TODO: Change this to whatever the option ends up being
-      ...(compatibility && { compatibilityMode: true }),
+      ...(compatibility && { compatibilityMode: true, featureLevel: 'compatibility' }),
     });
   }
 

diff --git a/src/common/runtime/server.ts b/src/common/runtime/server.ts
@@ -123,6 +123,7 @@ if (globalTestConfig.compatibility || globalTestConfig.forceFallbackAdapter) {
   // MAINTENANCE_TODO: remove the cast once compatibilityMode is officially added
   setDefaultRequestAdapterOptions({
     compatibilityMode: globalTestConfig.compatibility,
+    featureLevel: globalTestConfig.compatibility ? 'compatibility' : 'core',
     forceFallbackAdapter: globalTestConfig.forceFallbackAdapter,
   } as GPURequestAdapterOptions);
 }

diff --git a/src/common/runtime/standalone.ts b/src/common/runtime/standalone.ts
@@ -85,7 +85,7 @@ if (powerPreference || compatibility || forceFallbackAdapter) {
   setDefaultRequestAdapterOptions({
     ...(powerPreference && { powerPreference }),
     // MAINTENANCE_TODO: Change this to whatever the option ends up being
-    ...(compatibility && { compatibilityMode: true }),
+    ...(compatibility && { compatibilityMode: true, featureLevel: 'compatibility' }),
     ...(forceFallbackAdapter && { forceFallbackAdapter: true }),
   });
 }

diff --git a/src/common/util/navigator_gpu.ts b/src/common/util/navigator_gpu.ts
@@ -43,9 +43,6 @@ export function setDefaultRequestAdapterOptions(options: GPURequestAdapterOption
     throw new Error('must call setDefaultRequestAdapterOptions before getGPU');
   }
   defaultRequestAdapterOptions = { ...options };
-  // MAINTENANCE_TODO: remove this once compatibilityMode is removed.
-  defaultRequestAdapterOptions.featureLevel =
-    'compatibilityMode' in options && options.compatibilityMode ? 'compatibility' : 'core';
 }
 
 export function getDefaultRequestAdapterOptions() {

diff --git a/src/webgpu/api/operation/adapter/info.spec.ts b/src/webgpu/api/operation/adapter/info.spec.ts
@@ -21,6 +21,7 @@ g.test('adapter_info')
   .fn(async t => {
     const gpu = getGPU(t.rec);
     const adapter = await gpu.requestAdapter();
+    console.log(adapter);
     assert(adapter !== null);
 
     const adapterInfo = adapter.info;