Refactor api/operations/storage_texture/*

Also renamed isTextureFormatPossiblyStorageWritable to
isTextureFormatPossiblyStorageReadWritable as the old name
was wrong. That affected textureDimensions.spec.ts

Author: greggman

src/webgpu/api/operation/sampling/anisotropy.spec.ts

@@ -12,7 +12,7 @@ things. If there are no guarantees we can issue warnings instead of failures. Id
 
 import { makeTestGroup } from '../../../../common/framework/test_group.js';
 import { assert } from '../../../../common/util/util.js';
-import { GPUTest, TextureTestMixin } from '../../../gpu_test.js';
+import { AllFeaturesMaxLimitsGPUTest, TextureTestMixin } from '../../../gpu_test.js';
 import { checkElementsEqual } from '../../../util/check_contents.js';
 import { TexelView } from '../../../util/texture/texel_view.js';
 import { PerPixelComparison } from '../../../util/texture/texture_ok.js';
@@ -33,7 +33,7 @@ const checkerColors = [
 ];
 
 // renders texture a slanted plane placed in a specific way
-class SamplerAnisotropicFilteringSlantedPlaneTest extends GPUTest {
+class SamplerAnisotropicFilteringSlantedPlaneTest extends AllFeaturesMaxLimitsGPUTest {
   copyRenderTargetToBuffer(rt: GPUTexture): GPUBuffer {
     const byteLength = kRTSize * kBytesPerRow;
     const buffer = this.createBufferTracked({

src/webgpu/api/operation/storage_texture/read_only.spec.ts

@@ -12,8 +12,9 @@ import { Float16Array } from '../../../../external/petamoriken/float16/float16.j
 import { kTextureDimensions } from '../../../capability_info.js';
 import {
   ColorTextureFormat,
-  kColorTextureFormats,
-  kTextureFormatInfo,
+  getBlockInfoForColorTextureFormat,
+  getTextureFormatType,
+  kPossibleStorageTextureFormats,
 } from '../../../format_info.js';
 import { AllFeaturesMaxLimitsGPUTest } from '../../../gpu_test.js';
 import { kValidShaderStages, TValidShaderStage } from '../../../util/shader.js';
@@ -51,8 +52,7 @@ class F extends AllFeaturesMaxLimitsGPUTest {
     storageTexture: GPUTexture,
     format: ColorTextureFormat
   ): ArrayBuffer {
-    const bytesPerBlock = kTextureFormatInfo[format].color.bytes;
-    assert(bytesPerBlock !== undefined);
+    const { bytesPerBlock } = getBlockInfoForColorTextureFormat(format);
 
     const width = storageTexture.width;
     const height = storageTexture.height;
@@ -175,14 +175,16 @@ class F extends AllFeaturesMaxLimitsGPUTest {
   }
 
   getTypedArrayBufferForOutputBufferData(arrayBuffer: ArrayBuffer, format: ColorTextureFormat) {
-    switch (kTextureFormatInfo[format].color.type) {
+    switch (getTextureFormatType(format)) {
       case 'uint':
         return new Uint32Array(arrayBuffer);
       case 'sint':
         return new Int32Array(arrayBuffer);
       case 'float':
       case 'unfilterable-float':
         return new Float32Array(arrayBuffer);
+      default:
+        unreachable();
     }
   }
 
@@ -220,7 +222,7 @@ class F extends AllFeaturesMaxLimitsGPUTest {
   }
 
   getOutputBufferWGSLType(format: ColorTextureFormat) {
-    switch (kTextureFormatInfo[format].color.type) {
+    switch (getTextureFormatType(format)) {
       case 'uint':
         return 'vec4u';
       case 'sint':
@@ -542,25 +544,16 @@ g.test('basic')
   )
   .params(u =>
     u
-      .combine('format', kColorTextureFormats)
-      .filter(
-        p => p.format === 'bgra8unorm' || kTextureFormatInfo[p.format].color?.storage === true
-      )
+      .combine('format', kPossibleStorageTextureFormats)
       .combine('shaderStage', kValidShaderStages)
       .combine('dimension', kTextureDimensions)
       .combine('depthOrArrayLayers', [1, 2] as const)
       .unless(p => p.dimension === '1d' && p.depthOrArrayLayers > 1)
   )
-  .beforeAllSubcases(t => {
-    if (t.params.format === 'bgra8unorm') {
-      t.selectDeviceOrSkipTestCase('bgra8unorm-storage');
-    }
-    if (t.isCompatibility) {
-      t.skipIfTextureFormatNotUsableAsStorageTextureDeprecated(t.params.format);
-    }
-  })
   .fn(t => {
     const { format, shaderStage, dimension, depthOrArrayLayers } = t.params;
+    t.skipIfTextureFormatNotSupported(format);
+    t.skipIfTextureFormatNotUsableAsStorageTexture(format);
 
     if (t.isCompatibility) {
       if (shaderStage === 'fragment') {
@@ -598,7 +591,7 @@ g.test('basic')
 
     t.doTransform(storageTexture, shaderStage, format, outputBuffer);
 
-    switch (kTextureFormatInfo[format].color.type) {
+    switch (getTextureFormatType(format)) {
       case 'uint':
         t.expectGPUBufferValuesEqual(outputBuffer, new Uint32Array(expectedData));
         break;

src/webgpu/api/operation/storage_texture/read_write.spec.ts

@@ -8,7 +8,11 @@ TODO:
 import { makeTestGroup } from '../../../../common/framework/test_group.js';
 import { assert, unreachable } from '../../../../common/util/util.js';
 import { kTextureDimensions } from '../../../capability_info.js';
-import { kColorTextureFormats, kTextureFormatInfo } from '../../../format_info.js';
+import {
+  getBlockInfoForColorTextureFormat,
+  getBlockInfoForTextureFormat,
+  kPossibleStorageTextureFormats,
+} from '../../../format_info.js';
 import { AllFeaturesMaxLimitsGPUTest } from '../../../gpu_test.js';
 import { align } from '../../../util/math.js';
 
@@ -19,7 +23,7 @@ type ShaderStageForReadWriteStorageTexture =
 class F extends AllFeaturesMaxLimitsGPUTest {
   getInitialData(storageTexture: GPUTexture): ArrayBuffer {
     const format = storageTexture.format;
-    const bytesPerBlock = kTextureFormatInfo[format].bytesPerBlock;
+    const { bytesPerBlock } = getBlockInfoForTextureFormat(format);
     assert(bytesPerBlock !== undefined);
 
     const width = storageTexture.width;
@@ -68,7 +72,7 @@ class F extends AllFeaturesMaxLimitsGPUTest {
     initialData: ArrayBuffer
   ): ArrayBuffer {
     const format = storageTexture.format;
-    const bytesPerBlock = kTextureFormatInfo[format].bytesPerBlock;
+    const { bytesPerBlock } = getBlockInfoForTextureFormat(format);
     assert(bytesPerBlock !== undefined);
 
     const width = storageTexture.width;
@@ -308,18 +312,16 @@ g.test('basic')
   )
   .params(u =>
     u
-      .combine('format', kColorTextureFormats)
-      .filter(p => kTextureFormatInfo[p.format].color?.readWriteStorage === true)
+      .combine('format', kPossibleStorageTextureFormats)
       .combine('shaderStage', kShaderStagesForReadWriteStorageTexture)
       .combine('textureDimension', kTextureDimensions)
       .combine('depthOrArrayLayers', [1, 2] as const)
       .unless(p => p.textureDimension === '1d' && p.depthOrArrayLayers > 1)
   )
-  .beforeAllSubcases(t => {
-    t.skipIfTextureFormatNotUsableAsStorageTextureDeprecated(t.params.format);
-  })
   .fn(t => {
     const { format, shaderStage, textureDimension, depthOrArrayLayers } = t.params;
+    t.skipIfTextureFormatNotSupported(format);
+    t.skipIfTextureFormatNotUsableAsReadWriteStorageTexture(format);
 
     if (t.isCompatibility) {
       if (shaderStage === 'fragment') {
@@ -343,7 +345,7 @@ g.test('basic')
       usage: GPUTextureUsage.COPY_SRC | GPUTextureUsage.COPY_DST | GPUTextureUsage.STORAGE_BINDING,
     });
 
-    const bytesPerBlock = kTextureFormatInfo[format].bytesPerBlock;
+    const { bytesPerBlock } = getBlockInfoForColorTextureFormat(format);
     const initialData = t.getInitialData(storageTexture);
     t.queue.writeTexture(
       { texture: storageTexture },

src/webgpu/format_info.ts

@@ -2065,10 +2065,10 @@ export function isTextureFormatPossiblyStorageReadable(format: GPUTextureFormat)
 }
 
 /**
- * Returns true if a texture can possibly be used as a writable storage texture.
+ * Returns true if a texture can possibly be used as a read-write storage texture.
  * The texture may require certain features to be enabled.
  */
