From e3e9c55eda4332b3a8cfe8db5de12016c0072d70 Mon Sep 17 00:00:00 2001 From: Kai Ninomiya Date: Tue, 30 Jan 2024 01:24:58 -0800 Subject: [PATCH] Remove unused .renderTarget{ComponentAlignment,PixelByteCost} .renderTargetComponentAlignment = .colorRender.alignment .renderTargetPixelByteCost = .colorRender.byteCost The one exception to this is rg11b10ufloat, which is not renderable in core, but has an extension for renderability. kTextureFormatInfo currently only expresses core capabilities. The alignment and byteCost for this format will need to be added back when the refactor is done to make a table for "static" properties of texture formats (which never vary based on capabilities) - shape of that refactor is TBD. --- src/webgpu/format_info.ts | 79 --------------------------------------- 1 file changed, 79 deletions(-) diff --git a/src/webgpu/format_info.ts b/src/webgpu/format_info.ts index 9bb2c369d586..1a2fec76a1d1 100644 --- a/src/webgpu/format_info.ts +++ b/src/webgpu/format_info.ts @@ -35,10 +35,6 @@ const kFormatUniversalDefaults = { /** @deprecated Use `.color.bytes`, `.depth.bytes`, or `.stencil.bytes`. */ bytesPerBlock: undefined, - /** @deprecated */ - renderTargetPixelByteCost: undefined, - /** @deprecated */ - renderTargetComponentAlignment: undefined, // IMPORTANT: // Add new top-level keys both here and in TextureFormatInfo_TypeCheck. @@ -88,8 +84,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 1, }, colorRender: { blend: true, resolve: true, byteCost: 1, alignment: 1 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -115,8 +109,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 1, }, colorRender: { blend: false, resolve: false, byteCost: 1, alignment: 1 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -130,8 +122,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 1, }, colorRender: { blend: false, resolve: false, byteCost: 1, alignment: 1 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -146,8 +136,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 2, }, colorRender: { blend: true, resolve: true, byteCost: 2, alignment: 1 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -173,8 +161,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 2, }, colorRender: { blend: false, resolve: false, byteCost: 2, alignment: 1 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -188,8 +174,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 2, }, colorRender: { blend: false, resolve: false, byteCost: 2, alignment: 1 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -204,8 +188,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 4, }, colorRender: { blend: true, resolve: true, byteCost: 8, alignment: 1 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, baseFormat: 'rgba8unorm', /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, @@ -220,8 +202,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 4, }, colorRender: { blend: true, resolve: true, byteCost: 8, alignment: 1 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, baseFormat: 'rgba8unorm', /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, @@ -248,8 +228,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 4, }, colorRender: { blend: false, resolve: false, byteCost: 4, alignment: 1 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -263,8 +241,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 4, }, colorRender: { blend: false, resolve: false, byteCost: 4, alignment: 1 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -278,8 +254,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 4, }, colorRender: { blend: true, resolve: true, byteCost: 8, alignment: 1 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, baseFormat: 'bgra8unorm', /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, @@ -294,8 +268,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 4, }, colorRender: { blend: true, resolve: true, byteCost: 8, alignment: 1 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, baseFormat: 'bgra8unorm', /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, @@ -313,8 +285,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 2, }, colorRender: { blend: false, resolve: false, byteCost: 2, alignment: 2 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -328,8 +298,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 2, }, colorRender: { blend: false, resolve: false, byteCost: 2, alignment: 2 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -343,8 +311,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 2, }, colorRender: { blend: true, resolve: true, byteCost: 2, alignment: 2 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -359,8 +325,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 4, }, colorRender: { blend: false, resolve: false, byteCost: 4, alignment: 2 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -374,8 +338,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 4, }, colorRender: { blend: false, resolve: false, byteCost: 4, alignment: 2 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -389,8 +351,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 4, }, colorRender: { blend: true, resolve: true, byteCost: 4, alignment: 2 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -405,8 +365,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 8, }, colorRender: { blend: false, resolve: false, byteCost: 8, alignment: 2 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -420,8 +378,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 8, }, colorRender: { blend: false, resolve: false, byteCost: 8, alignment: 2 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -435,8 +391,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 8, }, colorRender: { blend: true, resolve: true, byteCost: 8, alignment: 2 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -453,8 +407,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 4, }, colorRender: { blend: false, resolve: false, byteCost: 4, alignment: 4 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: false, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -468,8 +420,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 4, }, colorRender: { blend: false, resolve: false, byteCost: 4, alignment: 4 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: false, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -483,8 +433,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 4, }, colorRender: { blend: false, resolve: false, byteCost: 4, alignment: 4 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -499,8 +447,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 8, }, colorRender: { blend: false, resolve: false, byteCost: 8, alignment: 4 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: false, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -514,8 +460,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 8, }, colorRender: { blend: false, resolve: false, byteCost: 8, alignment: 4 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: false, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -529,8 +473,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 8, }, colorRender: { blend: false, resolve: false, byteCost: 8, alignment: 4 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: false, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -545,8 +487,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 16, }, colorRender: { blend: false, resolve: false, byteCost: 16, alignment: 4 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: false, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -560,8 +500,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 16, }, colorRender: { blend: false, resolve: false, byteCost: 16, alignment: 4 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: false, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -575,8 +513,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 16, }, colorRender: { blend: false, resolve: false, byteCost: 16, alignment: 4 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: false, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -593,8 +529,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 4, }, colorRender: { blend: false, resolve: false, byteCost: 8, alignment: 4 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -608,8 +542,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ bytes: 4, }, colorRender: { blend: true, resolve: true, byteCost: 8, alignment: 4 }, - /*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; }, - /*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; }, multisample: true, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, }, @@ -624,8 +556,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({ }, multisample: false, /*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; }, - renderTargetPixelByteCost: 8, - renderTargetComponentAlignment: 4, }, // packed @@ -1520,13 +1450,6 @@ const kASTCTextureFormatInfo = formatTableWithDefaults({ export const kRenderableColorTextureFormats = kRegularTextureFormats.filter( v => kColorTextureFormatInfo[v].colorRender ); -assert( - kRenderableColorTextureFormats.every( - f => - kAllTextureFormatInfo[f].renderTargetComponentAlignment !== undefined && - kAllTextureFormatInfo[f].renderTargetPixelByteCost !== undefined - ) -); /** Per-GPUTextureFormat-per-aspect info. */ interface TextureFormatAspectInfo { @@ -1573,8 +1496,6 @@ type TextureFormatInfo_TypeCheck = { allAspectsCopyDst: boolean; bytesPerBlock: number | undefined; - renderTargetPixelByteCost: number | undefined; - renderTargetComponentAlignment: number | undefined; // IMPORTANT: // Add new top-level keys both here and in kUniversalDefaults.