Module: Mesa Branch: staging/22.2 Commit: f0dc4ee1cd3d09d7b0905fd4f16d56662c5b2028 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f0dc4ee1cd3d09d7b0905fd4f16d56662c5b2028
Author: Timur Kristóf <[email protected]> Date: Wed Sep 7 18:52:13 2022 +0200 nir/gather_info: Clear cross-invocation output mask. Similar to how other I/O info is cleared at the beginning of gather_info we should also clear the cross-invocation mesh shader output mask. Fixes: 112a856813eb2649ea7ff81768bab594033ce00a Signed-off-by: Timur Kristóf <[email protected]> Acked-by: Alyssa Rosenzweig <[email protected]> Reviewed-by: Marcin Ślusarz <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18464> (cherry picked from commit e58a5cca0293ab10ec327debf85175901d027478) --- .pick_status.json | 2 +- src/compiler/nir/nir_gather_info.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 1523b201c66..1104393b325 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3001,7 +3001,7 @@ "description": "nir/gather_info: Clear cross-invocation output mask.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "112a856813eb2649ea7ff81768bab594033ce00a" }, diff --git a/src/compiler/nir/nir_gather_info.c b/src/compiler/nir/nir_gather_info.c index c19fe07a1bd..1eb8f8dc990 100644 --- a/src/compiler/nir/nir_gather_info.c +++ b/src/compiler/nir/nir_gather_info.c @@ -978,6 +978,9 @@ nir_shader_gather_info(nir_shader *shader, nir_function_impl *entrypoint) shader->info.tess.tcs_cross_invocation_inputs_read = 0; shader->info.tess.tcs_cross_invocation_outputs_read = 0; } + if (shader->info.stage == MESA_SHADER_MESH) { + shader->info.mesh.ms_cross_invocation_output_access = 0; + } if (shader->info.stage != MESA_SHADER_FRAGMENT) shader->info.writes_memory = shader->info.has_transform_feedback_varyings;
