Skip to content

Minor change in sample mask behavior for the case of sample shading #4510

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Minor change in sample mask behavior for the case of sample shading #4510

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
15 changes: 14 additions & 1 deletion src/webgpu/shader/execution/shader_io/fragment_builtins.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ function generateFragmentInputs({
frontFace,
clipSpacePoints,
interpolateFn,
isSampleShading,
}: {
width: number;
height: number;
Expand All @@ -334,6 +335,7 @@ function generateFragmentInputs({
frontFace?: GPUFrontFace;
clipSpacePoints: readonly number[][];
interpolateFn: (fragData: FragData) => number[];
isSampleShading: boolean;
}) {
const expected = new Float32Array(width * height * sampleCount * 4);

Expand Down Expand Up @@ -382,6 +384,11 @@ function generateFragmentInputs({

const inside = isInsideTriangle(sampleBarycentricCoords);
if (inside) {
// When Sample Shading (ie MSAA super sampling) we should only get the one sample for this fragment.
// See webgpu wgls issue 5457
const fragmentLocalSampleMask = isSampleShading
? sampleMask & (1 << sampleIndex)
: sampleMask;
const output = interpolateFn({
baseVertexIndex: vertexIndex,
fragmentPoint,
Expand All @@ -391,7 +398,7 @@ function generateFragmentInputs({
ndcPoints,
windowPoints,
sampleIndex,
sampleMask,
sampleMask: fragmentLocalSampleMask,
frontFacing,
});

Expand Down Expand Up @@ -818,6 +825,7 @@ g.test('inputs,position')
sampleCount,
clipSpacePoints,
interpolateFn: computeFragmentPosition,
isSampleShading: t.params.interpolation.sampling === 'sample',
});

// Since @builtin(position) is always a fragment position, never a sample position, check
Expand Down Expand Up @@ -907,6 +915,7 @@ g.test('inputs,interStage')
sampleCount,
clipSpacePoints,
interpolateFn: await createInterStageInterpolationFn(t, interStagePoints, type, sampling),
isSampleShading: t.params.interpolation.sampling === 'sample',
});

t.expectOK(
Expand Down Expand Up @@ -1046,6 +1055,7 @@ g.test('inputs,interStage,centroid')
type,
sampling
),
isSampleShading: false,
});

t.expectOK(
Expand Down Expand Up @@ -1125,6 +1135,7 @@ g.test('inputs,sample_index')
sampleCount,
clipSpacePoints,
interpolateFn: computeFragmentSampleIndex,
isSampleShading: t.params.interpolation.sampling === 'sample',
});

t.expectOK(
Expand Down Expand Up @@ -1240,6 +1251,7 @@ g.test('inputs,front_facing')
clipSpacePoints,
frontFace,
interpolateFn: computeFragmentFrontFacing,
isSampleShading: t.params.interpolation.sampling === 'sample',
});

assert(expected.indexOf(0) >= 0, 'expect some values to be 0');
Expand Down Expand Up @@ -1414,6 +1426,7 @@ g.test('inputs,sample_mask')
sampleCount,
clipSpacePoints,
interpolateFn: computeSampleMask,
isSampleShading: t.params.interpolation.sampling === 'sample',
});

t.expectOK(
Expand Down