Skip to content

Commit 336b847

Browse files
authored
Remove kPossiblyRenderableColorTextureFormats (#4285)
It's repeated as kPossibleColorRenderableTextureFormats
1 parent b6d5d59 commit 336b847

File tree

3 files changed

+5
-13
lines changed

3 files changed

+5
-13
lines changed

src/webgpu/api/operation/sampling/filter_mode.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { kAddressModes, kMipmapFilterModes } from '../../../capability_info.js';
1111
import {
1212
EncodableTextureFormat,
1313
getTextureFormatType,
14-
kPossiblyRenderableColorTextureFormats,
14+
kPossibleColorRenderableTextureFormats,
1515
} from '../../../format_info.js';
1616
import { AllFeaturesMaxLimitsGPUTest, TextureTestMixin } from '../../../gpu_test.js';
1717
import { getTextureCopyLayout } from '../../../util/texture/layout.js';
@@ -31,7 +31,7 @@ const kCheckerTextureData = [
3131
* One more both may required certain features to be enabled.
3232
*/
3333
const kPossiblyRenderablePossiblyFilterableColorTextureFormats =
34-
kPossiblyRenderableColorTextureFormats.filter(
34+
kPossibleColorRenderableTextureFormats.filter(
3535
format =>
3636
getTextureFormatType(format) === 'float' ||
3737
getTextureFormatType(format) === 'unfilterable-float'

src/webgpu/api/validation/render_pass/render_pass_descriptor.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { GPUConst } from '../../../constants.js';
1212
import {
1313
computeBytesPerSampleFromFormats,
1414
kDepthStencilFormats,
15-
kPossiblyRenderableColorTextureFormats,
15+
kPossibleColorRenderableTextureFormats,
1616
isTextureFormatColorRenderable,
1717
isDepthTextureFormat,
1818
isStencilTextureFormat,
@@ -205,7 +205,7 @@ g.test('color_attachments,limits,maxColorAttachmentBytesPerSample,aligned')
205205
)
206206
.params(u =>
207207
u
208-
.combine('format', kPossiblyRenderableColorTextureFormats)
208+
.combine('format', kPossibleColorRenderableTextureFormats)
209209
.beginSubcases()
210210
.combine(
211211
'attachmentCount',
@@ -1160,7 +1160,7 @@ g.test('resolveTarget,format_supports_resolve')
11601160
if and only if they support 'resolve'.
11611161
`
11621162
)
1163-
.params(u => u.combine('format', kPossiblyRenderableColorTextureFormats))
1163+
.params(u => u.combine('format', kPossibleColorRenderableTextureFormats))
11641164
.fn(t => {
11651165
const { format } = t.params;
11661166
t.skipIfTextureFormatNotSupported(format);

src/webgpu/format_info.ts

-8
Original file line numberDiff line numberDiff line change
@@ -1437,14 +1437,6 @@ const kASTCTextureFormatInfo = formatTableWithDefaults({
14371437
/* prettier-ignore */ export const kUncompressedTextureFormats: readonly UncompressedTextureFormat[] = keysOf(kUncompressedTextureFormatInfo);
14381438
/* prettier-ignore */ export const kAllTextureFormats: readonly GPUTextureFormat[] = keysOf( kAllTextureFormatInfo);
14391439

1440-
// Color formats that are possibly renderable. Some may require features to be enabled.
1441-
// MAINTENANCE_TODO: remove 'rg11b10ufloat` once colorRender is added to its info.
1442-
// See: computeBytesPerSampleFromFormats
1443-
export const kPossiblyRenderableColorTextureFormats = [
1444-
...kRegularTextureFormats.filter(v => kColorTextureFormatInfo[v].colorRender),
1445-
'rg11b10ufloat',
1446-
] as const;
1447-
14481440
/** Per-GPUTextureFormat-per-aspect info. */
14491441
interface TextureFormatAspectInfo {
14501442
/** Whether the aspect can be used as `COPY_SRC`. */

0 commit comments

Comments
 (0)