Skip to content

Commit

Permalink
Remove deprecated .renderable
Browse files Browse the repository at this point in the history
  • Loading branch information
kainino0x committed Mar 8, 2024
1 parent 41726f7 commit d2e0e6a
Showing 1 changed file with 1 addition and 39 deletions.
40 changes: 1 addition & 39 deletions src/webgpu/format_info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ const kFormatUniversalDefaults = {
/** @deprecated Use `.color.bytes`, `.depth.bytes`, or `.stencil.bytes`. */
bytesPerBlock: undefined,
/** @deprecated */
renderable: false,
/** @deprecated */
renderTargetPixelByteCost: undefined,
/** @deprecated */
renderTargetComponentAlignment: undefined,
Expand Down Expand Up @@ -88,7 +86,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 1,
},
colorRender: { blend: true, resolve: true, byteCost: 1, alignment: 1 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand Down Expand Up @@ -116,7 +113,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 1,
},
colorRender: { blend: false, resolve: false, byteCost: 1, alignment: 1 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand All @@ -132,7 +128,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 1,
},
colorRender: { blend: false, resolve: false, byteCost: 1, alignment: 1 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand All @@ -149,7 +144,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 2,
},
colorRender: { blend: true, resolve: true, byteCost: 2, alignment: 1 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand Down Expand Up @@ -177,7 +171,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 2,
},
colorRender: { blend: false, resolve: false, byteCost: 2, alignment: 1 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand All @@ -193,7 +186,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 2,
},
colorRender: { blend: false, resolve: false, byteCost: 2, alignment: 1 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand All @@ -210,7 +202,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 4,
},
colorRender: { blend: true, resolve: true, byteCost: 8, alignment: 1 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand All @@ -227,7 +218,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 4,
},
colorRender: { blend: true, resolve: true, byteCost: 8, alignment: 1 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand Down Expand Up @@ -256,7 +246,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 4,
},
colorRender: { blend: false, resolve: false, byteCost: 4, alignment: 1 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand All @@ -272,7 +261,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 4,
},
colorRender: { blend: false, resolve: false, byteCost: 4, alignment: 1 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand All @@ -288,7 +276,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 4,
},
colorRender: { blend: true, resolve: true, byteCost: 8, alignment: 1 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand All @@ -305,7 +292,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 4,
},
colorRender: { blend: true, resolve: true, byteCost: 8, alignment: 1 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand All @@ -325,7 +311,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 2,
},
colorRender: { blend: false, resolve: false, byteCost: 2, alignment: 2 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand All @@ -341,7 +326,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 2,
},
colorRender: { blend: false, resolve: false, byteCost: 2, alignment: 2 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand All @@ -357,7 +341,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 2,
},
colorRender: { blend: true, resolve: true, byteCost: 2, alignment: 2 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand All @@ -374,7 +357,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 4,
},
colorRender: { blend: false, resolve: false, byteCost: 4, alignment: 2 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand All @@ -390,7 +372,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 4,
},
colorRender: { blend: false, resolve: false, byteCost: 4, alignment: 2 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand All @@ -406,7 +387,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 4,
},
colorRender: { blend: true, resolve: true, byteCost: 4, alignment: 2 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand All @@ -423,7 +403,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 8,
},
colorRender: { blend: false, resolve: false, byteCost: 8, alignment: 2 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand All @@ -439,7 +418,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 8,
},
colorRender: { blend: false, resolve: false, byteCost: 8, alignment: 2 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand All @@ -455,7 +433,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 8,
},
colorRender: { blend: true, resolve: true, byteCost: 8, alignment: 2 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand All @@ -474,7 +451,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 4,
},
colorRender: { blend: false, resolve: false, byteCost: 4, alignment: 4 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: false,
Expand All @@ -490,7 +466,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 4,
},
colorRender: { blend: false, resolve: false, byteCost: 4, alignment: 4 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: false,
Expand All @@ -506,7 +481,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 4,
},
colorRender: { blend: false, resolve: false, byteCost: 4, alignment: 4 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand All @@ -523,7 +497,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 8,
},
colorRender: { blend: false, resolve: false, byteCost: 8, alignment: 4 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: false,
Expand All @@ -539,7 +512,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 8,
},
colorRender: { blend: false, resolve: false, byteCost: 8, alignment: 4 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: false,
Expand All @@ -555,7 +527,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 8,
},
colorRender: { blend: false, resolve: false, byteCost: 8, alignment: 4 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: false,
Expand All @@ -572,7 +543,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 16,
},
colorRender: { blend: false, resolve: false, byteCost: 16, alignment: 4 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: false,
Expand All @@ -588,7 +558,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 16,
},
colorRender: { blend: false, resolve: false, byteCost: 16, alignment: 4 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: false,
Expand All @@ -604,7 +573,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 16,
},
colorRender: { blend: false, resolve: false, byteCost: 16, alignment: 4 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: false,
Expand All @@ -623,7 +591,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 4,
},
colorRender: { blend: false, resolve: false, byteCost: 8, alignment: 4 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand All @@ -639,7 +606,6 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
bytes: 4,
},
colorRender: { blend: true, resolve: true, byteCost: 8, alignment: 4 },
renderable: true,
/*prettier-ignore*/ get renderTargetComponentAlignment() { return this.colorRender.alignment; },
/*prettier-ignore*/ get renderTargetPixelByteCost() { return this.colorRender.byteCost; },
multisample: true,
Expand Down Expand Up @@ -681,7 +647,7 @@ const kRegularTextureFormatInfo = formatTableWithDefaults({
// because one aspect can be sized and one can be unsized. This should be cleaned up, but is kept
// this way during a migration phase.
const kSizedDepthStencilFormatInfo = formatTableWithDefaults({
defaults: { blockWidth: 1, blockHeight: 1, multisample: true, renderable: true },
defaults: { blockWidth: 1, blockHeight: 1, multisample: true },
table: {
stencil8: {
stencil: {
Expand Down Expand Up @@ -730,7 +696,6 @@ const kUnsizedDepthStencilFormatInfo = formatTableWithDefaults({
readWriteStorage: false,
bytes: undefined,
},
renderable: true,
},
'depth24plus-stencil8': {
depth: {
Expand All @@ -749,7 +714,6 @@ const kUnsizedDepthStencilFormatInfo = formatTableWithDefaults({
readWriteStorage: false,
bytes: 1,
},
renderable: true,
},
'depth32float-stencil8': {
depth: {
Expand All @@ -769,7 +733,6 @@ const kUnsizedDepthStencilFormatInfo = formatTableWithDefaults({
bytes: 1,
},
feature: 'depth32float-stencil8',
renderable: true,
},
},
} as const);
Expand Down Expand Up @@ -1598,7 +1561,6 @@ type TextureFormatInfo_TypeCheck = {
feature: GPUFeatureName | undefined;

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

Expand Down

0 comments on commit d2e0e6a

Please sign in to comment.