Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compat: fix texture,in_pass_encoder for 0 storage textures #4154

Merged
merged 1 commit into from
Jan 23, 2025
Merged

Compat: fix texture,in_pass_encoder for 0 storage textures #4154

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Compat: fix texture,in_pass_encoder for 0 storage textures
  • Loading branch information
@greggman
greggman committed Jan 23, 2025
commit 150899f6067243c43409de230004b1beae4e70af
68 changes: 58 additions & 10 deletions src/webgpu/api/validation/resource_usages/texture/in_pass_encoder.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,34 @@ class TextureUsageTracking extends ValidationTest {
pass.setPipeline(pipeline);
pass.dispatchWorkgroups(1);
}

skipIfNeedStorageTexturesByVisibilityAndNoStorageTextures(visibility: number) {
if (!this.isCompatibility) {
return;
}

this.skipIf(
(visibility & GPUConst.ShaderStage.VERTEX) !== 0 &&
!(this.device.limits.maxStorageTexturesInVertexStage! >= 2),
`maxStorageTexturesInVertexStage(${this.device.limits.maxStorageTexturesInVertexStage}) < 2`
);

this.skipIf(
(visibility & GPUConst.ShaderStage.FRAGMENT) !== 0 &&
!(this.device.limits.maxStorageTexturesInFragmentStage! >= 2),
`maxStorageTexturesInFragmentStage(${this.device.limits.maxStorageTexturesInFragmentStage}) < 2`
);
}

skipIfNeedStorageTexturesByResourceTypeAndNoStorageTextures(s: string, visibility: number) {
if (
s === 'readonly-storage-texture' ||
s === 'writeonly-storage-texture' ||
s === 'readwrite-storage-texture'
) {
this.skipIfNeedStorageTexturesByVisibilityAndNoStorageTextures(visibility);
}
}
}

export const g = makeTestGroup(MaxLimitsTestMixin(TextureUsageTracking));
Expand Down Expand Up @@ -867,6 +895,8 @@ g.test('shader_stages_and_visibility,storage_write')
secondUseConflicts,
} = t.params;

t.skipIfNeedStorageTexturesByVisibilityAndNoStorageTextures(readVisibility | writeVisibility);

const usage = GPUTextureUsage.TEXTURE_BINDING | GPUTextureUsage.STORAGE_BINDING;
const view = t.createTestTexture({ usage }).createView();
const view2 = secondUseConflicts ? view : t.createTestTexture({ usage }).createView();
Expand Down Expand Up @@ -940,6 +970,8 @@ g.test('shader_stages_and_visibility,attachment_write')
.fn(t => {
const { readVisibility, readEntry, secondUseConflicts } = t.params;

t.skipIfNeedStorageTexturesByVisibilityAndNoStorageTextures(readVisibility);

const usage =
GPUTextureUsage.TEXTURE_BINDING |
GPUTextureUsage.RENDER_ATTACHMENT |
Expand Down Expand Up @@ -992,6 +1024,8 @@ g.test('replaced_binding')
.fn(t => {
const { compute, callDrawOrDispatch, entry } = t.params;

t.skipIfNeedStorageTexturesByVisibilityAndNoStorageTextures(GPUShaderStage.FRAGMENT);

const sampledView = t.createTestTexture().createView();
const sampledStorageView = t
.createTestTexture({
Expand Down Expand Up @@ -1120,6 +1154,9 @@ g.test('bindings_in_bundle')
const { binding0InBundle, binding1InBundle, type0, type1, _usage0, _usage1, _sampleCount } =
t.params;

t.skipIfNeedStorageTexturesByResourceTypeAndNoStorageTextures(type0, GPUShaderStage.FRAGMENT);
t.skipIfNeedStorageTexturesByResourceTypeAndNoStorageTextures(type1, GPUShaderStage.FRAGMENT);

// Two bindings are attached to the same texture view.
const usage =
_sampleCount === 4
Expand Down Expand Up @@ -1238,6 +1275,15 @@ g.test('unused_bindings_in_pipeline')
t.skipIfLanguageFeatureNotSupported('readonly_and_readwrite_storage_textures');
}

t.skipIfNeedStorageTexturesByResourceTypeAndNoStorageTextures(
readOnlyUsage,
GPUShaderStage.FRAGMENT
);
t.skipIfNeedStorageTexturesByResourceTypeAndNoStorageTextures(
writableUsage,
GPUShaderStage.FRAGMENT
);

const view = t
.createTestTexture({
usage: GPUTextureUsage.TEXTURE_BINDING | GPUTextureUsage.STORAGE_BINDING,
Expand Down Expand Up @@ -1371,6 +1417,9 @@ g.test('scope,dispatch')
.fn(t => {
const { dispatch, usage1, usage2, setBindGroup0, setBindGroup1 } = t.params;

t.skipIfNeedStorageTexturesByResourceTypeAndNoStorageTextures(usage1, GPUShaderStage.FRAGMENT);
t.skipIfNeedStorageTexturesByResourceTypeAndNoStorageTextures(usage2, GPUShaderStage.FRAGMENT);

const { bindGroup0, bindGroup1, encoder, pass, pipeline } = t.testValidationScope(
true,
usage1,
Expand Down Expand Up @@ -1427,13 +1476,11 @@ g.test('scope,basic,render')
)
)
.fn(t => {
t.skipIf(
t.isCompatibility && !(t.device.limits.maxStorageTexturesInFragmentStage! >= 2),
`maxStorageTexturesInFragmentStage(${t.device.limits.maxStorageTexturesInFragmentStage}) < 2`
);

const { setBindGroup0, setBindGroup1, usage1, usage2 } = t.params;

t.skipIfNeedStorageTexturesByResourceTypeAndNoStorageTextures(usage1, GPUShaderStage.FRAGMENT);
t.skipIfNeedStorageTexturesByResourceTypeAndNoStorageTextures(usage2, GPUShaderStage.FRAGMENT);

const { bindGroup0, bindGroup1, encoder, pass } = t.testValidationScope(false, usage1, usage2);
assert(pass instanceof GPURenderPassEncoder);

Expand Down Expand Up @@ -1469,6 +1516,9 @@ g.test('scope,pass_boundary,compute')
.fn(t => {
const { splitPass, usage1, usage2 } = t.params;

t.skipIfNeedStorageTexturesByResourceTypeAndNoStorageTextures(usage1, GPUShaderStage.FRAGMENT);
t.skipIfNeedStorageTexturesByResourceTypeAndNoStorageTextures(usage2, GPUShaderStage.FRAGMENT);

const { bindGroupLayouts, bindGroups } = t.makeTwoBindGroupsWithOneTextureView(usage1, usage2);

const encoder = t.device.createCommandEncoder();
Expand Down Expand Up @@ -1524,13 +1574,11 @@ g.test('scope,pass_boundary,render')
)
)
.fn(t => {
t.skipIf(
t.isCompatibility && !(t.device.limits.maxStorageTexturesInFragmentStage! >= 2),
`maxStorageTexturesInFragmentStage(${t.device.limits.maxStorageTexturesInFragmentStage}) < 2`
);

const { splitPass, draw, usage1, usage2 } = t.params;

t.skipIfNeedStorageTexturesByResourceTypeAndNoStorageTextures(usage1, GPUShaderStage.FRAGMENT);
t.skipIfNeedStorageTexturesByResourceTypeAndNoStorageTextures(usage2, GPUShaderStage.FRAGMENT);

const { bindGroupLayouts, bindGroups } = t.makeTwoBindGroupsWithOneTextureView(usage1, usage2);

const encoder = t.device.createCommandEncoder();
Expand Down
Loading