Request adapters using featureLevel:compatibility

src/common/framework/test_config.ts

@@ -34,11 +34,6 @@ export type TestConfig = {
    */
   unrollConstEvalLoops: boolean;
 
-  /**
-   * Feature level for the adapter request.
-   */
-  featureLevel: string | null;
-
   /**
    * Whether or not we're running in compatibility mode.
    */
@@ -62,7 +57,6 @@ export const globalTestConfig: TestConfig = {
   testHeartbeatCallback: () => {},
   noRaceWithRejectOnTimeout: false,
   unrollConstEvalLoops: false,
-  featureLevel: null,
   compatibility: false,
   forceFallbackAdapter: false,
   logToWebSocket: false,

src/common/runtime/cmdline.ts

@@ -105,7 +105,6 @@ for (let i = 0; i < sys.args.length; ++i) {
       globalTestConfig.unrollConstEvalLoops = true;
     } else if (a === '--compat') {
       globalTestConfig.compatibility = true;
-      globalTestConfig.featureLevel = 'compatibility';
     } else if (a === '--force-fallback-adapter') {
       globalTestConfig.forceFallbackAdapter = true;
     } else if (a === '--log-to-websocket') {
@@ -121,14 +120,9 @@ for (let i = 0; i < sys.args.length; ++i) {
 
 let codeCoverage: CodeCoverageProvider | undefined = undefined;
 
-if (
-  globalTestConfig.featureLevel ||
-  globalTestConfig.compatibility ||
-  globalTestConfig.forceFallbackAdapter
-) {
+if (globalTestConfig.compatibility || globalTestConfig.forceFallbackAdapter) {
   // MAINTENANCE_TODO: remove the cast once compatibilityMode is officially added
   setDefaultRequestAdapterOptions({
-    featureLevel: globalTestConfig.featureLevel,
     compatibilityMode: globalTestConfig.compatibility,
     forceFallbackAdapter: globalTestConfig.forceFallbackAdapter,
   } as GPURequestAdapterOptions);

src/common/runtime/helper/options.ts

@@ -51,7 +51,6 @@ export function optionWorkerMode(
 export interface CTSOptions {
   worker: WorkerMode | null;
   debug: boolean;
-  featureLevel: 'core' | 'compatibility' | null;
   compatibility: boolean;
   forceFallbackAdapter: boolean;
   unrollConstEvalLoops: boolean;
@@ -62,7 +61,6 @@ export interface CTSOptions {
 export const kDefaultCTSOptions: CTSOptions = {
   worker: null,
   debug: true,
-  featureLevel: null,
   compatibility: false,
   forceFallbackAdapter: false,
   unrollConstEvalLoops: false,
@@ -100,16 +98,7 @@ export const kCTSOptionsInfo: OptionsInfos<CTSOptions> = {
     ],
   },
   debug: { description: 'show more info' },
-  featureLevel: {
-    description: 'set feature level for some tests',
-    parser: optionString,
-    selectValueDescriptions: [
-      { value: null, description: 'default' },
-      { value: 'core', description: 'core' },
-      { value: 'compatibility', description: 'compatibility' },
-    ],
-  },
-  compatibility: { description: 'run in compatibility mode (non-standard)' },
+  compatibility: { description: 'run in compatibility mode' },
   forceFallbackAdapter: { description: 'pass forceFallbackAdapter: true to requestAdapter' },
   unrollConstEvalLoops: { description: 'unroll const eval loops in WGSL' },
   powerPreference: {

src/common/runtime/helper/utils_worker.ts

@@ -15,18 +15,16 @@ export interface WorkerTestRunRequest {
  * Set config environment for workers with ctsOptions and return a Logger.
  */
 export function setupWorkerEnvironment(ctsOptions: CTSOptions): Logger {
-  const { featureLevel, powerPreference, compatibility } = ctsOptions;
+  const { powerPreference, compatibility } = ctsOptions;
   globalTestConfig.enableDebugLogs = ctsOptions.debug;
   globalTestConfig.unrollConstEvalLoops = ctsOptions.unrollConstEvalLoops;
-  globalTestConfig.featureLevel = featureLevel;
   globalTestConfig.compatibility = compatibility;
   globalTestConfig.logToWebSocket = ctsOptions.logToWebSocket;
 
   const log = new Logger();
 
-  if (featureLevel || powerPreference || compatibility) {
+  if (powerPreference || compatibility) {
     setDefaultRequestAdapterOptions({
-      ...(featureLevel && { featureLevel }),
       ...(powerPreference && { powerPreference }),
       // MAINTENANCE_TODO: Change this to whatever the option ends up being
       ...(compatibility && { compatibilityMode: true }),

src/common/runtime/server.ts

@@ -92,7 +92,6 @@ for (let i = 0; i < sys.args.length; ++i) {
       Colors.enabled = true;
     } else if (a === '--compat') {
       globalTestConfig.compatibility = true;
-      globalTestConfig.featureLevel = 'compatibility';
     } else if (a === '--coverage') {
       emitCoverage = true;
     } else if (a === '--force-fallback-adapter') {
@@ -120,14 +119,10 @@ for (let i = 0; i < sys.args.length; ++i) {
 
 let codeCoverage: CodeCoverageProvider | undefined = undefined;
 
-if (
-  globalTestConfig.featureLevel ||
-  globalTestConfig.compatibility ||
-  globalTestConfig.forceFallbackAdapter
-) {
+console.log("server");
+if (globalTestConfig.compatibility || globalTestConfig.forceFallbackAdapter) {
   // MAINTENANCE_TODO: remove the cast once compatibilityMode is officially added
   setDefaultRequestAdapterOptions({
-    featureLevel: globalTestConfig.featureLevel,
     compatibilityMode: globalTestConfig.compatibility,
     forceFallbackAdapter: globalTestConfig.forceFallbackAdapter,
   } as GPURequestAdapterOptions);

src/common/runtime/standalone.ts

@@ -48,7 +48,7 @@ const { queries: qs, options } = parseSearchParamLikeWithOptions(
   kStandaloneOptionsInfos,
   window.location.search || rootQuerySpec
 );
-const { runnow, featureLevel, powerPreference, compatibility, forceFallbackAdapter } = options;
+const { runnow, powerPreference, compatibility, forceFallbackAdapter } = options;
 globalTestConfig.enableDebugLogs = options.debug;
 globalTestConfig.unrollConstEvalLoops = options.unrollConstEvalLoops;
 globalTestConfig.compatibility = compatibility;
@@ -81,9 +81,8 @@ stopButtonElem.addEventListener('click', () => {
   stopRequested = true;
 });
 
-if (featureLevel || powerPreference || compatibility || forceFallbackAdapter) {
+if (powerPreference || compatibility || forceFallbackAdapter) {
   setDefaultRequestAdapterOptions({
-    ...(featureLevel && { featureLevel }),
     ...(powerPreference && { powerPreference }),
     // MAINTENANCE_TODO: Change this to whatever the option ends up being
     ...(compatibility && { compatibilityMode: true }),

src/common/util/navigator_gpu.ts

@@ -43,6 +43,10 @@ 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() {