-export function isTextureFormatPossiblyStorageWritable(format: GPUTextureFormat) {
+export function isTextureFormatPossiblyStorageReadWritable(format: GPUTextureFormat) {
   return !!kTextureFormatInfo[format].color?.readWriteStorage;
 }
 
@@ -2129,6 +2129,16 @@ export function isTextureFormatUsableAsStorageFormat(
   return !!(info.color?.storage || info.depth?.storage || info.stencil?.storage);
 }
 
+export function isTextureFormatUsableAsReadWriteStorageTexture(
+  device: GPUDevice,
+  format: GPUTextureFormat
+): boolean {
+  return (
+    isTextureFormatUsableAsStorageFormat(device, format) &&
+    !!kTextureFormatInfo[format].color?.readWriteStorage
+  );
+}
+
 export function isRegularTextureFormat(format: GPUTextureFormat) {
   return format in kRegularTextureFormatInfo;
 }

src/webgpu/gpu_test.ts

@@ -40,6 +40,7 @@ import {
   is32Float,
   isSintOrUintFormat,
   isTextureFormatResolvable,
+  isTextureFormatUsableAsReadWriteStorageTexture,
 } from './format_info.js';
 import { checkElementsEqual, checkElementsBetween } from './util/check_contents.js';
 import { CommandBufferMaker, EncoderType } from './util/command_buffer_maker.js';
@@ -655,6 +656,18 @@ export class GPUTestBase extends Fixture<GPUTestSubcaseBatchState> {
     }
   }
 
