Move skipIfTextureFormatAndViewDimensionNotCompatible and

skipIfTextureFormatAndDimensionNotCompatible to GPUTestBase

This is clean up for fixing copy tests to handle compressed 3d textures

Author: greggman

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

@@ -25,7 +25,6 @@ import {
   textureFormatsAreViewCompatible,
 } from '../../../format_info.js';
 import { AllFeaturesMaxLimitsGPUTest } from '../../../gpu_test.js';
-import { skipIfTextureAndFormatNotCompatibleForDevice } from '../../../shader/execution/expression/call/builtin/texture_utils.js';
 import * as ttu from '../../../texture_test_utils.js';
 import { checkElementsEqual } from '../../../util/check_contents.js';
 import { align } from '../../../util/math.js';
@@ -927,8 +926,8 @@ g.test('color_textures,compressed,non_array')
       srcCopyLevel,
       dstCopyLevel,
     } = t.params;
-    skipIfTextureAndFormatNotCompatibleForDevice(t, dimension, srcFormat);
-    skipIfTextureAndFormatNotCompatibleForDevice(t, dimension, dstFormat);
+    t.skipIfTextureFormatAndDimensionNotCompatible(srcFormat, dimension);
+    t.skipIfTextureFormatAndDimensionNotCompatible(dstFormat, dimension);
     t.skipIfCopyTextureToTextureNotSupportedForFormat(srcFormat, dstFormat);
     const { blockWidth: srcBlockWidth, blockHeight: srcBlockHeight } =
       getBlockInfoForColorTextureFormat(srcFormat);
@@ -1074,8 +1073,8 @@ g.test('color_textures,compressed,array')
     } = t.params;
     t.skipIfTextureFormatNotSupported(srcFormat, dstFormat);
     t.skipIfCopyTextureToTextureNotSupportedForFormat(srcFormat, dstFormat);
-    skipIfTextureAndFormatNotCompatibleForDevice(t, dimension, srcFormat);
-    skipIfTextureAndFormatNotCompatibleForDevice(t, dimension, dstFormat);
+    t.skipIfTextureFormatAndDimensionNotCompatible(srcFormat, dimension);
+    t.skipIfTextureFormatAndDimensionNotCompatible(dstFormat, dimension);
 
     const { blockWidth: srcBlockWidth, blockHeight: srcBlockHeight } =
       getBlockInfoForColorTextureFormat(srcFormat);

src/webgpu/gpu_test.ts

@@ -38,6 +38,8 @@ import {
   isTextureFormatUsableAsReadWriteStorageTexture,
   isDepthTextureFormat,
   isStencilTextureFormat,
+  textureViewDimensionAndFormatCompatibleForDevice,
+  textureDimensionAndFormatCompatibleForDevice,
 } from './format_info.js';
 import { checkElementsEqual, checkElementsBetween } from './util/check_contents.js';
 import { CommandBufferMaker, EncoderType } from './util/command_buffer_maker.js';
@@ -501,6 +503,26 @@ export class GPUTestBase extends Fixture<GPUTestSubcaseBatchState> {
     }
   }
 
