Module: Mesa Branch: main Commit: 694ebe8c7228aa5a2c427cd33b0d6fdf3360174d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=694ebe8c7228aa5a2c427cd33b0d6fdf3360174d
Author: Mike Blumenkrantz <[email protected]> Date: Thu Oct 26 11:33:47 2023 -0400 zink: only emit xfb execution mode for last vertex stage this is otherwise illegal cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25914> --- src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 2 +- src/gallium/drivers/zink/zink_compiler.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c index 5c7a6a8baa0..ce7efafe128 100644 --- a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c +++ b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c @@ -4664,7 +4664,7 @@ nir_to_spirv(struct nir_shader *s, const struct zink_shader_info *sinfo, uint32_ spirv_builder_emit_cap(&ctx.builder, SpvCapabilitySubgroupBallotKHR); spirv_builder_emit_extension(&ctx.builder, "SPV_KHR_shader_ballot"); } - if (s->info.has_transform_feedback_varyings) { + if (s->info.has_transform_feedback_varyings && s->info.stage != MESA_SHADER_FRAGMENT) { spirv_builder_emit_cap(&ctx.builder, SpvCapabilityTransformFeedback); spirv_builder_emit_exec_mode(&ctx.builder, entry_point, SpvExecutionModeXfb); diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c index 014b6cccdd7..7ed959deae9 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -2776,6 +2776,8 @@ zink_compiler_assign_io(struct zink_screen *screen, nir_shader *producer, nir_sh optimize_nir(producer, NULL, true); } } + if (consumer->info.stage != MESA_SHADER_FRAGMENT) + producer->info.has_transform_feedback_varyings = false; if (producer->info.stage == MESA_SHADER_TESS_CTRL) { /* never assign from tcs -> tes, always invert */ nir_foreach_variable_with_modes(var, consumer, nir_var_shader_in)