+  skipIfTextureFormatNotUsableAsReadWriteStorageTexture(
+    ...formats: (GPUTextureFormat | undefined)[]
+  ) {
+    for (const format of formats) {
+      if (!format) continue;
+
+      if (!isTextureFormatUsableAsReadWriteStorageTexture(this.device, format)) {
+        this.skip(`Texture with ${format} is not usable as a storage texture`);
+      }
+    }
+  }
+
   skipIfTextureFormatNotUsableAsRenderAttachment(...formats: (GPUTextureFormat | undefined)[]) {
     for (const format of formats) {
       if (format && !isTextureFormatUsableAsRenderAttachment(this.device, format)) {

src/webgpu/shader/execution/expression/call/builtin/textureDimensions.spec.ts

@@ -13,7 +13,7 @@ import {
   isDepthTextureFormat,
   isStencilTextureFormat,
   isTextureFormatPossiblyMultisampled,
-  isTextureFormatPossiblyStorageWritable,
+  isTextureFormatPossiblyStorageReadWritable,
   kAllTextureFormats,
   kDepthTextureFormats,
   kPossibleStorageTextureFormats,
@@ -463,8 +463,10 @@ Parameters:
       .combine('access', ['read', 'write', 'read_write'] as const)
       // vertex stage can not use writable storage.
       .unless(t => t.stage === 'vertex' && t.access !== 'read')
-      // Only some formats support write
-      .unless(t => !isTextureFormatPossiblyStorageWritable(t.format) && t.access === 'read_write')
+      // Only some formats support read_write
+      .unless(
+        t => !isTextureFormatPossiblyStorageReadWritable(t.format) && t.access === 'read_write'
+      )
       .expand('dimensions', u => viewDimensions(u).filter(dimensionsValidForStorage))
       .expand('textureMipCount', textureMipCount)
       .expand('baseMipLevel', baseMipLevel)