Skip to content

Commit

Permalink
Remove unused .renderTarget{ComponentAlignment,PixelByteCost}
Browse files Browse the repository at this point in the history
.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.
  • Loading branch information
kainino0x committed Mar 8, 2024
1 parent 90b8ecb commit 78ba7e9
Showing 1 changed file with 0 additions and 79 deletions.
79 changes: 0 additions & 79 deletions src/webgpu/format_info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,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.
Expand Down Expand Up @@ -86,8 +82,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; },
},
Expand All @@ -113,8 +107,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; },
},
Expand All @@ -128,8 +120,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; },
},
Expand All @@ -144,8 +134,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; },
},
Expand All @@ -171,8 +159,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; },
},
Expand All @@ -186,8 +172,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; },
},
Expand All @@ -202,8 +186,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; },
Expand All @@ -218,8 +200,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; },
Expand All @@ -246,8 +226,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; },
},
Expand All @@ -261,8 +239,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; },
},
Expand All @@ -276,8 +252,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; },
Expand All @@ -292,8 +266,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; },
Expand All @@ -311,8 +283,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; },
},
Expand All @@ -326,8 +296,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; },
},
Expand All @@ -341,8 +309,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; },
},
Expand All @@ -357,8 +323,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; },
},
Expand All @@ -372,8 +336,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; },
},
Expand All @@ -387,8 +349,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; },
},
Expand All @@ -403,8 +363,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; },
},
Expand All @@ -418,8 +376,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; },
},
Expand All @@ -433,8 +389,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; },
},
Expand All @@ -451,8 +405,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; },
},
Expand All @@ -466,8 +418,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; },
},
Expand All @@ -481,8 +431,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; },
},
Expand All @@ -497,8 +445,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; },
},
Expand All @@ -512,8 +458,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; },
},
Expand All @@ -527,8 +471,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; },
},
Expand All @@ -543,8 +485,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; },
},
Expand All @@ -558,8 +498,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; },
},
Expand All @@ -573,8 +511,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; },
},
Expand All @@ -591,8 +527,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; },
},
Expand All @@ -606,8 +540,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; },
},
Expand All @@ -622,8 +554,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
},
multisample: false,
/*prettier-ignore*/ get bytesPerBlock() { return this.color.bytes; },
renderTargetPixelByteCost: 8,
renderTargetComponentAlignment: 4,
},

// packed
Expand Down Expand Up @@ -1509,13 +1439,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 {
Expand Down Expand Up @@ -1561,8 +1484,6 @@ type TextureFormatInfo_TypeCheck = {
feature: GPUFeatureName | undefined;

bytesPerBlock: number | undefined;
renderTargetPixelByteCost: number | undefined;
renderTargetComponentAlignment: number | undefined;

// IMPORTANT:
// Add new top-level keys both here and in kUniversalDefaults.
Expand Down

0 comments on commit 78ba7e9

Please sign in to comment.