From 9d4853e29d34492df749c07c9a6a9672a32f64df Mon Sep 17 00:00:00 2001 From: Gregg Tavares Date: Tue, 28 Nov 2023 15:36:39 -0800 Subject: [PATCH] Compat: Update maxInterStageShaderVariables = 15 This is the OpenGL ES 3.1 Limit --- .../api/validation/render_pipeline/inter_stage.spec.ts | 8 +------- src/webgpu/capability_info.ts | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/webgpu/api/validation/render_pipeline/inter_stage.spec.ts b/src/webgpu/api/validation/render_pipeline/inter_stage.spec.ts index 91aabb0ab8c9..ee128a20f826 100644 --- a/src/webgpu/api/validation/render_pipeline/inter_stage.spec.ts +++ b/src/webgpu/api/validation/render_pipeline/inter_stage.spec.ts @@ -3,7 +3,7 @@ Interface matching between vertex and fragment shader validation for createRende `; import { makeTestGroup } from '../../../../common/framework/test_group.js'; -import { assert, range } from '../../../../common/util/util.js'; +import { range } from '../../../../common/util/util.js'; import { CreateRenderPipelineValidationTest } from './common.js'; @@ -251,9 +251,6 @@ g.test('max_components_count,output') const numVec4 = Math.floor(numScalarComponents / 4); const numTrailingScalars = numScalarComponents % 4; - const numUserDefinedInterStageVariables = numTrailingScalars > 0 ? numVec4 + 1 : numVec4; - - assert(numUserDefinedInterStageVariables <= t.device.limits.maxInterStageShaderVariables); const outputs = range(numVec4, i => `@location(${i}) vout${i}: vec4`); const inputs = range(numVec4, i => `@location(${i}) fin${i}: vec4`); @@ -294,9 +291,6 @@ g.test('max_components_count,input') const numVec4 = Math.floor(numScalarComponents / 4); const numTrailingScalars = numScalarComponents % 4; - const numUserDefinedInterStageVariables = numTrailingScalars > 0 ? numVec4 + 1 : numVec4; - - assert(numUserDefinedInterStageVariables <= t.device.limits.maxInterStageShaderVariables); const outputs = range(numVec4, i => `@location(${i}) vout${i}: vec4`); const inputs = range(numVec4, i => `@location(${i}) fin${i}: vec4`); diff --git a/src/webgpu/capability_info.ts b/src/webgpu/capability_info.ts index 933e7be916b3..d7fe7180fd1b 100644 --- a/src/webgpu/capability_info.ts +++ b/src/webgpu/capability_info.ts @@ -689,7 +689,7 @@ const [kLimitInfoKeys, kLimitInfoDefaults, kLimitInfoData] = 'maxVertexAttributes': [ , 16, 16, ], 'maxVertexBufferArrayStride': [ , 2048, 2048, ], 'maxInterStageShaderComponents': [ , 60, 60, ], - 'maxInterStageShaderVariables': [ , 16, 16, ], + 'maxInterStageShaderVariables': [ , 16, 15, ], 'maxColorAttachments': [ , 8, 4, ], 'maxColorAttachmentBytesPerSample': [ , 32, 32, ],