+  skipIfTextureFormatAndViewDimensionNotCompatible(
+    format: GPUTextureFormat,
+    viewDimension: GPUTextureViewDimension
+  ) {
+    this.skipIf(
+      !textureViewDimensionAndFormatCompatibleForDevice(this.device, viewDimension, format),
+      `format: ${format} does not support viewDimension: ${viewDimension}`
+    );
+  }
+
+  skipIfTextureFormatAndDimensionNotCompatible(
+    format: GPUTextureFormat,
+    dimension: GPUTextureDimension
+  ) {
+    this.skipIf(
+      !textureDimensionAndFormatCompatibleForDevice(this.device, dimension, format),
+      `format: ${format} does not support dimension: ${dimension}`
+    );
+  }
+
   skipIfTextureFormatNotResolvable(...formats: (GPUTextureFormat | undefined)[]) {
     for (const format of formats) {
       if (format === undefined) continue;

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

@@ -38,7 +38,7 @@ import {
   getTextureTypeForTextureViewDimension,
   vec1,
   generateTextureBuiltinInputs1D,
-  skipIfTextureViewAndFormatNotCompatibleForDevice,
+  skipIfTextureViewAndFormatNotCompatibleForDeviceFoo,
 } from './texture_utils.js';
 
 export const g = makeTestGroup(AllFeaturesMaxLimitsGPUTest);
@@ -362,7 +362,7 @@ Parameters:
       offset,
     } = t.params;
     skipIfTextureFormatNotSupportedOrNeedsFilteringAndIsUnfilterable(t, minFilter, format);
-    skipIfTextureViewAndFormatNotCompatibleForDevice(t, format, viewDimension);
+    t.skipIfTextureFormatAndViewDimensionNotCompatible(format, viewDimension);
 
     const size = chooseTextureSize({ minSize: 8, minBlocks: 2, format, viewDimension });
     const descriptor: GPUTextureDescriptor = {

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

@@ -33,7 +33,7 @@ import {
   isPotentiallyFilterableAndFillable,
   getTextureTypeForTextureViewDimension,
   skipIfTextureFormatNotSupportedOrNeedsFilteringAndIsUnfilterable,
-  skipIfTextureViewAndFormatNotCompatibleForDevice,
+  skipIfTextureViewAndFormatNotCompatibleForDeviceFoo,
 } from './texture_utils.js';
 
 export const g = makeTestGroup(AllFeaturesMaxLimitsGPUTest);
@@ -190,7 +190,7 @@ Parameters:
       offset,
     } = t.params;
     skipIfTextureFormatNotSupportedOrNeedsFilteringAndIsUnfilterable(t, minFilter, format);
-    skipIfTextureViewAndFormatNotCompatibleForDevice(t, format, viewDimension);
+    t.skipIfTextureFormatAndViewDimensionNotCompatible(format, viewDimension);
 
     const size = chooseTextureSize({ minSize: 8, minBlocks: 2, format, viewDimension });
     const descriptor: GPUTextureDescriptor = {

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

@@ -30,7 +30,7 @@ import {
   kShortShaderStages,
   SamplePointMethods,
   skipIfTextureFormatNotSupportedOrNeedsFilteringAndIsUnfilterable,
-  skipIfTextureViewAndFormatNotCompatibleForDevice,
+  skipIfTextureViewAndFormatNotCompatibleForDeviceFoo,
   TextureCall,
   vec2,
   vec3,
@@ -186,7 +186,7 @@ Parameters:
       offset,
     } = t.params;
     skipIfTextureFormatNotSupportedOrNeedsFilteringAndIsUnfilterable(t, minFilter, format);
-    skipIfTextureViewAndFormatNotCompatibleForDevice(t, format, viewDimension);
+    t.skipIfTextureFormatAndViewDimensionNotCompatible(format, viewDimension);
 
     const size = chooseTextureSize({ minSize: 8, minBlocks: 2, format, viewDimension });
     const descriptor: GPUTextureDescriptor = {

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

@@ -32,7 +32,7 @@ import {
   kShortShaderStages,
   SamplePointMethods,
   skipIfTextureFormatNotSupportedOrNeedsFilteringAndIsUnfilterable,
-  skipIfTextureViewAndFormatNotCompatibleForDevice,
+  skipIfTextureViewAndFormatNotCompatibleForDeviceFoo,
   TextureCall,
   vec2,
   vec3,
@@ -405,7 +405,7 @@ Parameters:
       offset,
     } = t.params;
     skipIfTextureFormatNotSupportedOrNeedsFilteringAndIsUnfilterable(t, minFilter, format);
-    skipIfTextureViewAndFormatNotCompatibleForDevice(t, format, viewDimension);
+    t.skipIfTextureFormatAndViewDimensionNotCompatible(format, viewDimension);
 
     const [width, height] = chooseTextureSize({ minSize: 32, minBlocks: 2, format, viewDimension });
     const depthOrArrayLayers = getDepthOrArrayLayersForViewDimension(viewDimension);
@@ -521,7 +521,7 @@ baseMipLevel, lodMinClamp, and lodMaxClamp, with an dwithout filtering.
       lodMinClamp,
     } = t.params;
     skipIfTextureFormatNotSupportedOrNeedsFilteringAndIsUnfilterable(t, minFilter, format);
-    skipIfTextureViewAndFormatNotCompatibleForDevice(t, format, viewDimension);
+    t.skipIfTextureFormatAndViewDimensionNotCompatible(format, viewDimension);
 
     const [width, height] = chooseTextureSize({ minSize: 32, minBlocks: 2, format, viewDimension });
     const depthOrArrayLayers = getDepthOrArrayLayersForViewDimension(viewDimension);

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

@@ -25,7 +25,6 @@ import {
   makeRandomDepthComparisonTexelGenerator,
   queryMipLevelMixWeightsForDevice,
   readTextureToTexelViews,
-  skipIfTextureViewAndFormatNotCompatibleForDevice,
   texelsApproximatelyEqual,
 } from './texture_utils.js';
 
@@ -52,7 +51,7 @@ g.test('createTextureWithRandomDataAndGetTexels_with_generator')
     const { format, viewDimension } = t.params;
     t.skipIfTextureFormatNotSupported(format);
     t.skipIfTextureViewDimensionNotSupported(viewDimension);
-    skipIfTextureViewAndFormatNotCompatibleForDevice(t, format, viewDimension);
+    t.skipIfTextureFormatAndViewDimensionNotCompatible(format, viewDimension);
     // choose an odd size (9) so we're more likely to test alignment issue.
     const size = chooseTextureSize({ minSize: 9, minBlocks: 4, format, viewDimension });
     t.debug(`size: ${size.map(v => v.toString()).join(', ')}`);
@@ -96,7 +95,7 @@ g.test('readTextureToTexelViews')
   .fn(async t => {
     const { srcFormat, texelViewFormat, viewDimension, sampleCount } = t.params;
     t.skipIfTextureViewDimensionNotSupported(viewDimension);
-    skipIfTextureViewAndFormatNotCompatibleForDevice(t, srcFormat, viewDimension);
+    t.skipIfTextureFormatAndViewDimensionNotCompatible(srcFormat, viewDimension);
     if (sampleCount > 1) {
       t.skipIfTextureFormatNotMultisampled(srcFormat);
     }

src/webgpu/shader/execution/expression/call/builtin/texture_utils.ts

@@ -17,8 +17,6 @@ import {
   isSintOrUintFormat,
   isStencilTextureFormat,
   kEncodableTextureFormats,
-  textureDimensionAndFormatCompatibleForDevice,
-  textureViewDimensionAndFormatCompatibleForDevice,
 } from '../../../../../format_info.js';
 import { GPUTest } from '../../../../../gpu_test.js';
 import {
@@ -81,28 +79,6 @@ export const kSampleTypeInfo = {
   },
 } as const;
 
-export function skipIfTextureViewAndFormatNotCompatibleForDevice(
-  t: GPUTest,
-  format: GPUTextureFormat,
-  viewDimension: GPUTextureViewDimension
-) {
-  t.skipIf(
-    !textureViewDimensionAndFormatCompatibleForDevice(t.device, viewDimension, format),
-    `format: ${format} does not support viewDimension: ${viewDimension}`
-  );
-}
-
-export function skipIfTextureAndFormatNotCompatibleForDevice(
-  t: GPUTest,
-  dimension: GPUTextureDimension,
-  format: GPUTextureFormat
-) {
-  t.skipIf(
-    !textureDimensionAndFormatCompatibleForDevice(t.device, dimension, format),
-    `format: ${format} does not support dimension: ${dimension}`
-  );
-}
-
 /**
  * Return the texture type for a given view dimension
  */