Rename deprecated texture info functions and add new ones. (#4192)

This is a step to fixing the tests so they test all optional
texture formats.

Note: I couldn't figure out how to share the code in
validation_test.ts without bigger changes throught the code
base. Maybe that can come in another PR.

The issue is, the rest of the code base expects that ValidationTest
is a class which means you do this

    function foo(t: ValidationTest) { ... }
    foo(new ValidationTest());

Things like the Mixin pattern don't support this as the thing
returned is at best a constructor but not a type. Hopefully
this can be solved later.

Author: greggman

src/common/framework/test_config.ts

@@ -1,3 +1,5 @@
+import { assert } from '../util/util.js';
+
 export type TestConfig = {
   /**
    * Enable debug-level logs (normally logged via `Fixture.debug()`).
@@ -67,3 +69,14 @@ export const globalTestConfig: TestConfig = {
   enforceDefaultLimits: false,
   logToWebSocket: false,
 };
+
+// Check if a device is a compatibility device.
+// Note: The CTS generally, requires that if globalTestConfig.compatibility
+// is true then the device MUST be a compatibility device since the CTS
+// is trying to test that compatibility devices have the correct validation.
+export function isCompatibilityDevice(device: GPUDevice) {
+  if (globalTestConfig.compatibility) {
+    assert(!device.features.has('webgpu-core'));
+  }
+  return globalTestConfig.compatibility;
+}

src/resources/cache/hashes.json

@@ -17,7 +17,7 @@ import {
   DepthStencilFormat,
   ColorTextureFormat,
   isCompressedTextureFormat,
-  viewCompatible,
+  viewCompatibleDeprecated,
   RegularTextureFormat,
   isRegularTextureFormat,
 } from '../../../format_info.js';
@@ -80,7 +80,7 @@ class F extends TextureTestMixin(GPUTest) {
     srcCopyLevel: number,
     dstCopyLevel: number
   ): void {
-    this.skipIfTextureFormatNotSupported(srcFormat, dstFormat);
+    this.skipIfTextureFormatNotSupportedDeprecated(srcFormat, dstFormat);
 
     // If we're in compatibility mode and it's a compressed texture
     // then we need to render the texture to test the results of the copy.
@@ -208,7 +208,7 @@ class F extends TextureTestMixin(GPUTest) {
       align(dstBlocksPerRow * bytesPerBlock, 4);
 
     if (isCompressedTextureFormat(dstTexture.format) && this.isCompatibility) {
-      assert(viewCompatible(this.isCompatibility, srcFormat, dstFormat));
+      assert(viewCompatibleDeprecated(this.isCompatibility, srcFormat, dstFormat));
       // compare by rendering. We need the expected texture to match
       // the dstTexture so we'll create a texture where we supply
       // all of the data in JavaScript.

src/webgpu/api/operation/command_buffer/copyTextureToTexture.spec.ts

@@ -1423,7 +1423,7 @@ bytes in copy works for every format.
   )
   .beforeAllSubcases(t => {
     const info = kTextureFormatInfo[t.params.format];
-    t.skipIfTextureFormatNotSupported(t.params.format);
+    t.skipIfTextureFormatNotSupportedDeprecated(t.params.format);
     t.selectDeviceOrSkipTestCase(info.feature);
   })
   .fn(t => {
@@ -1538,7 +1538,7 @@ works for every format with 2d and 2d-array textures.
   )
   .beforeAllSubcases(t => {
     const info = kTextureFormatInfo[t.params.format];
-    t.skipIfTextureFormatNotSupported(t.params.format);
+    t.skipIfTextureFormatNotSupportedDeprecated(t.params.format);
     t.selectDeviceOrSkipTestCase(info.feature);
   })
   .fn(t => {
@@ -1636,7 +1636,7 @@ for all formats. We pass origin and copyExtent as [number, number, number].`
   )
   .beforeAllSubcases(t => {
     const info = kTextureFormatInfo[t.params.format];
-    t.skipIfTextureFormatNotSupported(t.params.format);
+    t.skipIfTextureFormatNotSupportedDeprecated(t.params.format);
     t.selectDeviceOrSkipTestCase(info.feature);
   })
   .fn(t => {
@@ -1836,7 +1836,7 @@ TODO: Make a variant for depth-stencil formats.
   )
   .beforeAllSubcases(t => {
     const info = kTextureFormatInfo[t.params.format];
-    t.skipIfTextureFormatNotSupported(t.params.format);
+    t.skipIfTextureFormatNotSupportedDeprecated(t.params.format);
     t.selectDeviceOrSkipTestCase(info.feature);
   })
   .fn(t => {

src/webgpu/api/operation/command_buffer/image_copy.spec.ts

@@ -151,7 +151,7 @@ g.test('render_pass_store_op,color_attachment_only')
       .combine('arrayLayer', kArrayLayers)
   )
   .beforeAllSubcases(t => {
-    t.skipIfTextureFormatNotSupported(t.params.colorFormat);
+    t.skipIfTextureFormatNotSupportedDeprecated(t.params.colorFormat);
   })
   .fn(t => {
     const colorAttachment = t.createTextureTracked({

src/webgpu/api/operation/render_pass/storeOp.spec.ts

@@ -57,7 +57,7 @@ g.test('color,attachments')
   )
   .beforeAllSubcases(t => {
     const info = kTextureFormatInfo[t.params.format];
-    t.skipIfTextureFormatNotSupported(t.params.format);
+    t.skipIfTextureFormatNotSupportedDeprecated(t.params.format);
     t.selectDeviceOrSkipTestCase(info.feature);
   })
   .fn(t => {
@@ -159,7 +159,7 @@ g.test('color,component_count')
   )
   .beforeAllSubcases(t => {
     const info = kTextureFormatInfo[t.params.format];
-    t.skipIfTextureFormatNotSupported(t.params.format);
+    t.skipIfTextureFormatNotSupportedDeprecated(t.params.format);
     t.selectDeviceOrSkipTestCase(info.feature);
   })
   .fn(t => {

src/webgpu/api/operation/render_pipeline/pipeline_output_targets.spec.ts

@@ -393,7 +393,7 @@ g.test('blending,formats')
       .combine('format', kBlendableFormats)
   )
   .beforeAllSubcases(t => {
-    t.skipIfTextureFormatNotSupported(t.params.format);
+    t.skipIfTextureFormatNotSupportedDeprecated(t.params.format);
   })
   .fn(t => {
     const { format } = t.params;

src/webgpu/api/operation/rendering/color_target_state.spec.ts

@@ -9,7 +9,7 @@ TODO:
 
 import { makeTestGroup } from '../../../../common/framework/test_group.js';
 import { unreachable } from '../../../../common/util/util.js';
-import { isMultisampledTextureFormat, kTextureFormatInfo } from '../../../format_info.js';
+import { isMultisampledTextureFormatDeprecated, kTextureFormatInfo } from '../../../format_info.js';
 
 import { checkContentsByBufferCopy, checkContentsByTextureCopy } from './check_texture/by_copy.js';
 import {
@@ -42,12 +42,13 @@ export const g = makeTestGroup(TextureZeroInitTest);
 g.test('uninitialized_texture_is_zero')
   .params(kTestParams)
   .beforeAllSubcases(t => {
-    t.skipIfTextureFormatNotSupported(t.params.format);
+    t.skipIfTextureFormatNotSupportedDeprecated(t.params.format);
     t.selectDeviceOrSkipTestCase(kTextureFormatInfo[t.params.format].feature);
   })
   .fn(t => {
     t.skipIf(
-      t.params.sampleCount > 1 && !isMultisampledTextureFormat(t.params.format, t.isCompatibility)
+      t.params.sampleCount > 1 &&
+        !isMultisampledTextureFormatDeprecated(t.params.format, t.isCompatibility)
     );
 
     const usage = getRequiredTextureUsage(