Rename copy types following the deprecation in webgpu/types

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

@@ -126,7 +126,7 @@ const altDataGenerator = new DataArrayGenerator();
 
 class ImageCopyTest extends TextureTestMixin(GPUTest) {
   /**
-   * This is used for testing passing undefined members of `GPUImageDataLayout` instead of actual
+   * This is used for testing passing undefined members of `GPUTexelCopyBufferLayout` instead of actual
    * values where possible. Passing arguments as values and not as objects so that they are passed
    * by copy and not by reference.
    */
@@ -135,7 +135,7 @@ class ImageCopyTest extends TextureTestMixin(GPUTest) {
     rowsPerImage: number | undefined,
     bytesPerRow: number | undefined,
     changeBeforePass: ChangeBeforePass
-  ): GPUImageDataLayout {
+  ): GPUTexelCopyBufferLayout {
     if (changeBeforePass === 'undefined') {
       if (offset === 0) {
         offset = undefined;
@@ -151,7 +151,7 @@ class ImageCopyTest extends TextureTestMixin(GPUTest) {
   }
 
   /**
-   * This is used for testing passing undefined members of `GPUImageCopyTexture` instead of actual
+   * This is used for testing passing undefined members of `GPUTexelCopyTextureInfo` instead of actual
    * values where possible and also for testing passing the origin as `[number, number, number]`.
    * Passing arguments as values and not as objects so that they are passed by copy and not by
    * reference.
@@ -163,7 +163,7 @@ class ImageCopyTest extends TextureTestMixin(GPUTest) {
     origin_z: number | undefined,
     mipLevel: number | undefined,
     changeBeforePass: ChangeBeforePass
-  ): GPUImageCopyTexture {
+  ): GPUTexelCopyTextureInfo {
     let origin: GPUOrigin3D | undefined = { x: origin_x, y: origin_y, z: origin_z };
 
     if (changeBeforePass === 'undefined') {
@@ -225,7 +225,7 @@ class ImageCopyTest extends TextureTestMixin(GPUTest) {
     buffer: GPUBuffer,
     format: ColorTextureFormat,
     size: Required<GPUExtent3DDict>,
-    dataLayout: Required<GPUImageDataLayout>
+    dataLayout: Required<GPUTexelCopyBufferLayout>
   ) {
     if (isCompressedTextureFormat(format)) {
       this.expectGPUBufferValuesEqual(buffer, expected);
@@ -323,7 +323,7 @@ class ImageCopyTest extends TextureTestMixin(GPUTest) {
   /** Run a CopyT2B command with appropriate arguments corresponding to `ChangeBeforePass` */
   copyTextureToBufferWithAppliedArguments(
     buffer: GPUBuffer,
-    { offset, rowsPerImage, bytesPerRow }: Required<GPUImageDataLayout>,
+    { offset, rowsPerImage, bytesPerRow }: Required<GPUTexelCopyBufferLayout>,
     { width, height, depthOrArrayLayers }: Required<GPUExtent3DDict>,
     { texture, mipLevel, origin }: TextureCopyViewWithRequiredOrigin,
     changeBeforePass: ChangeBeforePass
@@ -363,7 +363,7 @@ class ImageCopyTest extends TextureTestMixin(GPUTest) {
   /** Put data into a part of the texture with an appropriate method. */
   uploadLinearTextureDataToTextureSubBox(
     textureCopyView: TextureCopyViewWithRequiredOrigin,
-    textureDataLayout: GPUImageDataLayout & { bytesPerRow: number },
+    textureDataLayout: GPUTexelCopyBufferLayout & { bytesPerRow: number },
     copySize: Required<GPUExtent3DDict>,
     partialData: Uint8Array,
     method: InitMethod,
@@ -432,7 +432,7 @@ class ImageCopyTest extends TextureTestMixin(GPUTest) {
     copySize: Required<GPUExtent3DDict>,
     format: ColorTextureFormat,
     expected: Uint8Array,
-    expectedDataLayout: Required<GPUImageDataLayout>
+    expectedDataLayout: Required<GPUTexelCopyBufferLayout>
   ): void {
     const size = [
       actualTexture.width,
@@ -507,7 +507,7 @@ class ImageCopyTest extends TextureTestMixin(GPUTest) {
     checkSize: Required<GPUExtent3DDict>,
     format: ColorTextureFormat,
     expected: Uint8Array,
-    expectedDataLayout: Required<GPUImageDataLayout>,
+    expectedDataLayout: Required<GPUTexelCopyBufferLayout>,
     changeBeforePass: ChangeBeforePass = 'none'
   ): void {
     // The alignment is necessary because we need to copy and map data from this buffer.
@@ -573,7 +573,7 @@ class ImageCopyTest extends TextureTestMixin(GPUTest) {
   copyWholeTextureToBufferAndCheckContentsWithUpdatedData(
     { texture, mipLevel, origin }: TextureCopyViewWithRequiredOrigin,
     fullTextureCopyLayout: TextureCopyLayout,
-    texturePartialDataLayout: Required<GPUImageDataLayout>,
+    texturePartialDataLayout: Required<GPUTexelCopyBufferLayout>,
     copySize: Required<GPUExtent3DDict>,
     format: ColorTextureFormat,
     fullData: GPUBuffer,
@@ -632,7 +632,7 @@ class ImageCopyTest extends TextureTestMixin(GPUTest) {
     checkMethod,
     changeBeforePass = 'none',
   }: {
-    textureDataLayout: Required<GPUImageDataLayout>;
+    textureDataLayout: Required<GPUTexelCopyBufferLayout>;
     copySize: Required<GPUExtent3DDict>;
     dataSize: number;
     mipLevel?: number;

src/webgpu/api/validation/encoding/cmds/copyTextureToTexture.spec.ts

@@ -19,8 +19,8 @@ import { ValidationTest } from '../../validation_test.js';
 
 class F extends ValidationTest {
   TestCopyTextureToTexture(
-    source: GPUImageCopyTexture,
-    destination: GPUImageCopyTexture,
+    source: GPUTexelCopyTextureInfo,
+    destination: GPUTexelCopyTextureInfo,
     copySize: GPUExtent3D,
     expectation: 'Success' | 'FinishError' | 'SubmitError'
   ): void {
@@ -691,7 +691,7 @@ TODO: Extend to 1D and 3D textures.`
 g.test('copy_aspects')
   .desc(
     `
-Test the validations on the member 'aspect' of GPUImageCopyTexture in CopyTextureToTexture().
+Test the validations on the member 'aspect' of GPUTexelCopyTextureInfo in CopyTextureToTexture().
 - for all the color and depth-stencil formats: the texture copy aspects must be both 'all'.
 - for all the depth-only formats: the texture copy aspects must be either 'all' or 'depth-only'.
 - for all the stencil-only formats: the texture copy aspects must be either 'all' or 'stencil-only'.

src/webgpu/api/validation/image_copy/buffer_texture_copies.spec.ts

@@ -18,8 +18,8 @@ import { ValidationTest } from '../validation_test.js';
 
 class ImageCopyTest extends ValidationTest {
   testCopyBufferToTexture(
-    source: GPUImageCopyBuffer,
-    destination: GPUImageCopyTexture,
+    source: GPUTexelCopyBufferInfo,
+    destination: GPUTexelCopyTextureInfo,
     copySize: GPUExtent3DStrict,
     isSuccess: boolean
   ): void {
@@ -29,8 +29,8 @@ class ImageCopyTest extends ValidationTest {
   }
 
   testCopyTextureToBuffer(
-    source: GPUImageCopyTexture,
-    destination: GPUImageCopyBuffer,
+    source: GPUTexelCopyTextureInfo,
+    destination: GPUTexelCopyBufferInfo,
     copySize: GPUExtent3DStrict,
     isSuccess: boolean
   ): void {
@@ -40,9 +40,9 @@ class ImageCopyTest extends ValidationTest {
   }
 
   testWriteTexture(
-    destination: GPUImageCopyTexture,
+    destination: GPUTexelCopyTextureInfo,
     uploadData: Uint8Array,
-    dataLayout: GPUImageDataLayout,
+    dataLayout: GPUTexelCopyBufferLayout,
     copySize: GPUExtent3DStrict,
     isSuccess: boolean
   ): void {

src/webgpu/api/validation/image_copy/image_copy.ts

@@ -11,8 +11,8 @@ import { ValidationTest } from '../validation_test.js';
 
 export class ImageCopyTest extends ValidationTest {
   testRun(
-    textureCopyView: GPUImageCopyTexture,
-    textureDataLayout: GPUImageDataLayout,
+    textureCopyView: GPUTexelCopyTextureInfo,
+    textureDataLayout: GPUTexelCopyBufferLayout,
     size: GPUExtent3D,
     {
       method,
@@ -122,7 +122,7 @@ export class ImageCopyTest extends ValidationTest {
   testBuffer(
     buffer: GPUBuffer,
     texture: GPUTexture,
-    textureDataLayout: GPUImageDataLayout,
+    textureDataLayout: GPUTexelCopyBufferLayout,
     size: GPUExtent3D,
     {
       method,

src/webgpu/api/validation/queue/copyToTexture/CopyExternalImageToTexture.spec.ts

@@ -178,8 +178,8 @@ class CopyExternalImageToTextureTest extends ValidationTest {
   }
 
   runTest(
-    imageBitmapCopyView: GPUImageCopyExternalImage,
-    textureCopyView: GPUImageCopyTextureTagged,
+    imageBitmapCopyView: GPUCopyExternalImageSourceInfo,
+    textureCopyView: GPUCopyExternalImageDestInfo,
     copySize: GPUExtent3D,
     validationScopeSuccess: boolean,
     exceptionName?: string

src/webgpu/gpu_test.ts

@@ -1296,7 +1296,7 @@ export interface TextureTestMixinType {
    * to the expected TexelView passes without error.
    */
   expectTexelViewComparisonIsOkInTexture(
-    src: GPUImageCopyTexture,
+    src: GPUTexelCopyTextureInfo,
     exp: TexelView,
     size: GPUExtent3D,
     comparisonOptions?: TexelCompareOptions
@@ -1307,7 +1307,7 @@ export interface TextureTestMixinType {
    * their expected colors without error.
    */
   expectSinglePixelComparisonsAreOkInTexture<E extends PixelExpectation>(
-    src: GPUImageCopyTexture,
+    src: GPUTexelCopyTextureInfo,
     exp: PerPixelComparison<E>[],
     comparisonOptions?: TexelCompareOptions
   ): void;
@@ -1383,7 +1383,7 @@ export interface TextureTestMixinType {
    * Gets a byte offset to a texel
    */
   getTexelOffsetInBytes(
-    textureDataLayout: Required<GPUImageDataLayout>,
+    textureDataLayout: Required<GPUTexelCopyBufferLayout>,
     format: ColorTextureFormat,
     texel: Required<GPUOrigin3DDict>,
     origin?: Required<GPUOrigin3DDict>
@@ -1481,7 +1481,7 @@ function getPipelineToRenderTextureToRGB8UnormTexture(
 }
 
 type LinearCopyParameters = {
-  dataLayout: Required<GPUImageDataLayout>;
+  dataLayout: Required<GPUTexelCopyBufferLayout>;
   origin: Required<GPUOrigin3DDict>;
   data: Uint8Array;
 };
@@ -1511,7 +1511,7 @@ export function TextureTestMixin<F extends FixtureClass<GPUTest>>(
     }
 
     expectTexelViewComparisonIsOkInTexture(
-      src: GPUImageCopyTexture,
+      src: GPUTexelCopyTextureInfo,
       exp: TexelView,
       size: GPUExtent3D,
       comparisonOptions = {
@@ -1526,7 +1526,7 @@ export function TextureTestMixin<F extends FixtureClass<GPUTest>>(
     }
 
     expectSinglePixelComparisonsAreOkInTexture<E extends PixelExpectation>(
-      src: GPUImageCopyTexture,
+      src: GPUTexelCopyTextureInfo,
       exp: PerPixelComparison<E>[],
       comparisonOptions = {
         maxIntDiff: 0,
@@ -1836,7 +1836,7 @@ export function TextureTestMixin<F extends FixtureClass<GPUTest>>(
 
     /** Offset for a particular texel in the linear texture data */
     getTexelOffsetInBytes(
-      textureDataLayout: Required<GPUImageDataLayout>,
+      textureDataLayout: Required<GPUTexelCopyBufferLayout>,
       format: ColorTextureFormat,
       texel: Required<GPUOrigin3DDict>,
       origin: Required<GPUOrigin3DDict> = { x: 0, y: 0, z: 0 }

src/webgpu/util/copy_to_texture.ts

@@ -169,8 +169,8 @@ export class TextureUploadingUtils extends TextureTestMixin(GPUTest) {
   }
 
   doTestAndCheckResult(
-    imageCopyExternalImage: GPUImageCopyExternalImage,
-    dstTextureCopyView: GPUImageCopyTextureTagged,
+    imageCopyExternalImage: GPUCopyExternalImageSourceInfo,
+    dstTextureCopyView: GPUCopyExternalImageDestInfo,
     expTexelView: TexelView,
     copySize: Required<GPUExtent3DDict>,
     texelCompareOptions: TexelCompareOptions

src/webgpu/util/texture.ts

@@ -318,9 +318,9 @@ const s_copyBufferToTextureViaRenderPipelines = new WeakMap<
 function copyBufferToTextureViaRender(
   t: GPUTest,
   encoder: GPUCommandEncoder,
-  source: GPUImageCopyBuffer,
+  source: GPUTexelCopyBufferInfo,
   sourceFormat: GPUTextureFormat,
-  dest: GPUImageCopyTexture,
+  dest: GPUTexelCopyTextureInfo,
   size: GPUExtent3D
 ) {
   const { format: textureFormat, sampleCount } = dest.texture;

src/webgpu/util/texture/layout.ts

@@ -291,7 +291,7 @@ function validateRowsPerImage({
 }
 
 interface DataBytesForCopyArgs {
-  layout: GPUImageDataLayout;
+  layout: GPUTexelCopyBufferLayout;
   format: SizedTextureFormat;
   copySize: Readonly<GPUExtent3DDict> | readonly number[];
   method: ImageCopyType;

src/webgpu/util/texture/texture_ok.ts

@@ -167,7 +167,7 @@ function comparePerComponent(
 /** Create a new mappable GPUBuffer, and copy a subrectangle of GPUTexture data into it. */
 function createTextureCopyForMapRead(
   t: GPUTest,
-  source: GPUImageCopyTexture,
+  source: GPUTexelCopyTextureInfo,
   copySize: GPUExtent3D,
   { format }: { format: EncodableTextureFormat }
 ): { buffer: GPUBuffer; bytesPerRow: number; rowsPerImage: number } {
@@ -298,7 +298,7 @@ ${generatePrettyTable(opts, [
  */
 export async function textureContentIsOKByT2B(
   t: GPUTest,
-  source: GPUImageCopyTexture,
+  source: GPUTexelCopyTextureInfo,
   copySize_: GPUExtent3D,
   { expTexelView }: { expTexelView: TexelView },
   texelCompareOptions: TexelCompareOptions,

src/webgpu/web_platform/copyToTexture/ImageBitmap.spec.ts

@@ -31,17 +31,17 @@ g.test('from_ImageData')
   Then call copyExternalImageToTexture() to do a full copy to the 0 mipLevel
   of dst texture, and read the contents out to compare with the ImageBitmap contents.
 
-  Do premultiply alpha during copy if 'premultipliedAlpha' in 'GPUImageCopyTextureTagged'
+  Do premultiply alpha during copy if 'premultipliedAlpha' in 'GPUCopyExternalImageDestInfo'
   is set to 'true' and do unpremultiply alpha if it is set to 'false'.
 
-  If 'flipY' in 'GPUImageCopyExternalImage' is set to 'true', copy will ensure the result
+  If 'flipY' in 'GPUCopyExternalImageSourceInfo' is set to 'true', copy will ensure the result
   is flipped.
 
   The tests covers:
   - Valid dstFormat of copyExternalImageToTexture()
   - Valid source image alphaMode
   - Valid dest alphaMode
-  - Valid 'flipY' config in 'GPUImageCopyExternalImage' (named 'srcFlipYInCopy' in cases)
+  - Valid 'flipY' config in 'GPUCopyExternalImageSourceInfo' (named 'srcFlipYInCopy' in cases)
 
   And the expected results are all passed.
   `
@@ -151,18 +151,18 @@ g.test('from_canvas')
   Then call copyExternalImageToTexture() to do a full copy to the 0 mipLevel
   of dst texture, and read the contents out to compare with the ImageBitmap contents.
 
-  Do premultiply alpha during copy if 'premultipliedAlpha' in 'GPUImageCopyTextureTagged'
+  Do premultiply alpha during copy if 'premultipliedAlpha' in 'GPUCopyExternalImageDestInfo'
   is set to 'true' and do unpremultiply alpha if it is set to 'false'.
 
-  If 'flipY' in 'GPUImageCopyExternalImage' is set to 'true', copy will ensure the result
+  If 'flipY' in 'GPUCopyExternalImageSourceInfo' is set to 'true', copy will ensure the result
   is flipped.
 
   The tests covers:
   - Valid 2D canvas
   - Valid dstFormat of copyExternalImageToTexture()
   - Valid source image alphaMode
   - Valid dest alphaMode
-  - Valid 'flipY' config in 'GPUImageCopyExternalImage' (named 'srcFlipYInCopy' in cases)
+  - Valid 'flipY' config in 'GPUCopyExternalImageSourceInfo' (named 'srcFlipYInCopy' in cases)
 
   And the expected results are all passed.
   `
@@ -299,18 +299,18 @@ g.test('copy_subrect_from_ImageData')
   rect info list, to the 0 mipLevel of dst texture, and read the contents out to compare
   with the ImageBitmap contents.
 
-  Do premultiply alpha during copy if 'premultipliedAlpha' in 'GPUImageCopyTextureTagged'
+  Do premultiply alpha during copy if 'premultipliedAlpha' in 'GPUCopyExternalImageDestInfo'
   is set to 'true' and do unpremultiply alpha if it is set to 'false'.
 
-  If 'flipY' in 'GPUImageCopyExternalImage' is set to 'true', copy will ensure the result
+  If 'flipY' in 'GPUCopyExternalImageSourceInfo' is set to 'true', copy will ensure the result
   is flipped, and origin is top-left consistantly.
 
   The tests covers:
   - Source WebGPU Canvas lives in the same GPUDevice or different GPUDevice as test
   - Valid dstFormat of copyExternalImageToTexture()
   - Valid source image alphaMode
   - Valid dest alphaMode
-  - Valid 'flipY' config in 'GPUImageCopyExternalImage' (named 'srcFlipYInCopy' in cases)
+  - Valid 'flipY' config in 'GPUCopyExternalImageSourceInfo' (named 'srcFlipYInCopy' in cases)
   - Valid subrect copies.
 
   And the expected results are all passed.
@@ -416,18 +416,18 @@ g.test('copy_subrect_from_2D_Canvas')
   rect info list, to the 0 mipLevel of dst texture, and read the contents out to compare
   with the ImageBitmap contents.
 
-  Do premultiply alpha during copy if 'premultipliedAlpha' in 'GPUImageCopyTextureTagged'
+  Do premultiply alpha during copy if 'premultipliedAlpha' in 'GPUCopyExternalImageDestInfo'
   is set to 'true' and do unpremultiply alpha if it is set to 'false'.
 
-  If 'flipY' in 'GPUImageCopyExternalImage' is set to 'true', copy will ensure the result
+  If 'flipY' in 'GPUCopyExternalImageSourceInfo' is set to 'true', copy will ensure the result
   is flipped, and origin is top-left consistantly.
 
   The tests covers:
   - Source WebGPU Canvas lives in the same GPUDevice or different GPUDevice as test
   - Valid dstFormat of copyExternalImageToTexture()
   - Valid source image alphaMode
   - Valid dest alphaMode
-  - Valid 'flipY' config in 'GPUImageCopyExternalImage' (named 'srcFlipYInCopy' in cases)
+  - Valid 'flipY' config in 'GPUCopyExternalImageSourceInfo' (named 'srcFlipYInCopy' in cases)
   - Valid subrect copies.
 
   And the expected results are all passed.