Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@types/w3c-image-capture": "^1.0.10",
"@typescript-eslint/eslint-plugin": "^6.9.1",
"@typescript-eslint/parser": "^6.9.1",
"@webgpu/types": "^0.1.72",
"@webgpu/types": "^0.1.74",
"ansi-colors": "4.1.3",
"babel-plugin-add-header-comment": "^1.0.3",
"babel-plugin-const-enum": "^1.2.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1009,7 +1009,7 @@ g.test('color_textures,compressed,unaligned,non_array')
)
.fn(t => {
const { partialEdge, srcFormat, dstFormat, copyBoxOffsets } = t.params;
t.skipIfDeviceDoesNotHaveFeature('texture-compression-unaligned' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('texture-compression-unaligned');
t.skipIfCopyTextureToTextureNotSupportedForFormat(srcFormat, dstFormat);

// The source and destination formats share the same base format, so they have the same texel
Expand Down
2 changes: 1 addition & 1 deletion src/webgpu/api/operation/command_buffer/image_copy.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1768,7 +1768,7 @@ g.test('compressed_textures,unaligned_mip_level_0')
.fn(t => {
const { format, initMethod, checkMethod, copyCase } = t.params;
t.skipIfTextureFormatNotSupported(format);
t.skipIfDeviceDoesNotHaveFeature('texture-compression-unaligned' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('texture-compression-unaligned');

const info = getBlockInfoForColorTextureFormat(format);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ import { UniqueFeaturesOrLimitsGPUTest } from '../../../../gpu_test.js';

export const g = makeTestGroup(UniqueFeaturesOrLimitsGPUTest);

const kTextureCompressionUnaligned = 'texture-compression-unaligned' as GPUFeatureName;

g.test('createTexture,unaligned_size')
.desc(
`Test that creating a compressed texture whose mip level 0 size is not a multiple of the texel
Expand All @@ -40,7 +38,7 @@ g.test('createTexture,unaligned_size')
requiredFeatures.push(formatFeature);
}
if (enable_feature) {
requiredFeatures.push(kTextureCompressionUnaligned);
requiredFeatures.push('texture-compression-unaligned');
}

t.selectDeviceOrSkipTestCase({ requiredFeatures });
Expand Down
15 changes: 3 additions & 12 deletions src/webgpu/api/validation/createTexture.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -496,10 +496,7 @@ g.test('texture_size,default_value_and_smallest_size,compressed_format')

// With 'texture-compression-unaligned', mip level 0 is no longer required to be a multiple of
// the texel block size, so every (small, in-range) size in this test becomes valid.
const supportsUnaligned = hasFeature(
t.device.features,
'texture-compression-unaligned' as GPUFeatureName
);
const supportsUnaligned = hasFeature(t.device.features, 'texture-compression-unaligned');
const success = supportsUnaligned || _success;

t.expectValidationError(() => {
Expand Down Expand Up @@ -765,10 +762,7 @@ g.test('texture_size,2d_texture,compressed_format')

// With 'texture-compression-unaligned', mip level 0 of a compressed texture is no longer
// required to be a multiple of the texel block size, so unaligned widths/heights are valid.
const supportsUnaligned = hasFeature(
t.device.features,
'texture-compression-unaligned' as GPUFeatureName
);
const supportsUnaligned = hasFeature(t.device.features, 'texture-compression-unaligned');
const success =
(supportsUnaligned ||
(size[0] % info.blockWidth === 0 && size[1] % info.blockHeight === 0)) &&
Expand Down Expand Up @@ -1005,10 +999,7 @@ g.test('texture_size,3d_texture,compressed_format')

// With 'texture-compression-unaligned', mip level 0 of a compressed texture is no longer
// required to be a multiple of the texel block size, so unaligned widths/heights are valid.
const supportsUnaligned = hasFeature(
t.device.features,
'texture-compression-unaligned' as GPUFeatureName
);
const supportsUnaligned = hasFeature(t.device.features, 'texture-compression-unaligned');
const success =
(supportsUnaligned ||
(size[0] % info.blockWidth === 0 && size[1] % info.blockHeight === 0)) &&
Expand Down
4 changes: 2 additions & 2 deletions src/webgpu/capability_info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -972,8 +972,8 @@ export const kFeatureNameInfo: {
'primitive-index': {},
'texture-component-swizzle': {},
'subgroup-size-control': {},
['atomic-vec2u-min-max' as GPUFeatureName]: {},
['texture-compression-unaligned' as GPUFeatureName]: {},
'atomic-vec2u-min-max': {},
'texture-compression-unaligned': {},
};
/** List of all GPUFeatureName values. */
export const kFeatureNames = keysOf(kFeatureNameInfo);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ the composite max of all values written.
.combine('rndMultiplyY', [0, 1, 41609, 138545483, 2 ** 28])
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('atomic-vec2u-min-max' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('atomic-vec2u-min-max');
const wgsl = `
enable atomic_vec2u_min_max;
@group(0) @binding(0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ the composite min of all values written.
.combine('rndMultiplyY', [0, 1, 41609, 138545483, 2 ** 28])
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('atomic-vec2u-min-max' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('atomic-vec2u-min-max');
const wgsl = `
enable atomic_vec2u_min_max;
@group(0) @binding(0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ g.test('data_types')
.fn(async t => {
const wgSize = [4, 1, 1];
const type = kTypes[t.params.type];
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
if (type.requiresF16()) {
t.skipIfDeviceDoesNotHaveFeature('shader-f16');
}
Expand Down Expand Up @@ -242,7 +242,7 @@ Quad operations require a full quad so workgroup sizes are limited to multiples
.combine('id', [0, 1, 2, 3] as const)
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
const wgThreads = t.params.wgSize[0] * t.params.wgSize[1] * t.params.wgSize[2];

const wgsl = `
Expand Down Expand Up @@ -322,7 +322,7 @@ predication filters are skipped.
.combine('id', [0, 1, 2, 3] as const)
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
const wgThreads = t.params.wgSize[0] * t.params.wgSize[1] * t.params.wgSize[2];
const testcase = kPredicateCases[t.params.predicate];

Expand Down Expand Up @@ -501,7 +501,7 @@ g.test('fragment,all_active')
.combineWithParams([{ format: 'rgba32uint' }] as const)
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
const fsShader = `
enable subgroups;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ g.test('data_types')
.fn(async t => {
const wgSize = [4, 1, 1];
const type = kTypes[t.params.type];
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
if (type.requiresF16()) {
t.skipIfDeviceDoesNotHaveFeature('shader-f16');
}
Expand Down Expand Up @@ -261,7 +261,7 @@ Quad operations require a full quad so workgroup sizes are limited to multiples
.combine('op', kOps)
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
const wgThreads = t.params.wgSize[0] * t.params.wgSize[1] * t.params.wgSize[2];

const wgsl = `
Expand Down Expand Up @@ -341,7 +341,7 @@ predication filters are skipped.
.combine('op', kOps)
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
const wgThreads = t.params.wgSize[0] * t.params.wgSize[1] * t.params.wgSize[2];
const testcase = kPredicateCases[t.params.predicate];

Expand Down Expand Up @@ -511,7 +511,7 @@ g.test('fragment,all_active')
.combineWithParams([{ format: 'rgba32uint' }] as const)
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
const fsShader = `
enable subgroups;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ and limit the number of permutations needed to calculate the final result.`
] as const)
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
if (t.params.type === 'f16') {
t.skipIfDeviceDoesNotHaveFeature('shader-f16');
}
Expand Down Expand Up @@ -168,7 +168,7 @@ TODO: support vec3 types.
.combine('operation', kOperations)
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
const type = kDataTypes[t.params.type];
if (type.requiresF16()) {
t.skipIfDeviceDoesNotHaveFeature('shader-f16');
Expand Down Expand Up @@ -295,7 +295,7 @@ g.test('compute,split')
.combine('wgSize', kWGSizes)
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
const testcase = kPredicateCases[t.params.case];
const outputUintsPerElement = 1;
const inputData = new Uint32Array([0]); // no input data
Expand Down Expand Up @@ -481,7 +481,7 @@ g.test('fragment')
.combineWithParams([{ format: 'rgba32uint' }] as const)
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
const subgroupMinSize = t.device.adapterInfo.subgroupMinSize!;
const innerTexels = (t.params.size[0] - 1) * (t.params.size[1] - 1);
t.skipIf(innerTexels < subgroupMinSize, 'Too few texels to be reliable');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ g.test('compute,all_active')
.combine('case', [...iterRange(kNumCases, x => x)])
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
const wgThreads = t.params.wgSize[0] * t.params.wgSize[1] * t.params.wgSize[2];

const wgsl = `
Expand Down Expand Up @@ -196,7 +196,7 @@ g.test('compute,split')
.combine('case', [...iterRange(kNumCases, x => x)])
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
const testcase = kPredicateCases[t.params.predicate];
const wgThreads = t.params.wgSize[0] * t.params.wgSize[1] * t.params.wgSize[2];

Expand Down Expand Up @@ -327,7 +327,7 @@ g.test('fragment,all_active')
.combineWithParams([{ format: 'rg32uint' }] as const)
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
const numInputs = t.params.size[0] * t.params.size[1];
const inputData = generateInputData(t.params.case, numInputs);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ g.test('compute,all_active')
.combine('case', [...iterRange(kNumCases, x => x)])
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
const wgThreads = t.params.wgSize[0] * t.params.wgSize[1] * t.params.wgSize[2];

const wgsl = `
Expand Down Expand Up @@ -196,7 +196,7 @@ g.test('compute,split')
.combine('case', [...iterRange(kNumCases, x => x)])
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
const testcase = kPredicateCases[t.params.predicate];
const wgThreads = t.params.wgSize[0] * t.params.wgSize[1] * t.params.wgSize[2];

Expand Down Expand Up @@ -327,7 +327,7 @@ g.test('fragment,all_active')
.combineWithParams([{ format: 'rg32uint' }] as const)
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
const numInputs = t.params.size[0] * t.params.size[1];
const inputData = generateInputData(t.params.case, numInputs);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ g.test('compute,split')
.desc('Tests ballot in a split subgroup')
.params(u => u.combine('case', keysOf(kCases)))
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
const testcase = kCases[t.params.case];
const wgsl = `
enable subgroups;
Expand Down Expand Up @@ -222,7 +222,7 @@ g.test('predicate')
.desc('Tests the predicate parameter')
.params(u => u.combine('case', keysOf(kCases)))
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
const testcase = kCases[t.params.case];
const wgsl = `
enable subgroups;
Expand Down Expand Up @@ -310,7 +310,7 @@ g.test('predicate_and_control_flow')
.desc('Test dynamic predicate and control flow together')
.params(u => u.combine('case', keysOf(kBothCases)))
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
const testcase = kBothCases[t.params.case];
const wgsl = `
enable subgroups;
Expand Down Expand Up @@ -519,7 +519,7 @@ g.test('fragment')
.combineWithParams([{ format: 'rgba32uint' }] as const)
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
const width = t.params.size[0];
const height = t.params.size[1];
const testcase = kFragmentPredicates[t.params.predicate];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ g.test('data_types')
.combine('op', kOps)
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
const type = kTypes[t.params.type];
let numEles = 1;
if (type instanceof VectorType) {
Expand Down Expand Up @@ -293,7 +293,7 @@ g.test('compute,all_active')
.combine('op', kOps)
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
const wgThreads = t.params.wgSize[0] * t.params.wgSize[1] * t.params.wgSize[2];

const wgsl = `
Expand Down Expand Up @@ -364,7 +364,7 @@ g.test('compute,split')
.combine('case', [...iterRange(kNumCases, x => x)])
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
const testcase = kPredicateCases[t.params.predicate];
const wgThreads = t.params.wgSize[0] * t.params.wgSize[1] * t.params.wgSize[2];

Expand Down Expand Up @@ -535,7 +535,7 @@ g.test('fragment,all_active')
.combineWithParams([{ format: 'rg32uint' }] as const)
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
t.skipIfDeviceDoesNotHaveFeature('subgroups');
const numInputs = t.params.size[0] * t.params.size[1];

const subgroupMinSize = t.device.adapterInfo.subgroupMinSize!;
Expand Down
Loading
Loading