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

Revert "Adjust fragment state blend factor and write mask validation" #3218

Merged
merged 1 commit into from
Dec 8, 2023
Merged

Revert "Adjust fragment state blend factor and write mask validation" #3218

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
14 changes: 2 additions & 12 deletions src/webgpu/api/validation/render_pipeline/fragment_state.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ g.test('pipeline_output_targets')
g.test('pipeline_output_targets,blend')
.desc(
`On top of requirements from pipeline_output_targets, when blending is enabled and alpha channel is read indicated by any blend factor, an extra requirement is added:
- fragment output must have an alpha channel (i.e. it must be vec4), otherwise writeMask must be 0.
- fragment output must be vec4.
`
)
.params(u =>
Expand All @@ -382,14 +382,6 @@ g.test('pipeline_output_targets,blend')
...u.combine('alphaSrcFactor', kBlendFactors),
...u.combine('alphaDstFactor', kBlendFactors),
] as const)
.expand('writeMask', function* (p) {
yield 0;
for (let i = 0; i < p.componentCount; i++) {
yield 1 << i;
}
// default full mask
yield 0xf;
})
)
.beforeAllSubcases(t => {
const { format } = t.params;
Expand All @@ -406,7 +398,6 @@ g.test('pipeline_output_targets,blend')
colorDstFactor,
alphaSrcFactor,
alphaDstFactor,
writeMask,
} = t.params;
const info = kTextureFormatInfo[format];

Expand All @@ -418,7 +409,6 @@ g.test('pipeline_output_targets,blend')
color: { srcFactor: colorSrcFactor, dstFactor: colorDstFactor },
alpha: { srcFactor: alphaSrcFactor, dstFactor: alphaDstFactor },
},
writeMask,
},
],
fragmentShaderCode: getFragmentShaderCodeWithOutput([
Expand All @@ -432,6 +422,6 @@ g.test('pipeline_output_targets,blend')
const _success =
info.color.type === sampleType &&
componentCount >= kTexelRepresentationInfo[format].componentOrder.length &&
(meetsExtraBlendingRequirement || writeMask === 0);
meetsExtraBlendingRequirement;
t.doCreateRenderPipelineTest(isAsync, _success, descriptor);
});