Skip to content

Commit 9d4853e

Browse files
committed
Compat: Update maxInterStageShaderVariables = 15
This is the OpenGL ES 3.1 Limit
1 parent 7da5c3c commit 9d4853e

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

src/webgpu/api/validation/render_pipeline/inter_stage.spec.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Interface matching between vertex and fragment shader validation for createRende
33
`;
44

55
import { makeTestGroup } from '../../../../common/framework/test_group.js';
6-
import { assert, range } from '../../../../common/util/util.js';
6+
import { range } from '../../../../common/util/util.js';
77

88
import { CreateRenderPipelineValidationTest } from './common.js';
99

@@ -251,9 +251,6 @@ g.test('max_components_count,output')
251251

252252
const numVec4 = Math.floor(numScalarComponents / 4);
253253
const numTrailingScalars = numScalarComponents % 4;
254-
const numUserDefinedInterStageVariables = numTrailingScalars > 0 ? numVec4 + 1 : numVec4;
255-
256-
assert(numUserDefinedInterStageVariables <= t.device.limits.maxInterStageShaderVariables);
257254

258255
const outputs = range(numVec4, i => `@location(${i}) vout${i}: vec4<f32>`);
259256
const inputs = range(numVec4, i => `@location(${i}) fin${i}: vec4<f32>`);
@@ -294,9 +291,6 @@ g.test('max_components_count,input')
294291

295292
const numVec4 = Math.floor(numScalarComponents / 4);
296293
const numTrailingScalars = numScalarComponents % 4;
297-
const numUserDefinedInterStageVariables = numTrailingScalars > 0 ? numVec4 + 1 : numVec4;
298-
299-
assert(numUserDefinedInterStageVariables <= t.device.limits.maxInterStageShaderVariables);
300294

301295
const outputs = range(numVec4, i => `@location(${i}) vout${i}: vec4<f32>`);
302296
const inputs = range(numVec4, i => `@location(${i}) fin${i}: vec4<f32>`);

src/webgpu/capability_info.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ const [kLimitInfoKeys, kLimitInfoDefaults, kLimitInfoData] =
689689
'maxVertexAttributes': [ , 16, 16, ],
690690
'maxVertexBufferArrayStride': [ , 2048, 2048, ],
691691
'maxInterStageShaderComponents': [ , 60, 60, ],
692-
'maxInterStageShaderVariables': [ , 16, 16, ],
692+
'maxInterStageShaderVariables': [ , 16, 15, ],
693693

694694
'maxColorAttachments': [ , 8, 4, ],
695695
'maxColorAttachmentBytesPerSample': [ , 32, 32, ],

0 commit comments

Comments
 (0)