Skip to content

Commit 040a8f0

Browse files
committed
Refactor src/webgpu/shader/validation/decl/*
Isuse #4178
1 parent b62a705 commit 040a8f0

File tree

5 files changed

+15
-23
lines changed

5 files changed

+15
-23
lines changed

src/webgpu/shader/validation/decl/const.spec.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,12 @@ const kTypeCases = {
150150
g.test('type')
151151
.desc('Test const types')
152152
.params(u => u.combine('case', keysOf(kTypeCases)))
153-
.beforeAllSubcases(t => {
153+
.fn(t => {
154154
if (t.params.case === 'f16') {
155-
t.selectDeviceOrSkipTestCase('shader-f16');
155+
t.skipIfDeviceDoesNotHaveFeature('shader-f16');
156156
}
157-
})
158-
.fn(t => {
159157
const testcase = kTypeCases[t.params.case];
158+
160159
const code = testcase.code;
161160
const expect = testcase.valid;
162161
t.expectCompileResult(expect, code);

src/webgpu/shader/validation/decl/context_dependent_resolution.spec.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,9 @@ g.test('enable_names')
211211
.beginSubcases()
212212
.combine('decl', ['override', 'const', 'var<private>'] as const)
213213
)
214-
.beforeAllSubcases(t => {
215-
t.selectDeviceOrSkipTestCase('shader-f16');
216-
})
217214
.fn(t => {
215+
t.skipIfDeviceDoesNotHaveFeature('shader-f16');
216+
218217
const code = `
219218
${kEnableCases[t.params.case]}
220219
${t.params.decl} ${t.params.case} : u32 = 0;

src/webgpu/shader/validation/decl/let.spec.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,12 @@ const kTypeCases: Record<string, Case> = {
9494
g.test('type')
9595
.desc('Test let types')
9696
.params(u => u.combine('case', keysOf(kTypeCases)))
97-
.beforeAllSubcases(t => {
97+
.fn(t => {
9898
if (t.params.case === 'f16') {
99-
t.selectDeviceOrSkipTestCase('shader-f16');
99+
t.skipIfDeviceDoesNotHaveFeature('shader-f16');
100100
}
101-
})
102-
.fn(t => {
103101
const testcase = kTypeCases[t.params.case];
102+
104103
const code = `
105104
${t.params.case === 'f16' ? 'enable f16;' : ''}
106105
${testcase.decls ?? ''}

src/webgpu/shader/validation/decl/override.spec.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,12 @@ const kTypeCases = {
136136
g.test('type')
137137
.desc('Test override types')
138138
.params(u => u.combine('case', keysOf(kTypeCases)))
139-
.beforeAllSubcases(t => {
139+
.fn(t => {
140140
if (t.params.case === 'f16') {
141-
t.selectDeviceOrSkipTestCase('shader-f16');
141+
t.skipIfDeviceDoesNotHaveFeature('shader-f16');
142142
}
143-
})
144-
.fn(t => {
145143
const testcase = kTypeCases[t.params.case];
144+
146145
const code = testcase.code;
147146
const expect = testcase.valid;
148147
t.expectCompileResult(expect, code);

src/webgpu/shader/validation/decl/var.spec.ts

+4-8
Original file line numberDiff line numberDiff line change
@@ -225,12 +225,10 @@ g.test('module_scope_types')
225225
])
226226
.combine('via_alias', [false, true])
227227
)
228-
.beforeAllSubcases(t => {
228+
.fn(t => {
229229
if (kTypes[t.params.type].requiresF16) {
230-
t.selectDeviceOrSkipTestCase('shader-f16');
230+
t.skipIfDeviceDoesNotHaveFeature('shader-f16');
231231
}
232-
})
233-
.fn(t => {
234232
const type = kTypes[t.params.type];
235233
const isAtomic = t.params.type.indexOf('atomic') > -1;
236234

@@ -296,12 +294,10 @@ g.test('function_scope_types')
296294
.combine('kind', ['comment', 'var'])
297295
.combine('via_alias', [false, true])
298296
)
299-
.beforeAllSubcases(t => {
297+
.fn(t => {
300298
if (kTypes[t.params.type].requiresF16) {
301-
t.selectDeviceOrSkipTestCase('shader-f16');
299+
t.skipIfDeviceDoesNotHaveFeature('shader-f16');
302300
}
303-
})
304-
.fn(t => {
305301
const type = kTypes[t.params.type];
306302

307303
let decl = '<>';

0 commit comments

Comments
 (0)